diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java index c23014fbc..76c7541c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTradeRecordVo.java @@ -17,7 +17,7 @@ public class UserTradeRecordVo implements Serializable{ private String sale; @Excel(name="面额",width = 20,orderNum = "3") private String price; - @Excel(name="卷状态",width = 20,orderNum = "4") + @Excel(name="券状态",width = 20,orderNum = "4") private String status; @Excel(name="交易时间",width = 20,orderNum = "5") private String tradeTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java index 6bd2af802..23a95d95c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDetailVo.java @@ -23,15 +23,12 @@ public class WxMerchantTradeDetailVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") private String couponName; - @Excel(name="券价格",width = 20,orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "券价格", name = "couponSale") private Integer couponSale; - @Excel(name="券面额",width = 20,orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "核销券面额", name = "couponPrice") private Integer couponPrice; - @Excel(name="消费金额",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "消费金额", name = "tradeAmt") private Integer tradeAmt; @@ -42,4 +39,16 @@ public class WxMerchantTradeDetailVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") private String tradeDateStr; + + + @Excel(name="券价格",width = 20,orderNum = "4") + private String couponSaleStr; + + @Excel(name="券面额",width = 20,orderNum = "5") + private String couponPriceStr; + + @Excel(name="消费金额",width = 20,orderNum = "6") + private String tradeAmtStr; + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2b701496e..7468228e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -753,7 +754,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { List datalist = wxMerchantMapper.userTradeDetailList(record); datalist.stream().forEach(e->{ - e.setTradeDateStr(DateUtils.formatDateTime(e.getTradeDate())); + if(e.getTradeDate() != null) { + e.setTradeDateStr(DateUtils.formatDateTime(e.getTradeDate())); + } + BigDecimal bigDecimal = new BigDecimal(e.getCouponPrice()); + e.setCouponPriceStr(bigDecimal.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP).toString()); + bigDecimal = new BigDecimal(e.getCouponSale()); + e.setCouponSaleStr(bigDecimal.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP).toString()); + bigDecimal = new BigDecimal(e.getTradeAmt()); + e.setTradeAmtStr(bigDecimal.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP).toString()); + }); excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false); }