From 93417c4a4ff5b306c324521c0ab887d009c85776 Mon Sep 17 00:00:00 2001 From: wangff Date: Mon, 24 Nov 2025 16:27:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B5=81=E6=B0=B4=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E8=B1=A1=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dto/wallet/BillPageDTO.java | 2 +- .../java/com/cool/store/dto/wallet/TradeRecordDTO.java | 2 ++ .../java/com/cool/store/vo/wallet/AccountBillPageVO.java | 5 +++-- .../com/cool/store/service/wallet/WalletApiService.java | 4 ++-- .../com/cool/store/service/wallet/WalletService.java | 2 +- .../store/service/wallet/impl/WalletServiceImpl.java | 6 +++--- .../com/cool/store/controller/webb/PCTestController.java | 9 ++------- .../com/cool/store/controller/webb/WalletController.java | 2 +- .../cool/store/controller/webc/MiniWalletController.java | 4 ++-- 9 files changed, 17 insertions(+), 19 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java index 999cf8cc6..1c0ae682e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java @@ -17,7 +17,7 @@ import java.util.List; @Data @JsonIgnoreProperties(ignoreUnknown = true) public class BillPageDTO { - private List pageData; + private List pageData; private WalletBasicPageInfo page; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java index eb5845125..7ba7ac5a9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java @@ -1,5 +1,6 @@ package com.cool.store.dto.wallet; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import java.io.Serializable; * @Version 1.0 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class TradeRecordDTO implements Serializable { @ApiModelProperty(value = "业务系统付款单号(如 CRM 单号)", required = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillPageVO.java index da99bd058..b6f4db0f7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillPageVO.java @@ -1,5 +1,6 @@ package com.cool.store.vo.wallet; +import com.cool.store.dto.wallet.TradeRecordDTO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -23,7 +24,7 @@ import java.util.Objects; @NoArgsConstructor public class AccountBillPageVO { @ApiModelProperty("分页数据") - PageInfo data; + PageInfo data; @ApiModelProperty("收入") private BigDecimal getAmount; @@ -31,7 +32,7 @@ public class AccountBillPageVO { @ApiModelProperty("支出") private BigDecimal useAmount; - public AccountBillPageVO(PageInfo data, Long getAmount, Long useAmount) { + public AccountBillPageVO(PageInfo data, Long getAmount, Long useAmount) { this.data = data; BigDecimal denominator = new BigDecimal(100); this.getAmount = new BigDecimal(Objects.nonNull(getAmount) ? getAmount : 0).divide(denominator, 2, RoundingMode.HALF_UP); 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 35832c168..836d03dd6 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 @@ -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); } /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java index 197a1c325..cbac15ec4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/WalletService.java @@ -107,7 +107,7 @@ public interface WalletService { * @param request 交易详情查询Request * @return 交易详情VO */ - BillDetailDTO getBillDetail(BillDetailRequest request); + TradeRecordDTO getBillDetail(BillDetailRequest 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 5cc8246f1..034b9c4db 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 @@ -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) 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 data = toPageInfo(billPage.getPageData(), AccountBillListVO.class, billPage.getPage()); + PageInfo 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); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index ac659dcd9..239b49789 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -8,7 +8,6 @@ import com.cool.store.dto.huoma.*; import com.cool.store.dto.wallet.*; import com.cool.store.entity.*; import com.cool.store.enums.DownSystemTypeEnum; -import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; @@ -40,8 +39,6 @@ import com.cool.store.service.wallet.WalletApiService; import com.cool.store.service.wechat.WechatTemplateService; import com.cool.store.service.xinfa.XinFaBusinessService; import com.cool.store.utils.RsaSignUtil; -import com.cool.store.utils.easyExcel.StoreImageExcelExporter; -import com.cool.store.utils.poi.ExcelUtil; import com.cool.store.utils.poi.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -52,10 +49,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; @@ -757,8 +752,8 @@ public class PCTestController { @ApiOperation(" 获取账单详情") @PostMapping("/getBillDetail") - public ResponseResult getBillDetail(@RequestBody BillDetailRequest request) { - BillDetailDTO billDetail = walletApiService.getBillDetail(request); + public ResponseResult getBillDetail(@RequestBody BillDetailRequest request) { + TradeRecordDTO billDetail = walletApiService.getBillDetail(request); return ResponseResult.success(billDetail); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WalletController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WalletController.java index 717eeb482..02192c89b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WalletController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/WalletController.java @@ -64,7 +64,7 @@ public class WalletController { @ApiOperation("交易流水详情") @GetMapping("/billDetail") - public ResponseResult getBillDetail(BillDetailRequest request) { + public ResponseResult getBillDetail(BillDetailRequest request) { return ResponseResult.success(walletService.getBillDetail(request)); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java index a04f653ce..46d5d32a7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniWalletController.java @@ -1,7 +1,7 @@ package com.cool.store.controller.webc; -import com.cool.store.dto.wallet.BillDetailDTO; import com.cool.store.dto.wallet.OpenBasicInfoDTO; +import com.cool.store.dto.wallet.TradeRecordDTO; import com.cool.store.request.wallet.*; import com.cool.store.response.ResponseResult; import com.cool.store.service.wallet.WalletService; @@ -77,7 +77,7 @@ public class MiniWalletController { @ApiOperation("交易流水详情") @GetMapping("/billDetail") - public ResponseResult getBillDetail(BillDetailRequest request) { + public ResponseResult getBillDetail(BillDetailRequest request) { return ResponseResult.success(walletService.getBillDetail(request)); }