From 13c6df8126224d6c1940a5a352486274da20d81b Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 6 Aug 2025 00:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=85=A5=E9=A9=BB=EF=BC=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?=20mchid=20=E4=B8=BA=E4=B8=BB=EF=BC=8C=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E5=92=8C=E7=94=9F=E6=88=90=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=90=88=E5=90=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LakalaApiServiceImpl.java | 3 ++ .../lakala/service/impl/LklTkServiceImpl.java | 16 ++++---- .../admin/ShopStoreBaseController.java | 2 +- .../store/service/ShopStoreBaseService.java | 8 ++-- .../impl/ShopStoreBaseServiceImpl.java | 41 +++++++++---------- 5 files changed, 36 insertions(+), 34 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java index 98cdc397..6837b1b9 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java @@ -1378,6 +1378,9 @@ public class LakalaApiServiceImpl implements LakalaApiService { // 2. 解析回调参数 JSONObject paramsJSON = JSONUtil.parseObj(checkResult.getSecond()); + + log.info("##### 商家绑定接收方回调参数：{} ####", paramsJSON); + if (paramsJSON == null || StrUtil.isBlank(paramsJSON.getStr("applyId"))) { // https://o.lakala.com/#/home/document/detail?id=386 返回的数据结果有歧义，需处理 paramsJSON = paramsJSON.getJSONObject("respData"); 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 4cae6e49..3f3533ad 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 @@ -523,7 +523,7 @@ public class LklTkServiceImpl { shopMchEntryService.updateMerchEntryApprovalByMchId(shopMchEntry.getId(), CommonConstant.MCH_APPR_STA_LKL_NOPASS, "进件失败：" + errMsg); - return Pair.of(false, "进件失败：" + errMsg); + return Pair.of(false, "提交进件失败：" + errMsg); } // 更改入驻记录的拉卡拉内部商户号和进件请求参数 @@ -533,14 +533,14 @@ public class LklTkServiceImpl { if (!success) { shopMchEntryService.updateMerchEntryApprovalByMchId(shopMchEntry.getId(), CommonConstant.MCH_APPR_STA_LKL_NOPASS, "进件成功，但更新商户号失败！"); - return Pair.of(false, "请求进件成功，但更新商户号失败！"); + return Pair.of(false, "提交进件成功，但更新商户号失败！"); } } catch (Exception e) { logger.error("拉卡拉进件异常：{}", e.getMessage()); shopMchEntryService.updateMerchEntryApprovalByMchId(shopMchEntry.getId(), CommonConstant.MCH_APPR_STA_LKL_NOPASS, "进件失败：" + e.getMessage()); - return Pair.of(false, "进件失败：" + e.getMessage()); + return Pair.of(false, "提交进件失败：" + e.getMessage()); } @@ -646,15 +646,15 @@ public class LklTkServiceImpl { // 新建一个正式的已审核通过的店铺，不要抛异常，使用补偿机制，可以独立初始化店铺 ShopMchEntry shopEntry = shopMchEntryService.getShopMerchEntryByMerCupNo(merCupNo); if (shopEntry != null && !CommonConstant.Enable.equals(shopEntry.getStore_status())) { - String mchMobile = shopEntry.getLogin_mobile(); + Long mchId = shopEntry.getId(); - // 包含了更改 merchEntryInfo 的状态 - Pair retPair = shopStoreBaseService.covMerchEntryInfo2StoreInfo(mchMobile, false); + // 重要：包含了更改 merchEntryInfo 的状态 TODO 用法人、小微个人的手机号注册商家账号，作为店铺的管理员 + Pair retPair = shopStoreBaseService.covMerchEntryInfo2StoreInfo(mchId, false); if (retPair.getFirst() <= 0) { - logger.error("初始化店铺失败: mchMobile={}, reason={}", mchMobile, retPair.getSecond()); + logger.error("初始化店铺失败: mchId={}, reason={}", mchId, retPair.getSecond()); } - logger.info("初始化店铺成功！mchMobile={}", mchMobile); + logger.info("初始化店铺成功！mchId={}", mchId); // boolean updateSuccess = shopMchEntryService.updateMulStatus(mchMobile, "", 0, 0, 1, 0, 0, 0, CommonConstant.MCH_APPR_STA_LKL_PADDING); // if (!updateSuccess) { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java index ce363ded..b9b0e4f8 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java @@ -273,7 +273,7 @@ public class ShopStoreBaseController extends BaseControllerImpl { @ApiOperation(value = "商家入驻资料转成店铺", notes = "商家入驻资料转成店铺") @RequestMapping(value = "/mchinfo/to/storeinfo", method = RequestMethod.POST) public CommonResult merchEntryInfo2StoreInfo(@RequestBody JSONObject jsonParam) { - Pair result = shopStoreBaseService.merchEntryInfo2StoreInfo(jsonParam.getStr("mchMobile"), true); + Pair result = shopStoreBaseService.merchEntryInfo2StoreInfo(jsonParam.getLong("mchId"), true); if (result.getFirst().equals(0)) { return CommonResult.failed(result.getSecond()); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java index 0f859b0f..5037c0cd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/ShopStoreBaseService.java @@ -149,20 +149,20 @@ public interface ShopStoreBaseService extends IBaseService { /** * （重要）入驻审批通过并且合同盖章完结之后，把商家入驻信息转换成店铺信息，正式生成店铺所需的数据 * - * @param mchMobile + * @param mchId * @param allowThrown 是否允许抛出异常 * @return 店铺Id */ - Pair merchEntryInfo2StoreInfo(String mchMobile, Boolean allowThrown); + Pair merchEntryInfo2StoreInfo(Long mchId, Boolean allowThrown); /** * (重要）入驻审批通过并且合同盖章完结之后，把商家入驻信息转换成店铺信息，正式生成店铺所需的数据 * - * @param mchMobile + * @param mchId * @param allowThrown 是否允许抛出异常？ * @return */ - Pair covMerchEntryInfo2StoreInfo(String mchMobile, Boolean allowThrown); + Pair covMerchEntryInfo2StoreInfo(Long mchId, Boolean allowThrown); /** * 根据店铺名称判断店铺是否存在 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java index 3a613221..25a7d488 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java @@ -3024,43 +3024,46 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl merchEntryInfo2StoreInfo(String mchMobile, Boolean allowThrown) { - return covMerchEntryInfo2StoreInfo(mchMobile, allowThrown); + public Pair merchEntryInfo2StoreInfo(Long mchId, Boolean allowThrown) { + return covMerchEntryInfo2StoreInfo(mchId, allowThrown); } /** - * 重要）入驻审批通过并且合同盖章完结之后，把商家入驻信息转换成店铺信息，正式生成店铺所需的数据 + * （重要）入驻审批通过并且合同盖章完结之后，把商家入驻信息转换成店铺信息，正式生成店铺所需的数据 * - * @param mchMobile + * @param mchId * @param allowThrown 是否允许抛出异常？ * @return */ @Override - public Pair covMerchEntryInfo2StoreInfo(String mchMobile, Boolean allowThrown) { - if (StrUtil.isBlank(mchMobile)) { - logger.error("生成店铺：商家手机号不能为空"); - return Pair.of(0, "商家手机不能为空"); + public Pair covMerchEntryInfo2StoreInfo(Long mchId, Boolean allowThrown) { + + // TODO 用法人、小微个人的手机号注册商家账号，作为店铺的管理员 + + if (ObjectUtil.isEmpty(mchId)) { + logger.error("生成店铺：入驻商家自增Id不能为空"); + return Pair.of(0, "入驻商家自增Id不能为空"); } - // 从绑定关系中，获取商家注册账号信息 - Integer userId = accountService.getUserBindConnectUserIdByCondition(mchMobile, BindCode.MOBILE, CommonConstant.USER_TYPE_MCH); - if (userId == null) { - logger.error("生成店铺：绑定关系中获取不到该手机{}商家的账号", mchMobile); - return Pair.of(0, "该商家手机未注册账号！"); - } - - ShopMchEntry shopMchEntry = shopMchEntryService.getShopMerchEntryByCondition(mchMobile, ""); + ShopMchEntry shopMchEntry = shopMchEntryService.shopMerchEntryById(mchId); if (shopMchEntry == null) { logger.error("生成店铺：入驻信息不能为空"); return Pair.of(0, "入驻信息不能为空"); } + // 从绑定关系中，获取商家注册账号信息 + Integer userId = accountService.getUserBindConnectUserIdByCondition(shopMchEntry.getLogin_mobile(), BindCode.MOBILE, CommonConstant.USER_TYPE_MCH); + if (userId == null) { + logger.error("生成店铺：该商家申请人手机{}未注册账号", shopMchEntry.getLogin_mobile()); + return Pair.of(0, "该商家申请人手机未注册账号！"); + } + if (isExistsByStoreName(shopMchEntry.getStore_name())) { logger.error("生成店铺：店铺名称已存在"); return Pair.of(0, "店铺名称已存在，请使用另一个名称"); @@ -3094,10 +3097,6 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl districtList = shopBaseDistrictService.getFullDistrictByDistrictCode(shopMchEntry.getCounty_id()); - //shopStoreBase.setStore_district_id(shopBaseDistrictService.joinDistrict(districtList, 1, true, "/")); - // shopStoreBase.setStore_area(shopBaseDistrictService.joinDistrict(districtList, 2, true, "/")); - shopStoreBase.setStore_district_id(shopMchEntry.getStore_district()); shopStoreBase.setStore_area(shopMchEntry.getStore_area()); shopStoreBase.setStore_address(shopMchEntry.getStore_address());