fix:打标接口调用新增账户状态校验

coolstore-partner-common/src/main/java/com/cool/store/enums/wallet/PingAnAccountStatusEnum.java

@@ -16,7 +16,7 @@ import lombok.Getter;
 public enum PingAnAccountStatusEnum {
 
     UNCOMMITTED(1, "待提交"),
-    UNAUTHORIZED(2, "带鉴权"),
+    UNAUTHORIZED(2, "待鉴权"),
     AUTHENTICATING(3, "鉴权中"),
     OPEN(4, "开通"),
     ;

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java

@@ -97,8 +97,8 @@ public class ShopInfoDAO {
      * @return
      */
     public Long addShopInfo(ShopInfoDO shopInfo){
-        shopInfoMapper.insertSelective(shopInfo);
         shopInfo.setStoreId(UUIDUtils.get32UUID());
+        shopInfoMapper.insertSelective(shopInfo);
         return shopInfo.getId();
     }
 

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

@@ -27,6 +27,7 @@ import com.cool.store.vo.wallet.BankVO;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -149,6 +150,8 @@ public class WalletServiceImpl implements WalletService {
         // 营业执照已上传，调用打标接口
         if (Objects.nonNull(licenseTransactDO) && StringUtils.isNotBlank(licenseTransactDO.getCreditUrl())) {
             try {
+                // 判断一下账户的开通状态
+                if (enableAddTag(storeId)) {
                     // 调用 签约人账户打标（升级）接口
                     log.info("营业执照已上传，账户打标");
                     AccountAddTagRequest tagRequest = AccountAddTagRequest.builder()
@@ -162,12 +165,21 @@ public class WalletServiceImpl implements WalletService {
                             .build();
                     AddTagDTO addTagDTO = walletApiService.addTag(tagRequest);
                     log.info("打标接口调用成功，response:{}", JSONObject.toJSONString(addTagDTO));
+                }
             } catch (Exception e) {
                 log.error("营业执照已上传，打标失败", e);
             }
         }
     }
 
+    /**
+     * 账户存在且未打标
+     */
+    private boolean enableAddTag(String storeId) {
+        List<AccountInfoDTO> accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(storeId));
+        return CollectionUtils.isNotEmpty(accountInfo) && accountInfo.size() == 1 && accountInfo.get(0).getLabelingStatus().equals(0);
+    }
+
     /**
      * 查询并校验门店是否存在以及阶段是否处于平安钱包未开通状态
      */