Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.4.7</version>
+    <version>2.4.8</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/activities/diet/core/impls/OneDollarDayActivitySupportImpl.java

@@ -4,7 +4,6 @@ import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
 import au.com.royalpay.payment.core.TransactionService;
 import au.com.royalpay.payment.core.beans.PaymentQueryResult;
 import au.com.royalpay.payment.core.beans.PreOrderRequest;
-import au.com.royalpay.payment.core.beans.TransactionBizSubType;
 import au.com.royalpay.payment.core.beans.coupon.CashCouponInfo;
 import au.com.royalpay.payment.core.beans.coupon.CouponInfo;
 import au.com.royalpay.payment.core.events.PaymentFinishedEvent;
@@ -20,6 +19,7 @@ import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
+import au.com.royalpay.payment.tools.merchants.beans.TransactionBizSubType;
 import au.com.royalpay.payment.tools.utils.Currency;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 import com.alibaba.fastjson.JSONObject;

src/main/java/au/com/royalpay/payment/manage/fund/core/impls/XPlanFundProcessorImpl.java

@@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.fund.core.impls;
 
 import au.com.royalpay.payment.core.SettlementDetailCalculator;
 import au.com.royalpay.payment.core.TransactionService;
-import au.com.royalpay.payment.core.beans.TransactionBizSubType;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.manage.fund.beans.XPlanFundConfig;
 import au.com.royalpay.payment.manage.fund.core.XPlanFundConfigService;
@@ -13,6 +12,7 @@ import au.com.royalpay.payment.manage.mappers.system.CalendarMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientConfigService;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.tools.merchants.beans.TransactionBizSubType;
 import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;

src/main/java/au/com/royalpay/payment/manage/processors/CtripCouponProvideProcessor.java

@@ -4,7 +4,6 @@ import au.com.royalpay.payment.core.PaymentApi;
 import au.com.royalpay.payment.core.TransactionService;
 import au.com.royalpay.payment.core.beans.PaymentQueryResult;
 import au.com.royalpay.payment.core.beans.PreOrderRequest;
-import au.com.royalpay.payment.core.beans.TransactionBizSubType;
 import au.com.royalpay.payment.core.beans.coupon.CouponInfo;
 import au.com.royalpay.payment.core.events.PaymentFinishedEvent;
 import au.com.royalpay.payment.core.events.RefundSendEvent;
@@ -15,6 +14,7 @@ import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.defines.Money;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
+import au.com.royalpay.payment.tools.merchants.beans.TransactionBizSubType;
 import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
 import au.com.royalpay.payment.tools.utils.Currency;
 import au.com.royalpay.payment.tools.utils.CurrencyAmountUtils;

src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java

@@ -1,7 +1,6 @@
 package au.com.royalpay.payment.manage.rservices.core.impl;
 
 import au.com.royalpay.payment.core.TransactionService;
-import au.com.royalpay.payment.core.beans.TransactionBizSubType;
 import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
 import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
@@ -19,6 +18,7 @@ import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
 import au.com.royalpay.payment.tools.lock.Locker;
 import au.com.royalpay.payment.tools.mappers.CommonIncrementalChannelMapper;
+import au.com.royalpay.payment.tools.merchants.beans.TransactionBizSubType;
 import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 import com.alibaba.fastjson.JSONObject;