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

Merge #58 into master from cc_20260311_optimize

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/58
This commit is contained in:
王非凡
2026-03-12 06:02:36 +00:00
committed by 正新
parent dbac467b02
commit 170e77fd14
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,10 +127,7 @@ public class WalletServiceImpl implements WalletService {
// 直接返回开通成功的，流程流转 // 直接返回开通成功的，流程流转
// 判断一下缴费阶段是否开启，未开启则开启缴费阶段 // 判断一下缴费阶段是否开启，未开启则开启缴费阶段
try { try {
ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); walletOpenComplete(shopInfo);
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) { } catch (Exception e) {
log.info("阶段流转失败"); log.info("阶段流转失败");
} }
@@ -152,12 +149,20 @@ public class WalletServiceImpl implements WalletService {
throw new ServiceException(ErrorCodeEnum.WALLET_OPEN_ACCOUNT_FAIL); 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<ShopSubStageStatusEnum> updateSubStageList = new ArrayList<>(); List<ShopSubStageStatusEnum> updateSubStageList = new ArrayList<>();
updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61); updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_61);
// 判断一下缴费阶段是否开启，未开启则开启缴费阶段 useStandardStore 普通店 标准店开启选配店型 // 判断一下缴费阶段是否开启，未开启则开启缴费阶段 useStandardStore 普通店 标准店开启选配店型
if (shopInfo.getUseStandardStore()==0){ 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())) { if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) {
updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70);
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
@@ -184,11 +189,7 @@ public class WalletServiceImpl implements WalletService {
updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_280); updateSubStageList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_280);
} }
shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), updateSubStageList); shopStageInfoDAO.batchUpdateShopStageStatus(shopInfo.getId(), updateSubStageList);
// 判断营业执照是否已经上传，已上传则调用打标接口
addTagIfUploadLicense(request.getShopId(), shopInfo.getStoreId(), shopInfo.getLineId());
return true;
} }
@Override @Override