| @@ -17,7 +17,7 @@ public class UserTradeRecordVo implements Serializable{ | |||||
| private String sale; | private String sale; | ||||
| @Excel(name="面额",width = 20,orderNum = "3") | @Excel(name="面额",width = 20,orderNum = "3") | ||||
| private String price; | private String price; | ||||
| @Excel(name="卷状态",width = 20,orderNum = "4") | |||||
| @Excel(name="券状态",width = 20,orderNum = "4") | |||||
| private String status; | private String status; | ||||
| @Excel(name="交易时间",width = 20,orderNum = "5") | @Excel(name="交易时间",width = 20,orderNum = "5") | ||||
| private String tradeTime; | private String tradeTime; | ||||
| @@ -23,15 +23,12 @@ public class WxMerchantTradeDetailVo extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") | @io.swagger.annotations.ApiModelProperty(value = "券名称", name = "couponName") | ||||
| private String couponName; | private String couponName; | ||||
| @Excel(name="券价格",width = 20,orderNum = "4") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券价格", name = "couponSale") | @io.swagger.annotations.ApiModelProperty(value = "券价格", name = "couponSale") | ||||
| private Integer couponSale; | private Integer couponSale; | ||||
| @Excel(name="券面额",width = 20,orderNum = "5") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "核销券面额", name = "couponPrice") | @io.swagger.annotations.ApiModelProperty(value = "核销券面额", name = "couponPrice") | ||||
| private Integer couponPrice; | private Integer couponPrice; | ||||
| @Excel(name="消费金额",width = 20,orderNum = "6") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "消费金额", name = "tradeAmt") | @io.swagger.annotations.ApiModelProperty(value = "消费金额", name = "tradeAmt") | ||||
| private Integer tradeAmt; | private Integer tradeAmt; | ||||
| @@ -42,4 +39,16 @@ public class WxMerchantTradeDetailVo extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") | @io.swagger.annotations.ApiModelProperty(value = "交易时间", name = "tradeDate") | ||||
| private String tradeDateStr; | 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; | |||||
| } | } | ||||
| @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||
| @@ -753,7 +754,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { | public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { | ||||
| List<WxMerchantTradeDetailVo> datalist = wxMerchantMapper.userTradeDetailList(record); | List<WxMerchantTradeDetailVo> datalist = wxMerchantMapper.userTradeDetailList(record); | ||||
| datalist.stream().forEach(e->{ | 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); | excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false); | ||||
| } | } | ||||