From 8a9b9799f7ab6bbd9531521e4f5d9ff71c8f294f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 17 May 2019 16:24:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=9A=E5=B0=81=E9=9D=A2=E5=9B=BE][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E5=88=B8=EF=BC=8C=E5=8D=A1=EF=BC=8Cbanner?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E4=B8=93=E9=A2=98=E5=A2=9E=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905171447__ADD_COUPON_COVER_IMG.sql | 7 + ...1905171614__ADD_CAMPAIGN_COVER_PICTURE.sql | 7 + ...V201905171621__ADD_TOPIC_COVER_PICTURE.sql | 7 + .../com/iformall/domain/po/WxCampaign.java | 162 +---------- .../com/iformall/domain/po/WxCardInfo.java | 11 - .../java/com/iformall/domain/po/WxCoupon.java | 91 +++--- .../java/com/iformall/domain/po/WxTopic.java | 190 +------------ .../java/com/iformall/domain/vo/WxCardVo.java | 24 +- .../com/iformall/domain/vo/WxCouponCarVo.java | 2 - .../iformall/domain/vo/WxCouponChannelVo.java | 18 -- .../iformall/domain/vo/WxCouponStatisVo.java | 42 ++- .../resources/mapper/WxCampaignMapper.xml | 264 ++++++++---------- .../resources/mapper/WxCardInfoMapper.xml | 8 +- .../resources/mapper/WxCouponCarMapper.xml | 3 +- .../main/resources/mapper/WxCouponMapper.xml | 16 +- .../resources/mapper/WxOrderGroupMapper.xml | 7 - .../main/resources/mapper/WxTopicMapper.xml | 3 +- 17 files changed, 248 insertions(+), 614 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql new file mode 100644 index 000000000..af96d816c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905171447__ADD_COUPON_COVER_IMG.sql @@ -0,0 +1,7 @@ + + + +ALTER TABLE wx_coupon + ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`; + +UPDATE wx_coupon SET cover_picture=json_array(cover_img); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql new file mode 100644 index 000000000..23ba22c33 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905171614__ADD_CAMPAIGN_COVER_PICTURE.sql @@ -0,0 +1,7 @@ + + + +ALTER TABLE wx_campaign + ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover_img`; + +UPDATE wx_campaign SET cover_picture=json_array(cover_img); \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql new file mode 100644 index 000000000..ec428b405 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905171621__ADD_TOPIC_COVER_PICTURE.sql @@ -0,0 +1,7 @@ + + + +ALTER TABLE wx_topic + ADD COLUMN `cover_picture` json DEFAULT null COMMENT '多封面图' after `cover`; + +UPDATE wx_topic SET cover_picture=json_array(cover); \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 630a3533a..bdaeaa791 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import com.iformall.domain.vo.WxCouponChannelVo; +import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; @@ -10,6 +11,7 @@ import java.util.Date; import java.util.List; @Table(name = "wx_campaign") +@Data public class WxCampaign extends BaseEntity { @Id @@ -22,88 +24,47 @@ public class WxCampaign extends BaseEntity { @Transient protected List coupons; - public List getCoupons() { - return coupons; - } - - public void setCoupons(List coupons) { - this.coupons = coupons; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; - /*封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /*主标题**/ + @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") + private String coverPicture; @io.swagger.annotations.ApiModelProperty(value="主标题",name="title") private String title; - /*副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /*满x可用**/ @io.swagger.annotations.ApiModelProperty(value="满x可用",name="usePrice") private Integer usePrice; - /*折扣**/ @io.swagger.annotations.ApiModelProperty(value="折扣",name="discountPrice") private Integer discountPrice; - /*活动说明**/ @io.swagger.annotations.ApiModelProperty(value="活动说明",name="detail") private String detail; - /*有效日期-开始**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; - /*有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /*图文详情**/ @io.swagger.annotations.ApiModelProperty(value="图文详情",name="imgDetail") private String imgDetail; - /*类型:0:促销 1:宣传页**/ @io.swagger.annotations.ApiModelProperty(value="类型:0:促销 1:宣传页",name="type") private Integer type; - /*优惠券ids**/ @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") private String couponIds; - /*门店id**/ @io.swagger.annotations.ApiModelProperty(value="门店id",name="mechantId") private Long mechantId; - /*排序**/ @io.swagger.annotations.ApiModelProperty(value="排序",name="sortNum") private Integer sortNum; - /*0上线 1下线**/ @io.swagger.annotations.ApiModelProperty(value="0上线 1下线",name="status") private Integer status; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="createTime") + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") private Date updateTime; @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") private String html; @@ -116,117 +77,6 @@ public class WxCampaign extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") protected String weappScene; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getCoverImg() { - return coverImg; - } - public void setCoverImg(String _coverImg) { - coverImg = _coverImg; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public String getSubTitle() { - return subTitle; - } - public void setSubTitle(String _subTitle) { - subTitle = _subTitle; - } - public Integer getUsePrice() { - return usePrice; - } - public void setUsePrice(Integer _usePrice) { - usePrice = _usePrice; - } - public Integer getDiscountPrice() { - return discountPrice; - } - public void setDiscountPrice(Integer _discountPrice) { - discountPrice = _discountPrice; - } - public String getDetail() { - return detail; - } - public void setDetail(String _detail) { - detail = _detail; - } - public Date getValidStartDate() { - return validStartDate; - } - public void setValidStartDate(Date _validStartDate) { - validStartDate = _validStartDate; - } - public Date getValidEndDate() { - return validEndDate; - } - public void setValidEndDate(Date _validEndDate) { - validEndDate = _validEndDate; - } - public String getImgDetail() { - return imgDetail; - } - public void setImgDetail(String _imgDetail) { - imgDetail = _imgDetail; - } - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public String getCouponIds() { - return couponIds; - } - public void setCouponIds(String _couponIds) { - couponIds = _couponIds; - } - public Long getMechantId() { - return mechantId; - } - public void setMechantId(Long _mechantId) { - mechantId = _mechantId; - } - public Integer getSortNum() { - return sortNum; - } - public void setSortNum(Integer _sortNum) { - sortNum = _sortNum; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getUpdateTime() { - return updateTime; - } - public void setUpdateTime(Date _updateTime) { - updateTime = _updateTime; - } - - public String getHtml() { - return html; - } - - public void setHtml(String html) { - this.html = html; - } - public String getWeappPath() { if(type == null) return "pages/index/index"; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 58ab5a411..dc663d1b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -22,37 +22,26 @@ public class WxCardInfo implements Serializable { @Transient protected String sortColumns; - /**租户ID*/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**券ID*/ @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") private Long couponId; - /**微信订单号-购买类储值卡时的订单号*/ @io.swagger.annotations.ApiModelProperty(value="微信订单号-购买类储值卡时的订单号",name="transactionId") private String transactionId; - /**面额总金额*/ @io.swagger.annotations.ApiModelProperty(value="面额总金额",name="amount") private Integer amount; - /**购买总金额*/ @io.swagger.annotations.ApiModelProperty(value="购买总金额",name="saleAmount") private Integer saleAmount; - /**剩余面额*/ @io.swagger.annotations.ApiModelProperty(value="剩余面额",name="remainingAmount") private Integer remainingAmount; - /**分账总手续费*/ @io.swagger.annotations.ApiModelProperty(value="分账总手续费",name="serviceFeeAmount") private Integer serviceFeeAmount; - /**分账总金额*/ @io.swagger.annotations.ApiModelProperty(value="分账总金额",name="shareFeeAmount") private Integer shareFeeAmount; - /**分账剩余总金额*/ @io.swagger.annotations.ApiModelProperty(value="分账剩余总金额",name="remainingShareFeeAmount") private Integer remainingShareFeeAmount; - /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 31fc32ada..2c175137d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -76,111 +76,84 @@ public class WxCoupon extends BaseEntity { private String subsidyNumStr; @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") private Date startdate; @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; - /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") private Integer type; - /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ + @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") + private String coverPicture; @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /**售价(适用于类型2,3,4,5, 6, 8, 100)**/ + @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 8, 9, 100)",name="salePrice") private Integer salePrice; - /**使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") private Integer usePrice; - /**限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; - /**1.主动领取2.定向投放**/ @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") private Integer sendType; - /**有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/ @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") private Integer validType; - /**有效日期-开始**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; - /**有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /**自领取之日几日有效,(停车券当天有效)**/ @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") private Integer validDays; - /**须知**/ @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") private String detail; - /**面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /**单位**/ @io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时)",name="unit") private Integer unit; - /**剩余库存**/ @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") private Integer remainInventory; - /**总库存**/ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - /**购买须知**/ @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; - /**状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/ @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") private Integer status; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /**业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") private Integer business; - /**子业态**/ @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") private Integer subBusiness; - /**是否支持转送(0:不支持,1支持)**/ @io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer") private Integer supportTransfer; - /**过期退款(0:正常,1不退)**/ @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") private Integer autoRefund; - /**补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡 )**/ @io.swagger.annotations.ApiModelProperty(value="补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡)",name="subsidyType") private Integer subsidyType; - /**补贴额**/ @io.swagger.annotations.ApiModelProperty(value="补贴额",name="subsidyNum") private Integer subsidyNum; - /**砍价/团购限制人数**/ @io.swagger.annotations.ApiModelProperty(value="砍价/团购限制人数",name="pressLimitNum") private Integer pressLimitNum; - /**砍价限制时间**/ @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours") private Integer pressLimitHours; - /**积分售价(适用于类型10,11)**/ @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; - /**过期退积分(0:正常,1不退)**/ @io.swagger.annotations.ApiModelProperty(value="过期退积分(0:正常,1不退)",name="autoRefund") private Integer creditRefund; @@ -202,9 +175,8 @@ public class WxCoupon extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgInventory") private Integer orgInventory; - - @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") @Transient + @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") private Long couponChannelId; //营销分析 @@ -258,7 +230,16 @@ public class WxCoupon extends BaseEntity { public void setCoverImg(String _coverImg) { coverImg = _coverImg; } - public String getTitle() { + + public String getCoverPicture() { + return coverPicture; + } + + public void setCoverPicture(String coverPicture) { + this.coverPicture = coverPicture; + } + + public String getTitle() { return title; } public void setTitle(String _title) { @@ -570,6 +551,38 @@ public class WxCoupon extends BaseEntity { return false; } + public Integer getPressSendCount() { + return pressSendCount; + } + + public void setPressSendCount(Integer pressSendCount) { + this.pressSendCount = pressSendCount; + } + + public Integer getPressCount() { + return pressCount; + } + + public void setPressCount(Integer pressCount) { + this.pressCount = pressCount; + } + + public Integer getPressJoinCount() { + return pressJoinCount; + } + + public void setPressJoinCount(Integer pressJoinCount) { + this.pressJoinCount = pressJoinCount; + } + + public List getNotinTypes() { + return notinTypes; + } + + public void setNotinTypes(List notinTypes) { + this.notinTypes = notinTypes; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -652,12 +665,4 @@ public class WxCoupon extends BaseEntity { this.setSortColumns(Field.valueOf(sortColumns)); } } - - public List getNotinTypes() { - return notinTypes; - } - - public void setNotinTypes(List notinTypes) { - this.notinTypes = notinTypes; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 7ac114cf5..ea15290d4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -7,63 +9,58 @@ import java.util.Date; import java.util.List; @Table(name = "wx_topic") +@Data public class WxTopic extends BaseEntity{ @Id protected Long id; - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; - /*标题**/ @io.swagger.annotations.ApiModelProperty(value="标题",name="title") private String title; - /*内容**/ @io.swagger.annotations.ApiModelProperty(value="内容",name="content") private String content; - /*封面**/ @io.swagger.annotations.ApiModelProperty(value="封面",name="cover") private String cover; - /*广告图**/ + @io.swagger.annotations.ApiModelProperty(value="多封面",name="coverPicture") + private String coverPicture; @io.swagger.annotations.ApiModelProperty(value="广告图",name="advert") private String advert; - /*开始时间**/ @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") private Date beginTime; - /*结束时间**/ @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") private Date endTime; - /*状态1投放2作废**/ @io.swagger.annotations.ApiModelProperty(value="状态1生效2失效3作废",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - /*背景颜色*/ @io.swagger.annotations.ApiModelProperty(value="背景颜色",name="bgColor") private String bgColor; - /*优惠券ids**/ - @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") @Transient + @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") private String couponIds; - /*商品列表**/ - @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") + @Transient + @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") private List couponList; - //状态,一个或者多个 + @Transient + @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusStr") private String statusStr; @Transient protected List statusList; - //查询下架状态 + // @Transient + @io.swagger.annotations.ApiModelProperty(value="查询下架状态",name="queryDownLineStatus") private boolean queryDownLineStatus; - @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") + @Transient + @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") private Integer isOnline; @Transient private Long couponChannelId; @@ -73,13 +70,6 @@ public class WxTopic extends BaseEntity{ super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public Long getCouponChannelId() { - return couponChannelId; - } - - public void setCouponChannelId(Long couponChannelId) { - this.couponChannelId = couponChannelId; - } @Transient @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") @@ -89,158 +79,6 @@ public class WxTopic extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") private String weappScene; - public Integer getIsOnline() { - return isOnline; - } - - public void setIsOnline(Integer isOnline) { - this.isOnline = isOnline; - } - - public boolean isQueryDownLineStatus() { - return queryDownLineStatus; - } - - public void setQueryDownLineStatus(boolean queryDownLineStatus) { - this.queryDownLineStatus = queryDownLineStatus; - } - - public List getStatusList() { - return statusList; - } - - public void setStatusList(List statusList) { - this.statusList = statusList; - } - - public String getBgColor() { - return bgColor; - } - - public void setBgColor(String bgColor) { - this.bgColor = bgColor; - } - - public String getStatusStr() { - return statusStr; - } - - public void setStatusStr(String statusStr) { - this.statusStr = statusStr; - } - - public List getCouponList() { - return couponList; - } - - public void setCouponList(List couponList) { - this.couponList = couponList; - } - - public String getCouponIds() { - return couponIds; - } - - public void setCouponIds(String couponIds) { - this.couponIds = couponIds; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - public String getCover() { - return cover; - } - - public void setCover(String cover) { - this.cover = cover; - } - - public String getAdvert() { - return advert; - } - - public void setAdvert(String advert) { - this.advert = advert; - } - - public Date getBeginTime() { - return beginTime; - } - - public void setBeginTime(Date beginTime) { - this.beginTime = beginTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date createtime) { - this.createtime = createtime; - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - public String getWeappPath() { if(id == null) return "pages/index/index"; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 244941a1e..d2c1dd560 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -16,62 +16,47 @@ import java.util.List; public class WxCardVo extends WxCardInfo { /** 券类型信息 */ - /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ + @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") + private String coverPicture; @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /**单位**/ @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; - /**须知**/ @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") private String detail; - /**购买须知**/ @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; - /**面额**/ @io.swagger.annotations.ApiModelProperty(value = "面额", name = "price") private Integer price; - /**购买金额**/ @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") private Integer salePrice; - /**补贴类型**/ @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") private Integer subsidyType; - /**补贴金额**/ @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") private Integer subsidyNum; - /**购买人ID*/ @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cuserId") private Long cuserId; - /**持有者ID*/ @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") private Long ownerId; - /**该订单对应券的实际过期时间**/ @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - /**状态**/ @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") private Integer status; - /**购买人昵称*/ @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cnickName") private String cnickName; - /**持有人昵称*/ @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") private String onickName; - /**持有人绑定的手机号**/ @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; @@ -79,13 +64,14 @@ public class WxCardVo extends WxCardInfo { protected List statusS; @Transient + @io.swagger.annotations.ApiModelProperty(value="卡状态",name="statusStr") protected String statusStr; @Transient - @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") + @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") private Date startdate; @Transient - @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java index 8f06cd6fb..727ce8471 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java @@ -12,10 +12,8 @@ import java.util.List; public class WxCouponCarVo extends WxCoupon implements Serializable { private static final long serialVersionUID = 1L; - /*车场厂商类型**/ @io.swagger.annotations.ApiModelProperty(value="车场厂商类型1:ETCP,2:TJD",name="vendorType") private String vendorType; - /*车场厂商相关信息**/ @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") private String vendorParams; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 441d02d75..77eab7255 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -29,60 +29,43 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { - /*总库存**/ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - /*剩余库存**/ @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") private Integer remainInventory; - /*封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /*副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /*售价(适用于类型2,3,4,5)**/ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; - /*使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") private Integer usePrice; - /*面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /*单位**/ @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; - /*限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; - /*1.主动领取2.定向投放**/ @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") private Integer sendType; - /**过期退款(0:正常,1不退)**/ @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") private Integer autoRefund; - /**有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/ @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") private Integer validType; - /**有效日期-开始**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; - /**有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /**自领取之日几日有效,(停车券当天有效)**/ @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") private Integer validDays; - /**积分售价(适用于类型10,11)**/ @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; @@ -95,7 +78,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @Transient private String priceStr; - /*发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; 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 48d9faed3..314a3806c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -16,53 +16,49 @@ public class WxCouponStatisVo extends WxCoupon { private String xtime; @Transient private String xcount; - /**售出卡数量**/ - @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") private Long saleCount; - /**转增数量**/ - @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") private Long transferCount; - /**售出金额**/ - @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") private Integer saleAmount; - /**核销数量**/ - @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") + @Transient + @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") private Integer sumPayment; - /**退款数量**/ - @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") private Integer backpayCount; - /**砍价发起次数**/ - @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") @Transient + @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") private Integer pressSendCount; - /**砍价成功次数**/ - @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") private Integer pressSuccCount; - /**砍价参与人数**/ - @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") + @Transient + @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") private Integer pressJoinCount; - /**商场补贴**/ - @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") @Transient + @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") private Integer sumSubsidy; - /**核销比**/ - @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") + @Transient + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") private String paymentRate; - - /**转化率**/ - @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRate") @Transient + @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRate") private String changeRate; diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 8897f9d57..dfa010b71 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -1,163 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, + + + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` - `id`,`tenant_id`,`cover_img`,`title`,`type`,`sort_num` + `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`type`,`sort_num` - `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, + `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, `mechant_id`,`sort_num`,`status`,`create_time`,`update_time` - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` = #{tenantId} - - - - - and `cover_img` like concat('%', #{coverImg},'%') - - - - - and `title` like concat('%', #{title},'%') - - - - - and `sub_title` like concat('%', #{subTitle},'%') - - - - - and `use_price` = #{usePrice} - - - - - and `discount_price` = #{discountPrice} - - - - - and `detail` like concat('%', #{detail},'%') - - - - - and `valid_start_date` = #{validStartDate} - - - - - and `valid_end_date` = #{validEndDate} - - - - - and `img_detail` like concat('%', #{imgDetail},'%') - - - - - and `type` = #{type} - - - - - and `coupon_ids` like concat('%', #{couponIds},'%') - - - - - and `mechant_id` = #{mechantId} - - - - - and `sort_num` = #{sortNum} - - - - - and `status` = #{status} - - - - - and `create_time` = #{createTime} - - - - - and `update_time` = #{updateTime} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` = #{tenantId} + + + + and `cover_img` like concat('%', #{coverImg},'%') + + + + and `title` like concat('%', #{title},'%') + + + + and `sub_title` like concat('%', #{subTitle},'%') + + + + and `use_price` = #{usePrice} + + + + and `discount_price` = #{discountPrice} + + + + and `detail` like concat('%', #{detail},'%') + + + + and `valid_start_date` = #{validStartDate} + + + + and `valid_end_date` = #{validEndDate} + + + + and `img_detail` like concat('%', #{imgDetail},'%') + + + + and `type` = #{type} + + + + and `coupon_ids` like concat('%', #{couponIds},'%') + + + + and `mechant_id` = #{mechantId} + + + + and `sort_num` = #{sortNum} + + + + and `status` = #{status} + + + + and `create_time` = #{createTime} + + + + and `update_time` = #{updateTime} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + - select max(sort_num) from wx_campaign where `tenant_id` = #{tenantId} - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 509dcd86e..57f8d9921 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -72,11 +72,6 @@ order by ${sortColumns} - - @@ -93,6 +88,7 @@ + @@ -117,7 +113,7 @@ ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, ci.`create_date`,ci.`update_date`, - c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`, + c.`cover_img`, c.`cover_picture`,c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`, co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone diff --git a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml index a86cae044..8545d5c5a 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml @@ -98,6 +98,7 @@ + @@ -125,7 +126,7 @@ - c.id,c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + c.id,c.tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, car.vendor_type, car.vendor_params,c.credit_price diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index fe74a9546..399d90809 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -48,13 +48,6 @@ order by ${sortColumns} - -