From e9f37eb71a2f5c55914e772ffad8141f6db33bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Wed, 22 Apr 2026 09:42:12 +0000 Subject: [PATCH] Merge #106 into master from cc_20260422_feeItemId MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:垃圾代码删除 * cc_20260422_feeItemId: (3 commits squashed) - fix:费用类型feetId - fix:splitType 传入 - fix:垃圾代码删除 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/106 --- .../cool/store/service/wallet/impl/WalletServiceImpl.java | 8 -------- 1 file changed, 8 deletions(-) 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 e5976080d..ae996a382 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 @@ -369,14 +369,6 @@ public class WalletServiceImpl implements WalletService { @Override public AccountDataVO getAccountList(AccountQueryRequest request) { String storeId = getStoreId(request); - // 处理shopInfo和store表storeId不一致的问题，使用开店shop_info表的storeId - if (StringUtils.isNotBlank(request.getStoreId())) { - StoreDO storeDO = storeDao.getByStoreId(request.getStoreId()); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfoByShopCode(storeDO.getStoreNum()); - if (Objects.nonNull(shopInfo) && !storeDO.getStoreId().equals(shopInfo.getStoreId())) { - storeId = shopInfo.getStoreId(); - } - } List accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(storeId)); String finalStoreId = storeId; List accountList = accountInfo.stream()