diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java index 295f683..778358a 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java +++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java @@ -23,27 +23,41 @@ import java.util.List; @NoArgsConstructor public class FundsDTO { private Integer id; - private Integer jwcode; + @ExcelIgnore + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date payTime; + private String orderCode; + private String receivedMarket; //到账地区 + private String performanceMarket; //业绩归属地区 private String name; + private Integer jwcode; + private String incomeType; //收入类别 + private String remark; //备注 + private Integer goodNum; //商品数量 + private String payType; + @ExcelIgnore + private Integer receivedCurrency; + private BigDecimal paymentAmount; + private BigDecimal handlingCharge; + private BigDecimal receivedAmount; @ExcelIgnore private Integer market; private String marketName; @ExcelIgnore private List markets; - private String orderCode; + @ExcelIgnore + private List performanceMarkets; + @ExcelIgnore private Integer paymentCurrency; private String paymentCurrencyName; - private BigDecimal paymentAmount; - @ExcelIgnore - private Integer receivedCurrency; + + private String receivedCurrencyName; - private BigDecimal receivedAmount; - private BigDecimal handlingCharge; - private String payType; - @ExcelIgnore - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private Date payTime; + + + + @ExcelIgnore private Integer status; private String statusName; diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 90ae516..30339e7 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -81,9 +81,9 @@ spring: data: redis: database: 0 - host: localhost - port: 6379 - password: 123456 + host: 54.255.212.181 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 98c62e0..724ad84 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -449,6 +449,11 @@ SELECT crc.id, crc.jwcode, + crc.income_type, + crc.remark, + crc.good_num, + crc.performance_market, + crc.received_market, crc.name, crc.market, crc.order_code, @@ -476,6 +481,12 @@ #{markets} + + AND crc.performance_market IN + + #{performanceMarkets} + + AND crc.market IN