From 170e77fd140144d3df09a0931f887ac018d75087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 12 Mar 2026 06:02:36 +0000 Subject: [PATCH] Merge #58 into master from cc_20260311_optimize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:无需鉴权直接返回开通成功的 * cc_20260311_optimize: (8 commits squashed) - fix:未分配招商区域处理 - fix - fix:线下收款银行配置默认值 - Merge branch 'master' into cc_20260311_optimize # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java - fix:账户别称修改 - fix:无需鉴权直接返回开通成功的，阶段状态流转 - fix:无需鉴权直接返回开通成功的 - Merge branch 'master' into cc_20260311_optimize # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/58 --- .../wallet/impl/WalletServiceImpl.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java index 8163018b2..e45225d51 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java @@ -127,10 +127,7 @@ public class WalletServiceImpl implements WalletService { // 直接返回开通成功的，流程流转 // 判断一下缴费阶段是否开启，未开启则开启缴费阶段 try { - ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70)); - } + walletOpenComplete(shopInfo); } catch (Exception e) { log.info("阶段流转失败"); } @@ -152,12 +149,20 @@ public class WalletServiceImpl implements WalletService { throw new ServiceException(ErrorCodeEnum.WALLET_OPEN_ACCOUNT_FAIL); } + walletOpenComplete(shopInfo); + + // 判断营业执照是否已经上传，已上传则调用打标接口 + addTagIfUploadLicense(request.getShopId(), shopInfo.getStoreId(), shopInfo.getLineId()); + return true; + } + + public void walletOpenComplete(ShopInfoDO shopInfo) { // 更新钱包开通阶段状态 List updateSubStageList = new ArrayList<>(); updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61); // 判断一下缴费阶段是否开启，未开启则开启缴费阶段 useStandardStore 普通店 标准店开启选配店型 if (shopInfo.getUseStandardStore()==0){ - ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_7); if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); @@ -184,11 +189,7 @@ public class WalletServiceImpl implements WalletService { updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_280); } - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), updateSubStageList); - - // 判断营业执照是否已经上传，已上传则调用打标接口 - addTagIfUploadLicense(request.getShopId(), shopInfo.getStoreId(), shopInfo.getLineId()); - return true; + shopStageInfoDAO.batchUpdateShopStageStatus(shopInfo.getId(), updateSubStageList); } @Override