入驻增加两个字段，收银台图片和银行开户许可证

mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java

@@ -96,6 +96,9 @@ public class ShopMchEntry implements Serializable {
     @ApiModelProperty(value = "入驻商家店铺门面环境图片的存储路径", required = true)
     private String environment_image;
 
+    @ApiModelProperty(value = "收银台照片", required = true)
+    private String checkstand_image;
+
     @ApiModelProperty(value = "入驻主体类型，企业或个人：1-企业；2-个人；", required = true)
     private Integer entity_type;
 
@@ -183,6 +186,9 @@ public class ShopMchEntry implements Serializable {
     @ApiModelProperty(value = "结算账户⾏号", required = true)
     private String openning_bank_code;
 
+    @ApiModelProperty(value = "开户许可证（银行对公开户证明）")
+    private String opening_permit_image;
+
     @ApiModelProperty(value = "结算账户清算⾏号")
     private String clearing_bank_code;
 

mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java

@@ -547,7 +547,8 @@ public class LklTkServiceImpl {
         logger.debug("开始处理商户附件文件，商户ID: {}", mchId);
         JSONArray attachments = new JSONArray();
         if (Boolean.TRUE.equals(isQy)) {
-            JSONObject SETTLE_ID_CARD_FRONT = updatePhoto(shopMchEntry.getLegal_person_id_images(), "FR_ID_CARD_FRONT", false);
+            // 企业
+            JSONObject SETTLE_ID_CARD_FRONT = updatePhoto(shopMchEntry.getLegal_person_id_images(), "ID_CARD_FRONT", false);
             if (SETTLE_ID_CARD_FRONT != null) {
                 attachments.put(SETTLE_ID_CARD_FRONT); // 法人身份证正面
                 logger.debug("成功添加法人身份证正面图片");
@@ -555,7 +556,7 @@ public class LklTkServiceImpl {
                 logger.warn("法人身份证正面图片添加失败");
             }
 
-            JSONObject SETTLE_ID_CARD_BEHIND = updatePhoto(shopMchEntry.getLegal_person_id_images2(), "FR_ID_CARD_BEHIND", false);
+            JSONObject SETTLE_ID_CARD_BEHIND = updatePhoto(shopMchEntry.getLegal_person_id_images2(), "ID_CARD_BEHIND", false);
             if (SETTLE_ID_CARD_BEHIND != null) {
                 attachments.put(SETTLE_ID_CARD_BEHIND); // 法人身份证国徽面
                 logger.debug("成功添加法人身份证国徽面图片");
@@ -571,7 +572,17 @@ public class LklTkServiceImpl {
                 logger.warn("营业执照图片添加失败");
             }
 
+            // 银行对公开户正面
+            JSONObject OPENING_PERMIT = updatePhoto(shopMchEntry.getOpening_permit_image(), "OPENING_PERMIT", false);
+            if (OPENING_PERMIT != null) {
+                attachments.put(OPENING_PERMIT); // 营业执照
+                logger.debug("成功添加开户许可证证明图片");
+            } else {
+                logger.warn("成功添加开户许可证证明图片添加失败");
+            }
+
         } else {
+            // 小微个人
             JSONObject ID_CARD_FRONT = updatePhoto(shopMchEntry.getIndividual_id_images(), "ID_CARD_FRONT", false);
             if (ID_CARD_FRONT != null) {
                 attachments.put(ID_CARD_FRONT); // 身份证正面
@@ -587,6 +598,15 @@ public class LklTkServiceImpl {
             } else {
                 logger.warn("身份证国徽面图片添加失败");
             }
+
+            // 对私必传银行卡
+            JSONObject BANK_CARD = updatePhoto(shopMchEntry.getBank_image(), "BANK_CARD", false);
+            if (BANK_CARD != null) {
+                attachments.put(BANK_CARD); // 银行卡图片
+                logger.debug("成功添加银行卡图片");
+            } else {
+                logger.warn("银行卡图片添加失败");
+            }
         }
 
         JSONObject SHOP_OUTSIDE_IMG = updatePhoto(shopMchEntry.getFront_facade_image(), "SHOP_OUTSIDE_IMG", false);
@@ -605,13 +625,15 @@ public class LklTkServiceImpl {
             logger.warn("门店内部图片添加失败");
         }
 
-        JSONObject BANK_CARD = updatePhoto(shopMchEntry.getBank_image(), "BANK_CARD", false);
+        // 收银台图片
-        if (BANK_CARD != null) {
+        JSONObject CHECKSTAND_IMG = updatePhoto(shopMchEntry.getCheckstand_image(), "CHECKSTAND_IMG", false);
-            attachments.put(BANK_CARD); // 银行卡图片
+        if (CHECKSTAND_IMG != null) {
-            logger.debug("成功添加银行卡图片");
+            attachments.put(CHECKSTAND_IMG); // 收银台图片
+            logger.debug("成功添加收银台图片");
         } else {
-            logger.warn("银行卡图片添加失败");
+            logger.warn("收银台图片添加失败");
         }
+
         reqJsonBody.put("attchments", attachments);
         logger.debug("商户附件文件处理完成，共添加 {} 个附件", attachments.size());
         // 附件文件相关结束

mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java

@@ -246,6 +246,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
             return CommonResult.failed("请选择是企业还是个人");
         }
 
+        if (StrUtil.isBlank(record.getCheckstand_image())) {
+            log.warn("未上传店铺门头照片，手机号: {}", loginMobile);
+            return CommonResult.failed("请上传店铺收银台照片");
+        }
+
         // 不管是企业或个人，只要没有填写联系人，就直接把商家手机号码作为联系人手机号码
         if (StrUtil.isBlank(record.getLegal_person_mobile())) {
             record.setLegal_person_mobile(loginMobile);
@@ -322,6 +327,12 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
                 return CommonResult.failed("缺少法人身份证信息！");
             }
 
+            // TODO 银行开户许可证明（开户账号图片） 必填项
+            if (StrUtil.isBlank(record.getOpening_permit_image())) {
+                log.warn("缺少银行开户许可证明图片，手机号: {}", loginMobile);
+                return CommonResult.failed("缺少银行开户许可证明图片！");
+            }
+
             if (!StringUtils.validateIDCard(record.getLegal_person_id_number())) {
                 log.warn("法人身份证号码格式错误，号码: {}，手机号: {}", record.getLegal_person_id_number(), loginMobile);
                 return CommonResult.failed("法人身份证号码有误！");
@@ -707,7 +718,6 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
             // 尝试更新入驻表的合同下载地址和合同签署状态
             updateMerchEntrySignedStatusAndContractDownloadUrl(record);
 
-
             if (StrUtil.isNotBlank(record.getStore_id())) {
                 // 转换为JSONObject并添加额外属性
                 JSONObject retObj = JSONUtil.parseObj(record);