From 026dab78ff5b37f8a27ff287dfe58f26492fdc99 Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 17 Nov 2025 10:06:36 +0800 Subject: [PATCH] fix --- .../java/com/cool/store/dto/wallet/AccountVerifyDTO.java | 2 +- .../store/service/wallet/impl/WalletServiceImpl.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java index d8a8c78aa..9e61a1786 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/AccountVerifyDTO.java @@ -12,6 +12,6 @@ public class AccountVerifyDTO { private String outStoreId; - private Integer accountStatus; + private Integer openStatus; } 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 092049b48..2043004da 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 @@ -1,6 +1,7 @@ package com.cool.store.service.wallet.impl; import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.CommonConstants; import com.cool.store.dao.RegionDao; import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; @@ -75,7 +76,7 @@ public class WalletServiceImpl implements WalletService { .bankName(request.getBankName()) .build(); StoreAccountDTO storeAndAccount = walletApiService.createStoreAndAccount(accountRequest); - return StringUtils.isNotBlank(storeAndAccount.getAccountId()); + return StringUtils.isNotBlank(storeAndAccount.getAccountNo()); } @Override @@ -84,6 +85,10 @@ public class WalletServiceImpl implements WalletService { // 调用 门店签约人账户鉴权申请接口 AccountAuthenticationDTO authentication = walletApiService.authentication(new OutStoreIdRequest(shopInfo.getStoreId())); if (Objects.nonNull(authentication)) { + if (authentication.getAccountStatus().equals(4)) { + // 判断营业执照是否已经上传，已上传则调用打标接口 + addTagIfUploadLicense(request.getShopId(), shopInfo.getStoreId()); + } return new AccountAuthenticationVO(authentication.getAccountStatus()); } throw new ServiceException(ErrorCodeEnum.WALLET_OPEN_ACCOUNT_FAIL); @@ -97,7 +102,7 @@ public class WalletServiceImpl implements WalletService { // 调用 门店签约人账户开通接口 log.info("开通账户"); AccountVerifyDTO accountVerifyDTO = walletApiService.openAccount(new AccountVerifyRequest(shopInfo.getStoreId(), request.getCode())); - if (!PingAnAccountStatusEnum.OPEN.getStatus().equals(accountVerifyDTO.getAccountStatus())) { + if (!CommonConstants.INDEX_ONE.equals(accountVerifyDTO.getOpenStatus())) { throw new ServiceException(ErrorCodeEnum.WALLET_OPEN_ACCOUNT_FAIL); }