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

Merge #106 into master from cc_20260422_feeItemId

Browse Source 
fix:垃圾代码删除

* cc_20260422_feeItemId: (3 commits squashed)

  - fix:费用类型feetId

  - fix:splitType 传入

  - fix:垃圾代码删除

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/106
This commit is contained in:
正新
2026-04-22 09:42:12 +00:00
parent e6797ce3ff
commit e9f37eb71a
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,14 +369,6 @@ public class WalletServiceImpl implements WalletService {
@Override @Override
public AccountDataVO getAccountList(AccountQueryRequest request) { public AccountDataVO getAccountList(AccountQueryRequest request) {
String storeId = getStoreId(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<AccountInfoDTO> accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(storeId)); List<AccountInfoDTO> accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(storeId));
String finalStoreId = storeId; String finalStoreId = storeId;
List<AccountInfoVO> accountList = accountInfo.stream() List<AccountInfoVO> accountList = accountInfo.stream()