Просмотр исходного кода

//..circle

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
c1cdf36470
3 измененных файлов: 26 добавлений и 2 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/AlipayOrWxStatistics.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  3. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java

+ 2
- 2
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; return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr;
} }
private Integer refundAmount;//退款总金额 private Integer refundAmount;//退款总金额
@Excel(name = "退款金额(元)", width = 20, orderNum = "4")
@Excel(name = "退款金额(元)", width = 20, orderNum = "5")
@TableField(exist = false) @TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr") @io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr")
private String refundAmountStr; private String refundAmountStr;
public String getRefundAmountStr() { public String getRefundAmountStr() {
return refundAmount != null ? new BigDecimal(refundAmount).divide(new BigDecimal(100)).toPlainString(): refundAmountStr; 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;//支付添加总积分 private Integer payPoints;//支付添加总积分
@Excel(name = "退款积分", width = 20, orderNum = "6") @Excel(name = "退款积分", width = 20, orderNum = "6")
private Integer refundPoints;//支付退款扣减总积分 private Integer refundPoints;//支付退款扣减总积分


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -432,6 +432,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
statistics.setRefundPoints(refundstatistics.getRefundPoints()); statistics.setRefundPoints(refundstatistics.getRefundPoints());
} }
} }
if(statistics.getRefundAmount() == null){
statistics.setRefundAmount(0);
statistics.setRefundPoints(0);
}
} }
return pageInfo; return pageInfo;
} }
@@ -453,6 +457,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount());
aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints());
} }
if(aliStatistics.getRefundAmount() == null){
aliStatistics.setRefundAmount(0);
aliStatistics.setRefundPoints(0);
}


return aliStatistics; return aliStatistics;
} }
@@ -503,6 +511,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
statistics.setRefundPoints(refundstatistics.getRefundPoints()); statistics.setRefundPoints(refundstatistics.getRefundPoints());
} }
} }
if(statistics.getRefundAmount() == null){
statistics.setRefundAmount(0);
statistics.setRefundPoints(0);
}
} }
excelService.exportExcel(aliStatistics, null, "支付宝商圈统计", AlipayOrWxStatistics.class, "支付宝商圈统计.xlsx", response, false); excelService.exportExcel(aliStatistics, null, "支付宝商圈统计", AlipayOrWxStatistics.class, "支付宝商圈统计.xlsx", response, false);
} }


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -607,6 +607,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
statistics.setRefundPoints(refundstatistics.getRefundPoints()); statistics.setRefundPoints(refundstatistics.getRefundPoints());
} }
} }
if(statistics.getRefundAmount() == null){
statistics.setRefundAmount(0);
statistics.setRefundPoints(0);
}
} }
return pageInfo; return pageInfo;
} }
@@ -628,6 +632,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount());
aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints());
} }
if(aliStatistics.getRefundAmount() == null){
aliStatistics.setRefundAmount(0);
aliStatistics.setRefundPoints(0);
}


return aliStatistics; return aliStatistics;
} }
@@ -678,6 +686,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
statistics.setRefundPoints(refundstatistics.getRefundPoints()); statistics.setRefundPoints(refundstatistics.getRefundPoints());
} }
} }
if(statistics.getRefundAmount() == null){
statistics.setRefundAmount(0);
statistics.setRefundPoints(0);
}
} }
excelService.exportExcel(wxStatistics, null, "微信商圈统计", AlipayOrWxStatistics.class, "微信商圈统计.xlsx", response, false); excelService.exportExcel(wxStatistics, null, "微信商圈统计", AlipayOrWxStatistics.class, "微信商圈统计.xlsx", response, false);
} }


Загрузка…
Отмена
Сохранить