diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java index 370d70c43..112f213d0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AdjustmentOrderServiceImpl.java @@ -286,13 +286,12 @@ public class AdjustmentOrderServiceImpl implements AdjustmentOrderService { } OutStoreIdRequest outStoreIdRequest = new OutStoreIdRequest(); outStoreIdRequest.setOutStoreId(adjustmentOrder.getStoreId()); - List accountInfoList = walletApiService.getAccountInfo(outStoreIdRequest); + AccountInfoDTO accountInfoDTO = walletApiService.getOnlineAccountInfo(outStoreIdRequest); - if (CollectionUtils.isEmpty(accountInfoList)){ + if (Objects.isNull(accountInfoDTO)){ throw new ServiceException(ErrorCodeEnum.NOT_EXIST_WANG_SHANG_ACCOUNT); } - AccountInfoDTO accountInfoDTO = accountInfoList.get(0); Integer splitType = request.getSplitType(); if (splitType==null){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java index 282e26146..a0937ccbc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/store/impl/PreAllocationRecordServiceImpl.java @@ -270,9 +270,8 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic } if (StringUtil.isNotEmpty(shopInfo.getStoreId())){ - List accountInfo = walletApiService.getAccountInfo(new OutStoreIdRequest(shopInfo.getStoreId())); - if (CollectionUtils.isNotEmpty(accountInfo)){ - AccountInfoDTO accountInfoDTO = accountInfo.get(0); + AccountInfoDTO accountInfoDTO = walletApiService.getOnlineAccountInfo(new OutStoreIdRequest(shopInfo.getStoreId())); + if (Objects.nonNull(accountInfoDTO)){ String totalAmount = accountInfoDTO.getTotalAmount(); BigDecimal total = new BigDecimal(totalAmount); //校验本次缴纳金额 @@ -735,12 +734,11 @@ public class PreAllocationRecordServiceImpl implements PreAllocationRecordServic ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(record.getShopId()); OutStoreIdRequest outStoreIdRequest = new OutStoreIdRequest(); outStoreIdRequest.setOutStoreId(shopInfo.getStoreId()); - List accountInfoList = walletApiService.getAccountInfo(outStoreIdRequest); - if (CollectionUtils.isEmpty(accountInfoList)){ + AccountInfoDTO accountInfoDTO = walletApiService.getOnlineAccountInfo(outStoreIdRequest); + if (Objects.isNull(accountInfoDTO)){ throw new ServiceException(ErrorCodeEnum.NOT_EXIST_WANG_SHANG_ACCOUNT); } //校验金额 - AccountInfoDTO accountInfoDTO = accountInfoList.get(0); String totalAmount = accountInfoDTO.getTotalAmount(); Boolean amountSupport = BigDecimalUtils.greaterThanOrEqual(new BigDecimal(totalAmount), record.getPayAmount()); if (!amountSupport){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java index 0020df38c..7ffc7fd25 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java @@ -2,6 +2,7 @@ package com.cool.store.service.wallet; import com.alibaba.fastjson.JSONObject; import com.cool.store.dto.wallet.*; +import com.cool.store.enums.wechat.WalletTypeEnum; import com.cool.store.http.WalletHttpClientRest; import com.cool.store.request.wallet.*; import com.cool.store.utils.StringUtil; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; /** * @Author suzhuhong @@ -79,6 +81,18 @@ public class WalletApiService { return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/account/v1/addTag", request, AddTagDTO.class); } + + /** + * 获取网商账户(如果多个 取出来第一个) + * @param request + * @return + */ + public AccountInfoDTO getOnlineAccountInfo(OutStoreIdRequest request){ + List accountInfo = getAccountInfo(request); + return accountInfo.stream().filter(v -> Objects.nonNull(v.getWalletType()) && v.getWalletType().equals(WalletTypeEnum.ONLINE_BANK.getType())).findFirst().orElse(null); + } + + /** * 获取账户信息 * @param request 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 ae996a382..068a91111 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 @@ -568,11 +568,10 @@ public class WalletServiceImpl implements WalletService { if (request.getFeeItemId()==null){ request.setFeeItemId(400); } - List accountInfoList = walletApiService.getAccountInfo(new OutStoreIdRequest(request.getStoreId())); - if (CollectionUtils.isEmpty(accountInfoList)){ + AccountInfoDTO accountInfoDTO = walletApiService.getOnlineAccountInfo(new OutStoreIdRequest(request.getStoreId())); + if (Objects.isNull(accountInfoDTO)){ throw new ServiceException(ErrorCodeEnum.NOT_EXIST_WANG_SHANG_ACCOUNT); } - AccountInfoDTO accountInfoDTO = accountInfoList.get(0); TradeRecodePageRequest tradeRecodePageRequest = request.convertToTradeRecodePageRequest(); tradeRecodePageRequest.setAccountNo(accountInfoDTO.getAccountNo()); // String a = "{\"page\":{\"currentPage\":1,\"pageSize\":10,\"total\":37,\"count\":4,\"first\":true,\"last\":false},\"pageData\":[{\"reqNo\":\"422712987693189\",\"tradeId\":422712987734149,\"outTradeNo\":\"202604030907217199\",\"feeItemId\":209,\"feeItemName\":\"提现\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000219703200034\",\"inAccountNo\":\"6214836146244633\",\"inAccountName\":\"苏竹红\",\"outAccountName\":\"望江县苏荷服装店(个体工商户)\",\"withdrawalBankCardNo\":\"6214836146244633\",\"withdrawalBankCardName\":\"苏竹红\",\"amount\":\"0.01\",\"tradeStatus\":1,\"tradeType\":2,\"remark\":\"提现\",\"errMsg\":\"\",\"createTime\":\"2026-04-09 11:03:33 +0800 CST\",\"outThirdStoreId\":\"0b382f3b789d4a82919d863626eb46a0\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260406102649175873\",\"tradeId\":421642280509638,\"outTradeNo\":\"202604590659624412\",\"feeItemId\":315,\"feeItemName\":\"加盟保证金\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230437105734\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"13000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-06 10:26:49 +0800 CST\",\"outThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260406102649175192\",\"tradeId\":421642279608518,\"outTradeNo\":\"202604590659247677\",\"feeItemId\":311,\"feeItemName\":\"管理费(年)\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230437105734\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"7200.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-06 10:26:49 +0800 CST\",\"outThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260406102649174677\",\"tradeId\":421642279346374,\"outTradeNo\":\"202604590659649754\",\"feeItemId\":310,\"feeItemName\":\"加盟费\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230437105734\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"23000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-06 10:26:49 +0800 CST\",\"outThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260406102649175449\",\"tradeId\":421642279850182,\"outTradeNo\":\"202604590659269101\",\"feeItemId\":312,\"feeItemName\":\"品牌使用费(年)\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230437105734\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"6000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-06 10:26:49 +0800 CST\",\"outThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"2026040410152060066006730073317634\",\"tradeId\":421001139474629,\"outTradeNo\":\"202604730466944804\",\"feeItemId\":400,\"feeItemName\":\"账户充值\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"6222620170012855081\",\"inAccountNo\":\"226801000230437105734\",\"inAccountName\":\"王彦召\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"167000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-04 14:58:01 +0800 CST\",\"outThirdStoreId\":\"\",\"inThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"2026040410152060066006730073306436\",\"tradeId\":420940632989893,\"outTradeNo\":\"202604730466816938\",\"feeItemId\":400,\"feeItemName\":\"账户充值\",\"outStoreCode\":\"\",\"inStoreCode\":\"\",\"outStoreName\":\"\",\"inStoreName\":\"\",\"outAccountNo\":\"6222620170012855081\",\"inAccountNo\":\"226801000230437105734\",\"inAccountName\":\"王彦召\",\"outAccountName\":\"王彦召\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"10.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-04 10:51:49 +0800 CST\",\"outThirdStoreId\":\"\",\"inThirdStoreId\":\"6fa404c6888f44389882d5b106a0126f\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"2026040310152060066006860064494468\",\"tradeId\":420447948849349,\"outTradeNo\":\"202604860357164314\",\"feeItemId\":400,\"feeItemName\":\"账户充值\",\"outStoreCode\":\"\",\"inStoreCode\":\"M24933\",\"outStoreName\":\"\",\"inStoreName\":\"正新鸡排五马街蝉街店\",\"outAccountNo\":\"6222801422141101593\",\"inAccountNo\":\"226801000230176116869\",\"inAccountName\":\"池晓静\",\"outAccountName\":\"池晓静\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"22538.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-03 01:27:05 +0800 CST\",\"outThirdStoreId\":\"\",\"inThirdStoreId\":\"125f9cb54d254ef19b2ba7f6919c7aab\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260402143630390598\",\"tradeId\":420288065171654,\"outTradeNo\":\"202604590257151330\",\"feeItemId\":315,\"feeItemName\":\"加盟保证金\",\"outStoreCode\":\"M24933\",\"inStoreCode\":\"\",\"outStoreName\":\"正新鸡排五马街蝉街店\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230176116869\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"池晓静\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"13000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-02 14:36:30 +0800 CST\",\"outThirdStoreId\":\"125f9cb54d254ef19b2ba7f6919c7aab\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"},{\"reqNo\":\"20260402143630390720\",\"tradeId\":420288064905414,\"outTradeNo\":\"202604590256834068\",\"feeItemId\":312,\"feeItemName\":\"品牌使用费(年)\",\"outStoreCode\":\"M24933\",\"inStoreCode\":\"\",\"outStoreName\":\"正新鸡排五马街蝉街店\",\"inStoreName\":\"\",\"outAccountNo\":\"226801000230176116869\",\"inAccountNo\":\"226801000229636396595\",\"inAccountName\":\"海南正新多品牌管理有限公司\",\"outAccountName\":\"池晓静\",\"withdrawalBankCardNo\":\"\",\"withdrawalBankCardName\":\"\",\"amount\":\"6000.00\",\"tradeStatus\":1,\"tradeType\":1,\"remark\":\"\",\"errMsg\":\"\",\"createTime\":\"2026-04-02 14:36:30 +0800 CST\",\"outThirdStoreId\":\"125f9cb54d254ef19b2ba7f6919c7aab\",\"inThirdStoreId\":\"\",\"outAccountBankName\":\"\",\"outAccountBankCardNo\":\"\",\"outCompanyCode\":\"\",\"outCompanyName\":\"\",\"inAccountBankName\":\"\",\"inAccountBankCardNo\":\"\",\"inCompanyCode\":\"\",\"inCompanyName\":\"\",\"transType\":\"\"}]}\n";