From 86258934c025fdc651f213e09ebcf0fef165faed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 11 Mar 2026 02:58:20 +0000 Subject: [PATCH] Merge #53 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: (2 commits squashed) - fix:未分配招商区域处理 - fix Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/53 --- .../cool/store/vo/fees/PayeeBankConfigVO.java | 6 +++++ .../fees/impl/PayeeBankConfigServiceImpl.java | 24 ++++++++++++++++++- .../impl/ShopAllocationInfoServiceImpl.java | 6 +++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java index efb8a5408..ba2b2661a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/fees/PayeeBankConfigVO.java @@ -2,7 +2,10 @@ package com.cool.store.vo.fees; import com.cool.store.enums.master.BrandTypeEnum; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -10,6 +13,9 @@ import java.util.Date; * 线下收款银行配置VO */ @Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PayeeBankConfigVO { @ApiModelProperty("id") private Long id; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java index bb6285fff..c18183f2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.cool.store.service.fees.impl; import cn.hutool.core.collection.CollStreamUtil; +import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; import com.cool.store.context.CurrentUserHolder; import com.cool.store.dao.EnterpriseUserDAO; @@ -21,6 +22,7 @@ import com.cool.store.request.fees.PayeeBankConfigPageRequest; import com.cool.store.service.fees.PayeeBankConfigService; import com.cool.store.utils.BeanUtil; import com.cool.store.utils.RedisUtilPool; +import com.cool.store.utils.poi.StringUtils; import com.cool.store.vo.fees.PayeeBankConfigVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -97,13 +99,33 @@ public class PayeeBankConfigServiceImpl implements PayeeBankConfigService { } FranchiseFeeDO franchiseFeeDO = franchiseFeeDAO.selectByShopId(shopId); if (Objects.isNull(payType) && (Objects.isNull(franchiseFeeDO) || Objects.isNull(franchiseFeeDO.getPayType()))) { - throw new ServiceException(ErrorCodeEnum.NO_PAYMENT_METHOD_IS_SET); + return getDefaultBankConfig(shopInfo.getFranchiseBrand()); } RegionDO regionDO = regionDao.getRegionById(shopInfo.getInvestRegionId()); + if (Objects.isNull(regionDO)) { + return getDefaultBankConfig(shopInfo.getFranchiseBrand()); + } PayeeBankConfigDO configDO = payeeBankConfigDAO.getByUniqueKey(Integer.valueOf(shopInfo.getFranchiseBrand()), Long.valueOf(regionDO.getParentId()), Objects.nonNull(payType) ? payType : franchiseFeeDO.getPayType()); return BeanUtil.toBean(configDO, PayeeBankConfigVO.class); } + public PayeeBankConfigVO getDefaultBankConfig(String franchiseBrand) { + String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":" + franchiseBrand); + if (StringUtils.isBlank(bankInfoStr)) { + bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":1"); + } + if (StringUtils.isNotBlank(bankInfoStr)) { + JSONObject bankInfo = JSONObject.parseObject(bankInfoStr); + return PayeeBankConfigVO.builder() + .payeeName(bankInfo.getString("receivingFirmName")) + .payeeAccount(bankInfo.getString("receivingMsBankAccount")) +// .payeeBank() + .payeeBankBranch(bankInfo.getString("receivingMsBankBranch")) + .build(); + } + return null; + } + /** * 校验： * 1) 加盟品牌+招商分部+付款方式唯一 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java index f689262a3..94933969a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/ShopAllocationInfoServiceImpl.java @@ -20,6 +20,7 @@ import com.cool.store.utils.BeanUtil; import com.cool.store.vo.dict.DictColumnSimpleVO; import com.cool.store.vo.fees.ShopAllocationSimpleVO; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -37,6 +38,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor +@Slf4j public class ShopAllocationInfoServiceImpl implements ShopAllocationInfoService { private final ShopAllocationInfoDAO shopAllocationInfoDAO; private final SysDictColumnDAO dictColumnDAO; @@ -112,6 +114,10 @@ public class ShopAllocationInfoServiceImpl implements ShopAllocationInfoService throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); } RegionDO regionDO = regionDao.getRegionById(shopInfo.getInvestRegionId()); + if (Objects.isNull(regionDO)) { + log.error("未分配招商区域"); + return Collections.emptyList(); + } Integer joinBrand = Integer.valueOf(shopInfo.getFranchiseBrand()); // 查询分账公司配置 List allocationConfigList = walletAllocationConfigDAO.selectByBrandAndInvest(joinBrand, Long.valueOf(regionDO.getParentId()));