Upd:信用卡合规流程

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

@@ -5675,7 +5675,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     try {
                         TemplateMessage msg = initTaskFinishTemplate(wxopenid, client_moniker + "已正式开通", "Compliance审核通过", "");
                         MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
-                        paymentApi.sendTemplateMessage(msg);
+//                        paymentApi.sendTemplateMessage(msg);
                     } catch (WechatException e) {
                         logger.error("Wechat Message Error,open_status=5" + e.getMessage());
                         publisher.publishEvent(new WechatExceptionEvent(this, e, "Audit,open_status=5,openid=" + wxopenid));
@@ -5723,7 +5723,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                         MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
                         TemplateMessage msg = initSendCommissionTemplate(wxopenid, paymentApi.getTemplateId("commission"), "BD申请制作信用卡支付合同" + client_moniker,
                                 bd_user_name, "制作卡支付合同申请", "BD申请制作" + short_name + "的卡支付合同");
-                        paymentApi.sendTemplateMessage(msg);
+//                        paymentApi.sendTemplateMessage(msg);
                     } catch (WechatException e) {
                         logger.error("Wechat Message Error,open_status=1" + e.getMessage());
                         publisher.publishEvent(new WechatExceptionEvent(this, e, "Audit,open_status=1,openid=" + wxopenid));
@@ -5741,7 +5741,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                         MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
                         TemplateMessage msg = initSendCommissionTemplate(wxopenid, paymentApi.getTemplateId("commission"), client_moniker + "信用卡支付合同制作完成",
                                 "Compliance", "合规材料", "上传完整合规材料,商户：" + short_name);
-                        paymentApi.sendTemplateMessage(msg);
+//                        paymentApi.sendTemplateMessage(msg);
                     } catch (WechatException e) {
                         logger.error("Wechat Message Error,open_status=3" + e.getMessage());
                         publisher.publishEvent(new WechatExceptionEvent(this, e, "Audit,open_status=3,openid=" + wxopenid));
@@ -5764,7 +5764,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                         MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
                         TemplateMessage msg = initSendCommissionTemplate(wxopenid, paymentApi.getTemplateId("commission"), client_moniker + "信用卡卡支付合规材料已提交",
                                 bd_user_name, "审核材料", "已提交合规材料，等待审核");
-                        paymentApi.sendTemplateMessage(msg);
+//                        paymentApi.sendTemplateMessage(msg);
                     } catch (WechatException e) {
                         logger.error("Wechat Message Error,open_status=1" + e.getMessage());
                         publisher.publishEvent(new WechatExceptionEvent(this, e, "Audit,open_status=1,openid=" + wxopenid));
@@ -5783,7 +5783,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     try {
                         TemplateMessage msg = initTaskFinishTemplate(wxopenid, client_moniker + "已正式开通", "Card Payment Compliance审核通过", "");
                         MpWechatApi paymentApi = mpWechatApiProvider.getNewPaymentApi();
-                        paymentApi.sendTemplateMessage(msg);
+//                        paymentApi.sendTemplateMessage(msg);
                     } catch (WechatException e) {
                         logger.error("Wechat Message Error,open_status=5" + e.getMessage());
                         publisher.publishEvent(new WechatExceptionEvent(this, e, "Audit,open_status=5,openid=" + wxopenid));
@@ -7357,17 +7357,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject cardRate = clientRate.getJSONObject("ext_rates");
         JSONObject bankAccountInfo = clientBankAccountMapper.clientBankAccounts(clientId).get(0);
         JSONObject upayProfileInfo = sysClientUpayProfileMapper.findInfo(clientId);
+        JSONObject legalInfo = sysClientLegalPersonMapper.findRepresentativeInfo(clientId);
         //装在数据
         JSONObject info = new JSONObject();
         info.put("down_date", convertDateEnglish(new Date()));//下载文件日期
-        info.put("bussiness_name", (client.containsKey("business_name")?client.getString("business_name"):client.getString("contact_person")) + " ABN");//商圈类型
+        info.put("bussiness_name", (client.containsKey("business_name")?client.getString("business_name"):legalInfo.getString("representative_person")) + " "+client.getString("abn"));//商圈类型
         info.put("partner_address", client.getString("address"));//商家店铺地址
         info.put("partner_country", client.getString("country"));//国家
         info.put("partner_state", client.getString("state"));//洲
         info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称
         info.put("clean_days", client.getInteger("clean_days"));//T+规则清算天数
-        info.put("partner_industry_mcc", upayProfileInfo.getString("mv_industry"));//信用卡注册商户行业编码
+        info.put("partner_industry_mcc", upayProfileInfo.getString("mw_industry"));//信用卡注册商户行业编码
-        info.put("legal_bussiness", client.getString("contact_person") + " AS " + (client.containsKey("business_name")?client.getString("business_name"):client.getString("contact_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
+        info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name")?client.getString("business_name"):legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
         info.put("annual_rate",cardAnnualRate);//年费率
         info.put("cost_per_transaction", clientRate.getString("transaction_fee"));//每次交易成本
         info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费
@@ -7404,15 +7405,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new BadRequestException("rpaypmt_card rate Not configured");
         }
         JSONObject cardRate = clientRate.getJSONObject("ext_rates");
+        JSONObject legalInfo = sysClientLegalPersonMapper.findRepresentativeInfo(clientId);
 
         JSONObject info = new JSONObject();
         info.put("down_date", convertDateEnglish(new Date()));//下载文件日期
-        info.put("bussiness_name", (client.containsKey("business_name")?client.getString("business_name"):client.getString("contact_person")) + " ABN");//商圈类型
+        info.put("bussiness_name", (client.containsKey("business_name")?client.getString("business_name"):legalInfo.getString("representative_person")) + " "+client.getString("abn"));//商圈类型
         info.put("partner_address", client.getString("address"));//商家店铺地址
         info.put("partner_country", client.getString("country"));//国家
         info.put("partner_state", client.getString("state"));//洲
         info.put("partner_bussiness_name", client.getString("business_name"));//商户商用名称
-        info.put("legal_bussiness", client.getString("contact_person") + " AS " + (client.containsKey("business_name")?client.getString("business_name"):client.getString("contact_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
+        info.put("legal_bussiness", legalInfo.getString("representative_person") + " AS " + (client.containsKey("business_name")?client.getString("business_name"):legalInfo.getString("representative_person")) + " ABN " + client.getString("abn"));//拼接规则:法人名 AS 商用名称 ABD 编码
         info.put("domestic_fee", cardRate.getString("domestic_rate_value"));//国内服务费
         info.put("international_fee", cardRate.getString("overseas_rate_value"));//国际服务费
         info.put("promotional_effective_date", promotionalEffectiveDate);