diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 07d539771..608f37d74 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -235,7 +235,7 @@ public class WxOrderController extends BaseController { wxOrderQueryVo = new WxOrderQueryVo(); } wxOrderQueryVo.setTenantId(getTenantId()); - Map data = wxOrderService.summary(wxOrderQueryVo); + Map data = wxOrderService.summary(wxOrderQueryVo); return new ResultData(data); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 02f9a9b19..8a4d37e69 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -23,6 +24,10 @@ public class WxOrder extends BaseEntity { @TableField(exist = false) private String merchantName; + public String getcUserName() { + return cUserName; + } + @Excel(name = "会员", width = 20, orderNum = "2") @TableField(exist = false) private String cUserName; @@ -47,13 +52,12 @@ public class WxOrder extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") private Integer paymentType; - @Excel(name = "订单金额(元)", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") private Integer payment; @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") private Date paymentTime; - @Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5"}) + @Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"}) @io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款; 4-退款失败,5-退款失败; 砍价:6-砍价中,7-砍价完成,8-砍价失败",name="orderStatus") private Integer orderStatus; @@ -95,11 +99,27 @@ public class WxOrder extends BaseEntity { @TableField(exist = false) private String title; - @Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4"}) + @Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4", " _-1"}) @TableField(exist = false) private Integer attribute; - @Excel(name = "支付金额(元)", width = 20, orderNum = "8") @TableField(exist = false) private Integer pay; + + @Excel(name = "支付金额(元)", width = 20, orderNum = "8") + @TableField(exist = false) + private String payStr; + + public String getPayStr() { + return pay != null ? new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString() : payStr; + } + + public String getPaymentStr() { + return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : payStr; + } + + @Excel(name = "订单金额(元)", width = 20, orderNum = "6") + @TableField(exist = false) + private String paymentStr; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index a1b1153cc..d68ab2380 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -191,7 +191,7 @@ public interface WxOrderService { */ void actionAfterCouponOrderSuccess(WxOrder updateOrder, WxCoupon coupon, WxCUser user); - Map summary(WxOrderQueryVo wxOrderQueryVo); + Map summary(WxOrderQueryVo wxOrderQueryVo); void exportData(WxOrderQueryVo wxOrderQueryVo, HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 9561a32b7..72ee6d608 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -983,11 +983,11 @@ public class WxOrderServiceImpl implements WxOrderService { } @Override - public Map summary(WxOrderQueryVo wxOrderQueryVo) { + public Map summary(WxOrderQueryVo wxOrderQueryVo) { List listOrder = wxOrderMapper.findListOrder(wxOrderQueryVo); Long payment = listOrder.stream().collect(Collectors.summingLong(WxOrder::getPayment)); Long pay = listOrder.stream().collect(Collectors.summingLong(WxOrder::getPay)); - Map data = new HashMap<>(); + Map data = new HashMap<>(); data.put("payment", payment); data.put("pay", pay); return data; @@ -996,6 +996,17 @@ public class WxOrderServiceImpl implements WxOrderService { @Override public void exportData(WxOrderQueryVo wxOrderQueryVo, HttpServletRequest request, HttpServletResponse response) { List list = wxOrderMapper.findListOrder(wxOrderQueryVo); + Map summary = summary(wxOrderQueryVo); + Long payment = summary.get("payment"); + Long pay = summary.get("pay"); + String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString(); + String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString(); + WxOrder order = new WxOrder(); + order.setPayStr(payStr); + order.setPaymentStr(paymentStr); + order.setOrderStatus(-1); + order.setAttribute(-1); + list.add(order); excelService.exportExcel(list, null, "线上交易", WxOrder.class, "线上交易.xlsx", response, false); }