提交代码

service/src/main/java/com/hfkj/channel/saas/SaasMerService.java

@@ -135,7 +135,7 @@ public class SaasMerService {
             body.put("busiCode", "WECHAT_PAY");
             body.put("merRegName", basisModel.getMerName());
             body.put("merType", basisModel.getMerType().equals(MerTypeEnum.status2.getNumber())?"TP_MERCHANT":"TP_PERSONAL");
-            body.put("merName", basisModel.getMerName());
+            body.put("merName", basisModel.getMerAbbreviate());
             body.put("merAddr", SaasMerService.dislodge(basisModel.getMerRegion().getAddress()));
             body.put("provinceCode", province.getSaasCode());
             body.put("cityCode", city.getSaasCode());
@@ -397,6 +397,20 @@ public class SaasMerService {
             attachmentsMapList.add(attachmentsMap);
         }
 
+        if (StringUtils.isNotBlank(merSettleAcctApply.getSettleIdCardPortraitImg())) {
+            attachmentsMap = new HashMap<>();
+            attachmentsMap.put("imgType", "SETTLE_ID_CARD_FRONT");
+            attachmentsMap.put("imgPath", saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ merSettleAcctApply.getSettleIdCardPortraitImg()), "SETTLE_ID_CARD_FRONT", "0").getString("url"));
+            attachmentsMapList.add(attachmentsMap);
+        }
+
+        if (StringUtils.isNotBlank(merSettleAcctApply.getSettleIdCardNationalEmblemImg())) {
+            attachmentsMap = new HashMap<>();
+            attachmentsMap.put("imgType", "SETTLE_ID_CARD_BEHIND");
+            attachmentsMap.put("imgPath", saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ merSettleAcctApply.getSettleIdCardNationalEmblemImg()), "SETTLE_ID_CARD_BEHIND", "0").getString("url"));
+            attachmentsMapList.add(attachmentsMap);
+        }
+
         param.put("attachments", attachmentsMapList);
 
         Map<String,Object> header = new HashMap<>();
@@ -665,7 +679,7 @@ public class SaasMerService {
             param.put("reviewRelatedId", reviewRelatedId);
 
             Map<String,Object> header = new HashMap<>();
-            header.put("Authorization", "bearer " + saasCommon.getUpdateToken());
+            header.put("Authorization", "bearer " + "a547a4d5-0c9a-41a3-9851-f85ad8fbb464");
 
             String result = HttpsUtils.doSaasGet(SaasConfig.requestMerUpdateUrl+"customer/update/review", param, header, true);
             return JSONObject.parseObject(result);