Merge branch 'develop'

# Conflicts:
#	pom.xml

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.26</version>
+    <version>2.2.27</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java

@@ -125,9 +125,9 @@ public class ClientRegisterInfo {
     @JSONField(name = "enable_international_card")
     private boolean enableInternaltionCard;
     @JSONField(name = "enable_cross_payment")
-    private boolean enableCrossPayment;
+    private boolean enableCrossPayment = true;
     @JSONField(name = "enable_card_payment")
-    private boolean enableCardPayment;
+    private boolean enableCardPayment = false;
 
     public JSONObject insertObject() {
         if (industry == null) {

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

@@ -826,11 +826,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (clientMapper.findClientByMoniker(registery.getClientMoniker()) != null) {
             throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
         }
-        //2018-09-10,新建商户不检查是否在系统黑名单
+        clientMapper.save(partner);
-        //isRiskyMerchant(partner, null);
 
         try {
-            clientMapper.save(partner);
             JSONObject clientConfig = new JSONObject();
             clientConfig.put("client_id", partner.getIntValue("client_id"));
             clientConfig.put("client_moniker", partner.getString("client_moniker"));
@@ -838,16 +836,20 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             clientConfig.put("client_pay_desc", partner.get("client_pay_desc"));
             clientConfig.put("enable_cross_payment", partner.get("enable_cross_payment"));
             clientConfig.put("enable_card_payment", partner.get("enable_card_payment"));
-
             clientConfigService.save(clientConfig);
             permissionPartnerManagerImpl.permissionClientModuleSave(partner.getIntValue("client_id"), partner.getString("client_moniker"));
+        } catch (Exception e) {
+            throw new ServerErrorException("商户配置信息初始化失败");
+        }
+        try {
             saveLegalAndMarketingInfo(partner);
             if (registery.isEnableCardPayment()) {
                 sysClientUpayProfileMapper.save(partner);
             }
         } catch (Exception e) {
-            throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
+            throw new ServerErrorException("商户初始化法人信息失败");
         }
+
         if (ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
             JSONObject client_bd = new JSONObject();
             client_bd.put("client_id", partner.getIntValue("client_id"));
@@ -3207,6 +3209,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             saveClientAuditProcess(client.getIntValue("client_id"), 1, 2, "Compliance合同制作中", manager, 2);
         }
     }
+
     @Override
     @Transactional
     public void getAggregateCardPromotionaAgreeFile(String clientMoniker, JSONObject manager, boolean renewal, String promotionalEffectiveDate, int promotionalPeriod) throws ParseException {
@@ -4607,7 +4610,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
 
-
     public void updateAggregateFilesForWaitCompliance(JSONObject manager, int clientId, String fileType, String fileValue, List<JSONObject> fileResult) {
         if (fileValue != null) {
             List<JSONObject> passAggregateFiles = clientFilesMapper.findClientPassAggreeFile(clientId);