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 index b8723801d..9e7e76214 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCardData.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo.excel; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.vo.WxCouponStatisVo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; @@ -16,12 +17,7 @@ import lombok.ToString; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCardData extends WxCoupon { - - @TableField(exist = false) - private String xtime; - @TableField(exist = false) - private String xcount; +public class WxCardData extends WxCouponStatisVo { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") @@ -43,22 +39,6 @@ public class WxCardData extends WxCoupon { @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") @@ -68,8 +48,4 @@ public class WxCardData extends WxCoupon { @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 index 7319bd610..44fa81681 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxCouponData.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo.excel; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.vo.WxCouponStatisVo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; @@ -16,12 +17,7 @@ import lombok.ToString; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxCouponData extends WxCoupon { - - @TableField(exist = false) - private String xtime; - @TableField(exist = false) - private String xcount; +public class WxCouponData extends WxCouponStatisVo { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") 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 index a587ec406..769087794 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/excel/WxPressData.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo.excel; import com.baomidou.mybatisplus.annotation.TableField; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.vo.WxCouponStatisVo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; @@ -16,12 +17,7 @@ import lombok.ToString; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxPressData extends WxCoupon { - - @TableField(exist = false) - private String xtime; - @TableField(exist = false) - private String xcount; +public class WxPressData extends WxCouponStatisVo { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount")