From 8af7ba47487f631adb0b05c236350b89ac7e8a1a Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 31 Dec 2025 21:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E9=A9=BB=E5=A2=9E=E5=8A=A0=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=94=B6=E9=93=B6=E5=8F=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=92=8C=E9=93=B6=E8=A1=8C=E5=BC=80=E6=88=B7?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/modules/store/ShopMchEntry.java | 6 ++++ .../lakala/service/impl/LklTkServiceImpl.java | 36 +++++++++++++++---- .../service/impl/ShopMchEntryServiceImpl.java | 12 ++++++- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java index 6e8958d7..30a8edd3 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopMchEntry.java +++ b/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; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java index 882dff3d..cc0563c0 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java +++ b/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) { - attachments.put(BANK_CARD); // 银行卡图片 - logger.debug("成功添加银行卡图片"); + // 收银台图片 + JSONObject CHECKSTAND_IMG = updatePhoto(shopMchEntry.getCheckstand_image(), "CHECKSTAND_IMG", false); + if (CHECKSTAND_IMG != null) { + attachments.put(CHECKSTAND_IMG); // 收银台图片 + logger.debug("成功添加收银台图片"); } else { - logger.warn("银行卡图片添加失败"); + logger.warn("收银台图片添加失败"); } + reqJsonBody.put("attchments", attachments); logger.debug("商户附件文件处理完成，共添加 {} 个附件", attachments.size()); // 附件文件相关结束 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java index 963c2901..2cb75c81 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java @@ -246,6 +246,11 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl