suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #57 into master from cc_20260311_optimize

Browse Source 
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/57
This commit is contained in:
王非凡
2026-03-12 01:59:56 +00:00
committed by 正新
parent dbf25b4be9
commit dbac467b02
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
View File

@@ -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());
}