From b627b1767884de089de320ae193427a77ba06fa4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 20 Nov 2020 16:39:37 +0800 Subject: [PATCH] fix bug --- .../iformall/domain/vo/WxCouponStatisVo.java | 7 -- .../domain/vo/WxOrderGroupMarketing.java | 2 +- .../iformall/domain/vo/excel/WxCardData.java | 75 +++++++++++++++++++ .../domain/vo/excel/WxCouponData.java | 50 +++++++++++++ .../iformall/domain/vo/excel/WxPressData.java | 50 +++++++++++++ .../service/impl/WxCouponServiceImpl.java | 9 ++- 6 files changed, 182 insertions(+), 11 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java index c53e1ea71..144566a73 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -3,7 +3,6 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -25,22 +24,18 @@ public class WxCouponStatisVo extends WxCoupon { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") - @Excel(name="售出数量",width = 20,orderNum = "4") private Integer saleCount; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") - @Excel(name="转赠数量",width = 20,orderNum = "5") private Integer transferCount; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") - @Excel(name="售出金额(分)",width = 20,orderNum = "6") private Integer saleAmount; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") - @Excel(name="核销金额(分)",width = 20,orderNum = "7") private Integer sumPayment; @TableField(exist = false) @@ -61,12 +56,10 @@ public class WxCouponStatisVo extends WxCoupon { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") - @Excel(name="商场补贴(分)",width = 20,orderNum = "9") private Integer sumSubsidy; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") - @Excel(name="核销比",width = 20,orderNum = "8") private String paymentRateStr; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 488f3d9b7..5b19e5715 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -29,7 +29,7 @@ public class WxOrderGroupMarketing extends TenantEntity { @Excel(name="成功次数",width = 20,orderNum = "5") private String groupSuccessCount; - @Excel(name="妆化率",width = 20,orderNum = "6") + @Excel(name="转化率",width = 20,orderNum = "6") private String groupTransferRatio; @Excel(name="成功拼团人次",width = 20,orderNum = "7") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java new file mode 100644 index 000000000..b8723801d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java @@ -0,0 +1,75 @@ +package com.iformall.domain.vo.excel; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.WxCoupon; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author luozukai + * coupon 营销分析 + * @date 2019/3/22 17:29 + */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCardData extends WxCoupon { + + @TableField(exist = false) + private String xtime; + @TableField(exist = false) + private String xcount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") + @Excel(name="售出数量",width = 20,orderNum = "4") + private Integer saleCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") + @Excel(name="转赠数量",width = 20,orderNum = "5") + private Integer transferCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") + @Excel(name="售出金额(分)",width = 20,orderNum = "6") + private Integer saleAmount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") + @Excel(name="核销金额(分)",width = 20,orderNum = "7") + private Integer sumPayment; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") + private Integer backpayCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") + private Integer pressSendCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") + private Integer pressSuccCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") + private Integer pressJoinCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") + @Excel(name="商场补贴(分)",width = 20,orderNum = "9") + private Integer sumSubsidy; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") + @Excel(name="核销比",width = 20,orderNum = "8") + private String paymentRateStr; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRateStr") + private String changeRateStr; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java new file mode 100644 index 000000000..7319bd610 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java @@ -0,0 +1,50 @@ +package com.iformall.domain.vo.excel; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.WxCoupon; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author luozukai + * coupon 营销分析 + * @date 2019/3/22 17:29 + */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCouponData extends WxCoupon { + + @TableField(exist = false) + private String xtime; + @TableField(exist = false) + private String xcount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") + @Excel(name="售出数量",width = 20,orderNum = "4") + private Integer saleCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") + @Excel(name="核销数量(张)",width = 20,orderNum = "5") + private Integer sumPayment; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") + @Excel(name="退款数量(张)",width = 20,orderNum = "6") + private Integer backpayCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") + @Excel(name="商场补贴(分)",width = 20,orderNum = "8") + private Integer sumSubsidy; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") + @Excel(name="核销比",width = 20,orderNum = "7") + private String paymentRateStr; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java new file mode 100644 index 000000000..a587ec406 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java @@ -0,0 +1,50 @@ +package com.iformall.domain.vo.excel; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.iformall.domain.po.WxCoupon; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * @author luozukai + * coupon 营销分析 + * @date 2019/3/22 17:29 + */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxPressData extends WxCoupon { + + @TableField(exist = false) + private String xtime; + @TableField(exist = false) + private String xcount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") + @Excel(name="砍价发起次数",width = 20,orderNum = "4") + private Integer pressSendCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") + @Excel(name="砍价成功次数",width = 20,orderNum = "5") + private Integer pressSuccCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") + @Excel(name="参与人次",width = 20,orderNum = "8") + private Integer pressJoinCount; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") + @Excel(name="核销比",width = 20,orderNum = "7") + private String paymentRateStr; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRateStr") + @Excel(name="转化率",width = 20,orderNum = "6") + private String changeRateStr; +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index b9cea7974..758545dd7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -19,6 +19,9 @@ import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; +import com.iformall.domain.vo.excel.WxCardData; +import com.iformall.domain.vo.excel.WxCouponData; +import com.iformall.domain.vo.excel.WxPressData; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -206,7 +209,7 @@ public class WxCouponServiceImpl implements WxCouponService { Map map = new HashMap(); map.put("record", record); map.put("tenantEntitys", tenantEntitys); - excelService.exportBigExcel(cardDataExporter,map, null, "卡营销数据信息", WxCouponStatisVo.class, "卡营销数据.xlsx", response, false); + excelService.exportBigExcel(cardDataExporter,map, null, "卡营销数据信息", WxCardData.class, "卡营销数据.xlsx", response, false); } @Override @@ -584,7 +587,7 @@ public class WxCouponServiceImpl implements WxCouponService { Map map = new HashMap(); map.put("record", record); map.put("tenantEntitys", tenantEntitys); - excelService.exportBigExcel(couponDataExporter,map, null, "券营销数据信息", WxCouponStatisVo.class, "券营销数据.xlsx", response, false); + excelService.exportBigExcel(couponDataExporter,map, null, "券营销数据信息", WxCouponData.class, "券营销数据.xlsx", response, false); } @Override @@ -660,7 +663,7 @@ public class WxCouponServiceImpl implements WxCouponService { Map map = new HashMap(); map.put("record", record); map.put("tenantEntitys", tenantEntitys); - excelService.exportBigExcel(pressDataExporter,map, null, "砍价营销数据信息", WxCouponStatisVo.class, "砍价营销数据.xlsx", response, false); + excelService.exportBigExcel(pressDataExporter,map, null, "砍价营销数据信息", WxPressData.class, "砍价营销数据.xlsx", response, false); } @Override