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

fix：流水返回对象统一

Browse Source
This commit is contained in:
wangff
2025-11-24 16:27:19 +08:00
parent 9bc035fffd
commit 93417c4a4f
9 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletApiService.java
View File

@@ -134,8 +134,8 @@ public class WalletApiService {
* @param request
* @return
*/
public BillDetailDTO getBillDetail(BillDetailRequest request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/trans/v1/billDetail", request, BillDetailDTO.class);
public TradeRecordDTO getBillDetail(BillDetailRequest request){
return walletHttpClientRest.postWithSign(walletBaseUrl+"/open/crm/trans/v1/billDetail", request, TradeRecordDTO.class);
}
/**

2
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java
View File

@@ -107,7 +107,7 @@ public interface WalletService {
* @param request 交易详情查询Request
* @return 交易详情VO
*/
BillDetailDTO getBillDetail(BillDetailRequest request);
TradeRecordDTO getBillDetail(BillDetailRequest request);
/**
* 密码维护

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

@@ -166,7 +166,7 @@ public class WalletServiceImpl implements WalletService {
result.setPageSize(page.getPageSize());
result.setPages(page.getCount());
result.setTotal(page.getTotal());
result.setList(CollectionUtils.isNotEmpty(list) ? BeanUtil.toList(list, clazz) : Collections.emptyList());
result.setList(CollectionUtils.isNotEmpty(list) ? (list.get(0).getClass().equals(clazz) ? (List<R>) list : BeanUtil.toList(list, clazz)) : Collections.emptyList());
return result;
}
@@ -359,12 +359,12 @@ public class WalletServiceImpl implements WalletService {
.pageSize(request.getPageSize())
.build();
BillPageDTO billPage = walletApiService.getBillPage(billPageRequest);
PageInfo<AccountBillListVO> data = toPageInfo(billPage.getPageData(), AccountBillListVO.class, billPage.getPage());
PageInfo<TradeRecordDTO> data = toPageInfo(billPage.getPageData(), TradeRecordDTO.class, billPage.getPage());
return new AccountBillPageVO(data, billPage.getGetAmount(), billPage.getUseAmount());
}
@Override
public BillDetailDTO getBillDetail(BillDetailRequest request) {
public TradeRecordDTO getBillDetail(BillDetailRequest request) {
return walletApiService.getBillDetail(request);
}