From bd5645296f513a426832768e31279ad782d17ce9 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Tue, 15 Jul 2025 21:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=AE=B6=E5=85=A5?= =?UTF-8?q?=E9=A9=BB=E5=85=A8=E9=83=A8=E7=8A=B6=E6=80=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ShopMchEntryAdminController.java | 6 ++ .../store/service/ShopMchEntryService.java | 9 ++ .../service/impl/ShopMchEntryServiceImpl.java | 96 +++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java index 564cc227..10980d7e 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java @@ -54,5 +54,11 @@ public class ShopMchEntryAdminController extends BaseControllerImpl { return shopMchEntryService.shopMerchEntryApproval(jsonParam.getLong("id"), jsonParam.getInt("approvalStatus"), jsonParam.getStr("approvalRemark"), jsonParam.getStr("approvalInvalidCol")); } + @ApiOperation(value = "检查商户入驻店铺所有状态情况", notes = "检查商户入驻店铺所有状态情况") + @RequestMapping(value = "/check/mechentry/all/status", method = RequestMethod.POST) + public CommonResult checkMchEntryStoreAllStatus(@RequestBody JSONObject jsonParam) { + return shopMchEntryService.checkMchEntryStoreAllStatus(jsonParam.getLong("mchId"), jsonParam.getInt("storeId")); + } + } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopMchEntryService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopMchEntryService.java index c5c176fe..b615398b 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopMchEntryService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopMchEntryService.java @@ -284,6 +284,15 @@ public interface ShopMchEntryService { */ Boolean checkMchEntryStoreStatus(Integer storeId); + /** + * 检查商户入驻店铺所有状态情况 + * + * @param mchId 商户入驻ID, 和店铺ID 必填一个 + * @param storeId 店铺ID, 和商户入驻ID 必填一个 + * @return + */ + CommonResult checkMchEntryStoreAllStatus(Long mchId, Integer storeId); + /** * 更新商户入驻签约状态和合同下载URL * 处理逻辑： 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 1abab36a..43d399f6 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 @@ -1523,4 +1523,100 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("status", CommonConstant.Enable); + if (CheckUtil.isNotEmpty(mchId)) queryWrapper.eq("id", mchId); + if (CheckUtil.isNotEmpty(storeId)) queryWrapper.eq("store_id", storeId); + + ShopMchEntry entry = findOne(queryWrapper); + if (entry == null) { + result.put("status", 2); + result.put("status_txt", "入驻流程未就绪"); + return CommonResult.success(result); + } + + // === 4. 检查各项状态 === + // 电子合同状态检查 + if (!CommonConstant.Enable.equals(entry.getHas_ec_signed())) { + result.put("status", 12); + result.put("status_txt", "电子合同未签署！"); + } + // 进件状态检查 + if (!CommonConstant.Enable.equals(entry.getHas_apply_mer())) { + result.put("status", 22); + result.put("status_txt", "商家未进件！"); + } + // 店铺初始化状态检查 + if (!CommonConstant.Enable.equals(entry.getStore_status())) { + result.put("status", 32); + result.put("status_txt", "店铺初始化未完成！"); + } + // 分账申请状态检查 + if (!CommonConstant.Enable.equals(entry.getHas_apply_split())) { + result.put("status", 42); + result.put("status_txt", "未申请分账业务！"); + } + // 接收方申请状态检查 + if (!CommonConstant.Enable.equals(entry.getHas_apply_receiver())) { + result.put("status", 52); + result.put("status_txt", "分账接收方未申请！"); + } + // 接收方绑定状态检查 + if (!CommonConstant.Enable.equals(entry.getHas_bind_receiver())) { + result.put("status", 62); + result.put("status_txt", "未绑定分账接收方！"); + } + + // === 5. 检查整体完成状态 === + if (CommonConstant.Enable.equals(entry.getApproval_status()) + && CommonConstant.Enable.equals(entry.getHas_ec_signed()) + && CommonConstant.Enable.equals(entry.getHas_apply_mer()) + && CommonConstant.Enable.equals(entry.getStore_status()) + && CommonConstant.Enable.equals(entry.getHas_apply_split()) + && CommonConstant.Enable.equals(entry.getHas_apply_receiver()) + && CommonConstant.Enable.equals(entry.getHas_bind_receiver())) { + result.put("status", 1); + result.put("status_txt", "所有入驻流程已完成！"); + } + + return CommonResult.success(result); + } catch (Exception e) { + log.error("检查商户入驻状态异常 mchId:{}, storeId:{}", mchId, storeId, e); + return CommonResult.failed("系统异常，请稍后重试"); + } + } }