Merge remote-tracking branch 'origin/master'

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -37,27 +37,6 @@ import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
 import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
 import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
 import au.com.royalpay.payment.manage.merchants.beans.SubMerchantIdApply;
-import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientApplyMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientAuditProcessMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientDeviceMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientFilesMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
-import au.com.royalpay.payment.manage.mappers.system.CommoditiesMapper;
-import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
-import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
-import au.com.royalpay.payment.manage.mappers.system.SysWxMerchantApplyMapper;
-import au.com.royalpay.payment.manage.merchants.beans.ActivityPosterBuilder;
-import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
-import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
-import au.com.royalpay.payment.manage.merchants.beans.ClientRateConfig;
-import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
-import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
-import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
-import au.com.royalpay.payment.manage.merchants.beans.SubMerchantIdApply;
 import au.com.royalpay.payment.manage.merchants.core.ClientComplyValidator;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.notice.core.MailService;
@@ -3172,7 +3151,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 result.put("contract_info", messageSource.getMessage("sys.contract.info", null, RequestEnvironment.getLocale()));
             }
             JSONObject file = clientContractService.getOrGenerateSourceAgreement(account.getIntValue("client_id"),"pc");
+            if(file!=null){
                 result.put("file_url", file.getString("file_value"));
+            }else {
+                result.put("file_url","");
+            }
             return result;
         }
 

src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java

@@ -64,6 +64,7 @@ public class ClientContractServiceImpl implements ClientContractService {
             return files.get(0);
         } else {
             List<JSONObject> files = clientFilesMapper.findFileByClientAndType(client_id, "source_agree_file");
+            if(!CollectionUtils.isEmpty(files)) {
                 JSONObject file = files.get(0);
                 if (expireInfo.getBoolean("rate_expire")) {
                     contract.put("create_time", now);
@@ -72,6 +73,8 @@ public class ClientContractServiceImpl implements ClientContractService {
                 }
                 return file;
             }
+            return null;
+        }
 
     }
 

src/main/java/au/com/royalpay/payment/manage/task/BillOrderCheckTask.java

@@ -32,11 +32,14 @@ public class BillOrderCheckTask {
         if(CollectionUtils.isEmpty(orderIds)){
             return;
         }
-        orderIds.forEach((p) -> {
+        for (String p : orderIds) {
+            if (p==null){
+                continue;
+            }
             JSONObject order = orderMapper.find(p);
             if(order.getIntValue("status")==3||order.getIntValue("status")==1){
                 billOrderMapper.updateStatusByOrderId(p,"2");
             }
-        });
+        }
     }
 }

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

@@ -13,4 +13,9 @@
         where file_name = 'source_agree_file'
         and client_id = #{client_id}
     </update>
+    <select id="findClientFile" resultType="com.alibaba.fastjson.JSONObject">
+        select * from sys_files
+        where client_id = #{client_id}
+        order by last_update_date
+    </select>
 </mapper>