From dbac467b029d40e47898b6ea21dbe488e8b9236a 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 01:59:56 +0000 Subject: [PATCH] Merge #57 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: (6 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:无需鉴权直接返回开通成功的，阶段状态流转 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/57 --- .../store/service/wallet/impl/WalletServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 44c51428a..8163018b2 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 @@ -124,6 +124,16 @@ public class WalletServiceImpl implements WalletService { if (authentication.getAccountStatus().equals(4)) { // 判断营业执照是否已经上传，已上传则调用打标接口 addTagIfUploadLicense(request.getShopId(), shopInfo.getStoreId(), shopInfo.getLineId()); + // 直接返回开通成功的，流程流转 + // 判断一下缴费阶段是否开启，未开启则开启缴费阶段 + 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)); + } + } catch (Exception e) { + log.info("阶段流转失败"); + } } return new AccountAuthenticationVO(authentication.getAccountStatus()); }