fix

src/db/modify.sql

@@ -370,4 +370,27 @@ CREATE TABLE `log_client_sub_merchant_id` (
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `client_id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `pmt_sub_merchant_id` (
+  `sub_merchant_id` varchar(30) NOT NULL,
+  `merchant_id` varchar(30) NOT NULL,
+  `is_valid` tinyint(1) DEFAULT 1,
+  `operator` varchar(30) DEFAULT '',
+  `create_time` datetime DEFAULT NULL,
+  `update_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`sub_merchant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+alter table sys_clients add column common_sub_merchant_id tinyint(1) default 0 comment '是否使用通用子商户号';
+
+
+CREATE TABLE `cli_sub_merchant_id` (
+  `sub_merchant_id` varchar(30) NOT NULL,
+  `merchant_id` varchar(30) DEFAULT NULL,
+  `client_count` int(8) DEFAULT NULL,
+  `temp_sub_merchant` tinyint(1) DEFAULT 0,
+  `create_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`sub_merchant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

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

@@ -26,6 +26,7 @@ public class AppQueryBean {
     private OrderStatus status = OrderStatus.ALL;
     private PayChannel channel = PayChannel.ALL;
     private int[] gateway;
+    private int clearing_status;
     private String gateway_app;
     private int page = 1;
     private int limit = 20;
@@ -86,6 +87,9 @@ public class AppQueryBean {
         if (app_client_ids != null && !app_client_ids.isEmpty()) {
             params.put("client_ids", app_client_ids.split(","));
         }
+        if (clearing_status != -1) {
+            params.put("clearing_status", clearing_status);
+        }
         return params;
     }
 
@@ -169,4 +173,12 @@ public class AppQueryBean {
     public void setChannel(PayChannel channel) {
         this.channel = channel;
     }
+
+    public int getClearing_status() {
+        return clearing_status;
+    }
+
+    public void setClearing_status(int clearing_status) {
+        this.clearing_status = clearing_status;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -284,7 +284,8 @@ public class RetailAppServiceImp implements RetailAppService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         int client_id = device.getIntValue("client_id") ;
-        //JSONObject client = clientManager.getClientInfo(client_id);
+        JSONObject client = clientManager.getClientInfo(client_id);
+        device.put("client_moniker",client.getString("client_moniker"));
         TradeLogQuery tradeLogQuery = new TradeLogQuery();
         tradeLogQuery.setDatefrom(appQueryBean.getBegin());
         tradeLogQuery.setDateto(appQueryBean.getEnd());

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -658,7 +658,8 @@
         t.transaction_id,
         t.exchange_rate,
         t.clearing_status,
-        t.settle_amount
+        t.settle_amount,
+        t.clearing_status = 2  pre_auth
         from pmt_orders o
         left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' and t.system_generate=0
         <where>
@@ -687,6 +688,7 @@
                 <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
                 </foreach>
             </if>
+            <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
         </where>
     </select>