From c1cdf36470a3546d56a33bfe8071f144ff764e59 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Jul 2023 16:06:12 +0800 Subject: [PATCH] //..circle --- .../com/iformall/domain/vo/AlipayOrWxStatistics.java | 4 ++-- .../impl/AliBusinessCircleOrderServiceImpl.java | 12 ++++++++++++ .../impl/WxBusinessCircleOrderServiceImpl.java | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java index 5b5fc7d85..0a6976c8a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java @@ -24,14 +24,14 @@ public class AlipayOrWxStatistics implements Serializable { return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr; } private Integer refundAmount;//退款总金额 - @Excel(name = "退款金额(元)", width = 20, orderNum = "4") + @Excel(name = "退款金额(元)", width = 20, orderNum = "5") @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr") private String refundAmountStr; public String getRefundAmountStr() { return refundAmount != null ? new BigDecimal(refundAmount).divide(new BigDecimal(100)).toPlainString(): refundAmountStr; } - @Excel(name = "支付积分", width = 20, orderNum = "5") + @Excel(name = "支付积分", width = 20, orderNum = "4") private Integer payPoints;//支付添加总积分 @Excel(name = "退款积分", width = 20, orderNum = "6") private Integer refundPoints;//支付退款扣减总积分 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 55c7b732d..67fa0080f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -432,6 +432,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } return pageInfo; } @@ -453,6 +457,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } + if(aliStatistics.getRefundAmount() == null){ + aliStatistics.setRefundAmount(0); + aliStatistics.setRefundPoints(0); + } return aliStatistics; } @@ -503,6 +511,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } excelService.exportExcel(aliStatistics, null, "支付宝商圈统计", AlipayOrWxStatistics.class, "支付宝商圈统计.xlsx", response, false); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 2d51ae4c5..622b42bda 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -607,6 +607,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } return pageInfo; } @@ -628,6 +632,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } + if(aliStatistics.getRefundAmount() == null){ + aliStatistics.setRefundAmount(0); + aliStatistics.setRefundPoints(0); + } return aliStatistics; } @@ -678,6 +686,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe statistics.setRefundPoints(refundstatistics.getRefundPoints()); } } + if(statistics.getRefundAmount() == null){ + statistics.setRefundAmount(0); + statistics.setRefundPoints(0); + } } excelService.exportExcel(wxStatistics, null, "微信商圈统计", AlipayOrWxStatistics.class, "微信商圈统计.xlsx", response, false); }