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

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

@@ -2515,7 +2515,8 @@ public class RetailAppServiceImp implements RetailAppService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         JSONObject client = clientMapper.findClient(device.getIntValue("client_id"));
-        if (!("PINE".equals(client.getString("client_moniker"))
+        if ( !(client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5)
+                || !("PINE".equals(client.getString("client_moniker"))
                 || "LEOH".equals(client.getString("client_moniker")))) {
             return null;
         }

src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java

@@ -179,7 +179,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
             client.putAll(clientConfigService.find(client_id));
             client = clientInfoWithNoSecretInfo(client);
             client.put("client_less_file", false);
-            if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) {
+            if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5)) {
                 List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
                 if (clientFiles != null && clientFiles.size() > 0) {
                     clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList());
@@ -737,7 +737,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                 }
             }
         }
-        if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4 ) {
+        if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5)) {
             if (clientFilesIsLess) {
                 result.put("client_less_file", clientFilesIsLess);
                 whenClientLessFile(client, result);

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

@@ -64,8 +64,8 @@
         <![CDATA[
         SELECT ifnull(sum(if(l.transaction_type = 'Credit',l.clearing_amount,-l.clearing_amount)), 0)
         FROM pmt_transactions l
-            INNER JOIN pmt_orders o ON o.order_id = l.order_id AND c.create_time >= #{begin} AND
+            INNER JOIN pmt_orders o ON o.order_id = l.order_id AND o.create_time >= #{begin} AND
-                                       c.create_time <= #{end}
+                                       o.create_time <= #{end}
         WHERE (l.transaction_type = 'Credit' or l.refund_id is not null)
         ]]>
         <if test="client_ids!=null">