update parent version to 2.2.26

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.2.25</version>
+        <version>2.2.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>

src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java

@@ -1,7 +1,7 @@
 package au.com.royalpay.payment.manage.appclient.beans;
 
 import au.com.royalpay.payment.core.beans.OrderStatus;
-import au.com.royalpay.payment.core.beans.PayChannel;
+import au.com.royalpay.payment.core.beans.PayChannelSearch;
 import au.com.royalpay.payment.tools.defines.TradeType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +25,7 @@ public class AppQueryBean {
     private String[] client_ids;
     private String app_client_ids;
     private OrderStatus status = OrderStatus.ALL;
-    private PayChannel channel = PayChannel.ALL;
+    private PayChannelSearch channel = PayChannelSearch.ALL;
     private int[] gateway;
     private int clearing_status=-1;
     private String gateway_app;
@@ -164,11 +164,11 @@ public class AppQueryBean {
         this.app_client_ids = app_client_ids;
     }
 
-    public PayChannel getChannel() {
+    public PayChannelSearch getChannel() {
         return channel;
     }
 
-    public void setChannel(PayChannel channel) {
+    public void setChannel(PayChannelSearch channel) {
         this.channel = channel;
     }
 

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java

@@ -1,11 +1,8 @@
 package au.com.royalpay.payment.manage.dev.core.impl;
 
-import au.com.royalpay.payment.channels.rpay.runtime.RpayApi;
 import au.com.royalpay.payment.manage.dev.core.ManualService;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
-import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
 import au.com.royalpay.payment.manage.task.PostponeClientTask;
 import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
 import com.alibaba.fastjson.JSONObject;
@@ -37,12 +34,6 @@ public class ManualServiceimpl implements ManualService {
     private ClientAccountMapper clientAccountMapper;
     @Resource
     private SynchronizedScheduler synchronizedScheduler;
-    @Resource
-    private ClientModifySupport clientModifySupport;
-    @Resource
-    private RpayApi rpayApi;
-    @Resource
-    private ClientMapper clientMapper;
 
     @Override
     public void clientPostpone() {

src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java

@@ -1,7 +1,7 @@
 package au.com.royalpay.payment.manage.tradelog.beans;
 
 import au.com.royalpay.payment.core.beans.OrderStatus;
-import au.com.royalpay.payment.core.beans.PayChannel;
+import au.com.royalpay.payment.core.beans.PayChannelSearch;
 import au.com.royalpay.payment.tools.defines.TradeType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +29,7 @@ public class TradeLogQuery {
     private int[] gateway;
     private String source = "ALL" ;
     private OrderStatus status = OrderStatus.PAID;
-    private PayChannel channel = PayChannel.ALL;
+    private PayChannelSearch channel = PayChannelSearch.ALL;
     private String[] client_ids;
     private String dev_id;
     private int clearing_status;
@@ -225,11 +225,11 @@ public class TradeLogQuery {
         return trans_type;
     }
 
-    public PayChannel getChannel() {
+    public PayChannelSearch getChannel() {
         return channel;
     }
 
-    public void setChannel(PayChannel channel) {
+    public void setChannel(PayChannelSearch channel) {
         this.channel = channel;
     }
 

src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java

@@ -1,23 +1,11 @@
 package au.com.royalpay.payment.manage.process.custom;
 
-import au.com.royalpay.payment.channels.alipay.runtime.impls.AlipayCustomDeclaringTaskProcessor;
-//import au.com.royalpay.payment.core.mappers.PmtCustomReportsDetailMapper;
-//import au.com.royalpay.payment.core.mappers.PmtCustomReportsMapper;
-import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
-import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper;
-import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper;
-import com.alibaba.fastjson.JSONObject;
-import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
-import java.util.List;
-
 /**
  * Create by yixian at 2018-08-14 20:28
  */