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

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/BillPageDTO.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class BillPageDTO {
private List<BillDTO> pageData;
private List<TradeRecordDTO> pageData;
private WalletBasicPageInfo page;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/wallet/TradeRecordDTO.java
View File

@@ -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)

5
coolstore-partner-model/src/main/java/com/cool/store/vo/wallet/AccountBillPageVO.java
View File

@@ -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<AccountBillListVO> data;
PageInfo<TradeRecordDTO> data;
@ApiModelProperty("收入")
private BigDecimal getAmount;
@@ -31,7 +32,7 @@ public class AccountBillPageVO {
@ApiModelProperty("支出")
private BigDecimal useAmount;
public AccountBillPageVO(PageInfo<AccountBillListVO> data, Long getAmount, Long useAmount) {
public AccountBillPageVO(PageInfo<TradeRecordDTO> 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);