| @@ -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); | |||||
| @@ -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); | |||||
| @@ -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); | |||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.iformall.domain.vo.WxCouponChannelVo; | import com.iformall.domain.vo.WxCouponChannelVo; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| @@ -10,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_campaign") | @Table(name = "wx_campaign") | ||||
| @Data | |||||
| public class WxCampaign extends BaseEntity { | public class WxCampaign extends BaseEntity { | ||||
| @Id | @Id | ||||
| @@ -22,88 +24,47 @@ public class WxCampaign extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| protected List<WxCouponChannelVo> coupons; | protected List<WxCouponChannelVo> coupons; | ||||
| public List<WxCouponChannelVo> getCoupons() { | |||||
| return coupons; | |||||
| } | |||||
| public void setCoupons(List<WxCouponChannelVo> coupons) { | |||||
| this.coupons = coupons; | |||||
| } | |||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| @Override | @Override | ||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| super.setSortColumns(this.sortColumns); | super.setSortColumns(this.sortColumns); | ||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*封面图**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| /*主标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") | |||||
| private String coverPicture; | |||||
| @io.swagger.annotations.ApiModelProperty(value="主标题",name="title") | @io.swagger.annotations.ApiModelProperty(value="主标题",name="title") | ||||
| private String title; | private String title; | ||||
| /*副标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String subTitle; | private String subTitle; | ||||
| /*满x可用**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="满x可用",name="usePrice") | @io.swagger.annotations.ApiModelProperty(value="满x可用",name="usePrice") | ||||
| private Integer usePrice; | private Integer usePrice; | ||||
| /*折扣**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="折扣",name="discountPrice") | @io.swagger.annotations.ApiModelProperty(value="折扣",name="discountPrice") | ||||
| private Integer discountPrice; | private Integer discountPrice; | ||||
| /*活动说明**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="活动说明",name="detail") | @io.swagger.annotations.ApiModelProperty(value="活动说明",name="detail") | ||||
| private String detail; | private String detail; | ||||
| /*有效日期-开始**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | ||||
| private Date validStartDate; | private Date validStartDate; | ||||
| /*有效日期-结束**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | ||||
| private Date validEndDate; | private Date validEndDate; | ||||
| /*图文详情**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="图文详情",name="imgDetail") | @io.swagger.annotations.ApiModelProperty(value="图文详情",name="imgDetail") | ||||
| private String imgDetail; | private String imgDetail; | ||||
| /*类型:0:促销 1:宣传页**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="类型:0:促销 1:宣传页",name="type") | @io.swagger.annotations.ApiModelProperty(value="类型:0:促销 1:宣传页",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /*优惠券ids**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") | @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") | ||||
| private String couponIds; | private String couponIds; | ||||
| /*门店id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="门店id",name="mechantId") | @io.swagger.annotations.ApiModelProperty(value="门店id",name="mechantId") | ||||
| private Long mechantId; | private Long mechantId; | ||||
| /*排序**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="排序",name="sortNum") | @io.swagger.annotations.ApiModelProperty(value="排序",name="sortNum") | ||||
| private Integer sortNum; | private Integer sortNum; | ||||
| /*0上线 1下线**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0上线 1下线",name="status") | @io.swagger.annotations.ApiModelProperty(value="0上线 1下线",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | |||||
| private Date createTime; | private Date createTime; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | |||||
| private Date updateTime; | private Date updateTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") | @io.swagger.annotations.ApiModelProperty(value="富文本",name="html") | ||||
| private String html; | private String html; | ||||
| @@ -116,117 +77,6 @@ public class WxCampaign extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | ||||
| protected String 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() { | public String getWeappPath() { | ||||
| if(type == null) | if(type == null) | ||||
| return "pages/index/index"; | return "pages/index/index"; | ||||
| @@ -22,37 +22,26 @@ public class WxCardInfo implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**租户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**券ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") | @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") | ||||
| private Long couponId; | private Long couponId; | ||||
| /**微信订单号-购买类储值卡时的订单号*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信订单号-购买类储值卡时的订单号",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="微信订单号-购买类储值卡时的订单号",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| /**面额总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="面额总金额",name="amount") | @io.swagger.annotations.ApiModelProperty(value="面额总金额",name="amount") | ||||
| private Integer amount; | private Integer amount; | ||||
| /**购买总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买总金额",name="saleAmount") | @io.swagger.annotations.ApiModelProperty(value="购买总金额",name="saleAmount") | ||||
| private Integer saleAmount; | private Integer saleAmount; | ||||
| /**剩余面额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="剩余面额",name="remainingAmount") | @io.swagger.annotations.ApiModelProperty(value="剩余面额",name="remainingAmount") | ||||
| private Integer remainingAmount; | private Integer remainingAmount; | ||||
| /**分账总手续费*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账总手续费",name="serviceFeeAmount") | @io.swagger.annotations.ApiModelProperty(value="分账总手续费",name="serviceFeeAmount") | ||||
| private Integer serviceFeeAmount; | private Integer serviceFeeAmount; | ||||
| /**分账总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账总金额",name="shareFeeAmount") | @io.swagger.annotations.ApiModelProperty(value="分账总金额",name="shareFeeAmount") | ||||
| private Integer shareFeeAmount; | private Integer shareFeeAmount; | ||||
| /**分账剩余总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账剩余总金额",name="remainingShareFeeAmount") | @io.swagger.annotations.ApiModelProperty(value="分账剩余总金额",name="remainingShareFeeAmount") | ||||
| private Integer remainingShareFeeAmount; | private Integer remainingShareFeeAmount; | ||||
| /**创建时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -76,111 +76,84 @@ public class WxCoupon extends BaseEntity { | |||||
| private String subsidyNumStr; | private String subsidyNumStr; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") | |||||
| private Date startdate; | private Date startdate; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | |||||
| private Date enddate; | private Date enddate; | ||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String 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") | @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,50.积分券,51.积分停车券,100.消费卡)",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**封面图**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| /**券名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") | |||||
| private String coverPicture; | |||||
| @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | ||||
| private String title; | private String title; | ||||
| /**副标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String 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") | @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5, 6, 8, 9, 100)",name="salePrice") | ||||
| private Integer salePrice; | private Integer salePrice; | ||||
| /**使用条件金额(适用于类型1,2,3,4)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | ||||
| private Integer usePrice; | private Integer usePrice; | ||||
| /**限领张数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") | @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") | ||||
| private Integer useLimitQuantity; | private Integer useLimitQuantity; | ||||
| /**1.主动领取2.定向投放**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") | @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") | ||||
| private Integer 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") | @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") | ||||
| private Integer validType; | private Integer validType; | ||||
| /**有效日期-开始**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | ||||
| private Date validStartDate; | private Date validStartDate; | ||||
| /**有效日期-结束**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | ||||
| private Date validEndDate; | private Date validEndDate; | ||||
| /**自领取之日几日有效,(停车券当天有效)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") | @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") | ||||
| private Integer validDays; | private Integer validDays; | ||||
| /**须知**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | ||||
| private String detail; | private String detail; | ||||
| /**面额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | ||||
| private Integer price; | private Integer price; | ||||
| /**单位**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时)",name="unit") | @io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时)",name="unit") | ||||
| private Integer unit; | private Integer unit; | ||||
| /**剩余库存**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | ||||
| private Integer remainInventory; | private Integer remainInventory; | ||||
| /**总库存**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | ||||
| private Integer inventory; | private Integer inventory; | ||||
| /**购买须知**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | ||||
| private String remark; | private String remark; | ||||
| /**状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") | @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /**业态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="业态",name="business") | @io.swagger.annotations.ApiModelProperty(value="业态",name="business") | ||||
| private Integer business; | private Integer business; | ||||
| /**子业态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") | @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") | ||||
| private Integer subBusiness; | private Integer subBusiness; | ||||
| /**是否支持转送(0:不支持,1支持)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer") | @io.swagger.annotations.ApiModelProperty(value="是否支持转送(0:不支持,1支持)",name="supportTransfer") | ||||
| private Integer supportTransfer; | private Integer supportTransfer; | ||||
| /**过期退款(0:正常,1不退)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") | @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") | ||||
| private Integer autoRefund; | private Integer autoRefund; | ||||
| /**补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡 )**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡)",name="subsidyType") | @io.swagger.annotations.ApiModelProperty(value="补贴类型(0:不支持, 1:微信支付立减与折扣, 2:线下结算, 3:微信付款到银行卡)",name="subsidyType") | ||||
| private Integer subsidyType; | private Integer subsidyType; | ||||
| /**补贴额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="补贴额",name="subsidyNum") | @io.swagger.annotations.ApiModelProperty(value="补贴额",name="subsidyNum") | ||||
| private Integer subsidyNum; | private Integer subsidyNum; | ||||
| /**砍价/团购限制人数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价/团购限制人数",name="pressLimitNum") | @io.swagger.annotations.ApiModelProperty(value="砍价/团购限制人数",name="pressLimitNum") | ||||
| private Integer pressLimitNum; | private Integer pressLimitNum; | ||||
| /**砍价限制时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours") | @io.swagger.annotations.ApiModelProperty(value="砍价限制时间",name="pressLimitHours") | ||||
| private Integer pressLimitHours; | private Integer pressLimitHours; | ||||
| /**积分售价(适用于类型10,11)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | ||||
| private Integer creditPrice; | private Integer creditPrice; | ||||
| /**过期退积分(0:正常,1不退)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="过期退积分(0:正常,1不退)",name="autoRefund") | @io.swagger.annotations.ApiModelProperty(value="过期退积分(0:正常,1不退)",name="autoRefund") | ||||
| private Integer creditRefund; | private Integer creditRefund; | ||||
| @@ -202,9 +175,8 @@ public class WxCoupon extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgInventory") | @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgInventory") | ||||
| private Integer orgInventory; | private Integer orgInventory; | ||||
| @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="投放渠道id",name="couponChannelId") | |||||
| private Long couponChannelId; | private Long couponChannelId; | ||||
| //营销分析 | //营销分析 | ||||
| @@ -258,7 +230,16 @@ public class WxCoupon extends BaseEntity { | |||||
| public void setCoverImg(String _coverImg) { | public void setCoverImg(String _coverImg) { | ||||
| coverImg = _coverImg; | coverImg = _coverImg; | ||||
| } | } | ||||
| public String getTitle() { | |||||
| public String getCoverPicture() { | |||||
| return coverPicture; | |||||
| } | |||||
| public void setCoverPicture(String coverPicture) { | |||||
| this.coverPicture = coverPicture; | |||||
| } | |||||
| public String getTitle() { | |||||
| return title; | return title; | ||||
| } | } | ||||
| public void setTitle(String _title) { | public void setTitle(String _title) { | ||||
| @@ -570,6 +551,38 @@ public class WxCoupon extends BaseEntity { | |||||
| return false; | 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<Long> getNotinTypes() { | |||||
| return notinTypes; | |||||
| } | |||||
| public void setNotinTypes(List<Long> notinTypes) { | |||||
| this.notinTypes = notinTypes; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -652,12 +665,4 @@ public class WxCoupon extends BaseEntity { | |||||
| this.setSortColumns(Field.valueOf(sortColumns)); | this.setSortColumns(Field.valueOf(sortColumns)); | ||||
| } | } | ||||
| } | } | ||||
| public List<Long> getNotinTypes() { | |||||
| return notinTypes; | |||||
| } | |||||
| public void setNotinTypes(List<Long> notinTypes) { | |||||
| this.notinTypes = notinTypes; | |||||
| } | |||||
| } | } | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -7,63 +9,58 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_topic") | @Table(name = "wx_topic") | ||||
| @Data | |||||
| public class WxTopic extends BaseEntity{ | public class WxTopic extends BaseEntity{ | ||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | ||||
| private String name; | private String name; | ||||
| /*标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="标题",name="title") | @io.swagger.annotations.ApiModelProperty(value="标题",name="title") | ||||
| private String title; | private String title; | ||||
| /*内容**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="内容",name="content") | @io.swagger.annotations.ApiModelProperty(value="内容",name="content") | ||||
| private String content; | private String content; | ||||
| /*封面**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面",name="cover") | @io.swagger.annotations.ApiModelProperty(value="封面",name="cover") | ||||
| private String cover; | private String cover; | ||||
| /*广告图**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="多封面",name="coverPicture") | |||||
| private String coverPicture; | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告图",name="advert") | @io.swagger.annotations.ApiModelProperty(value="广告图",name="advert") | ||||
| private String advert; | private String advert; | ||||
| /*开始时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") | @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") | ||||
| private Date beginTime; | private Date beginTime; | ||||
| /*结束时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") | @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") | ||||
| private Date endTime; | private Date endTime; | ||||
| /*状态1投放2作废**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态1生效2失效3作废",name="status") | @io.swagger.annotations.ApiModelProperty(value="状态1生效2失效3作废",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| /*背景颜色*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="背景颜色",name="bgColor") | @io.swagger.annotations.ApiModelProperty(value="背景颜色",name="bgColor") | ||||
| private String bgColor; | private String bgColor; | ||||
| /*优惠券ids**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") | |||||
| private String couponIds; | private String couponIds; | ||||
| /*商品列表**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") | |||||
| private List<WxCoupon> couponList; | private List<WxCoupon> couponList; | ||||
| //状态,一个或者多个 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusStr") | |||||
| private String statusStr; | private String statusStr; | ||||
| @Transient | @Transient | ||||
| protected List<Integer> statusList; | protected List<Integer> statusList; | ||||
| //查询下架状态 | |||||
| // | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="查询下架状态",name="queryDownLineStatus") | |||||
| private boolean queryDownLineStatus; | private boolean queryDownLineStatus; | ||||
| @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") | |||||
| private Integer isOnline; | private Integer isOnline; | ||||
| @Transient | @Transient | ||||
| private Long couponChannelId; | private Long couponChannelId; | ||||
| @@ -73,13 +70,6 @@ public class WxTopic extends BaseEntity{ | |||||
| super.setSortColumns(this.sortColumns); | super.setSortColumns(this.sortColumns); | ||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public Long getCouponChannelId() { | |||||
| return couponChannelId; | |||||
| } | |||||
| public void setCouponChannelId(Long couponChannelId) { | |||||
| this.couponChannelId = couponChannelId; | |||||
| } | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") | @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") | ||||
| @@ -89,158 +79,6 @@ public class WxTopic extends BaseEntity{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | ||||
| private String 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<Integer> getStatusList() { | |||||
| return statusList; | |||||
| } | |||||
| public void setStatusList(List<Integer> 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<WxCoupon> getCouponList() { | |||||
| return couponList; | |||||
| } | |||||
| public void setCouponList(List<WxCoupon> 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() { | public String getWeappPath() { | ||||
| if(id == null) | if(id == null) | ||||
| return "pages/index/index"; | return "pages/index/index"; | ||||
| @@ -16,62 +16,47 @@ import java.util.List; | |||||
| public class WxCardVo extends WxCardInfo { | public class WxCardVo extends WxCardInfo { | ||||
| /** 券类型信息 */ | /** 券类型信息 */ | ||||
| /**封面图**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| /**券名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture") | |||||
| private String coverPicture; | |||||
| @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | ||||
| private String title; | private String title; | ||||
| /**副标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String subTitle; | private String subTitle; | ||||
| /**单位**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | ||||
| private Integer unit; | private Integer unit; | ||||
| /**须知**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") | ||||
| private String detail; | private String detail; | ||||
| /**购买须知**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | ||||
| private String remark; | private String remark; | ||||
| /**面额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "面额", name = "price") | @io.swagger.annotations.ApiModelProperty(value = "面额", name = "price") | ||||
| private Integer price; | private Integer price; | ||||
| /**购买金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") | @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") | ||||
| private Integer salePrice; | private Integer salePrice; | ||||
| /**补贴类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") | @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") | ||||
| private Integer subsidyType; | private Integer subsidyType; | ||||
| /**补贴金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") | @io.swagger.annotations.ApiModelProperty(value = "补贴金额", name = "subsidyNum") | ||||
| private Integer subsidyNum; | private Integer subsidyNum; | ||||
| /**购买人ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cuserId") | @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cuserId") | ||||
| private Long cuserId; | private Long cuserId; | ||||
| /**持有者ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") | @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") | ||||
| private Long ownerId; | private Long ownerId; | ||||
| /**该订单对应券的实际过期时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") | @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") | ||||
| private Date expiredTime; | private Date expiredTime; | ||||
| /**状态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| /**购买人昵称*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cnickName") | @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cnickName") | ||||
| private String cnickName; | private String cnickName; | ||||
| /**持有人昵称*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") | @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") | ||||
| private String onickName; | private String onickName; | ||||
| /**持有人绑定的手机号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | ||||
| private String ouPhone; | private String ouPhone; | ||||
| @@ -79,13 +64,14 @@ public class WxCardVo extends WxCardInfo { | |||||
| protected List<Integer> statusS; | protected List<Integer> statusS; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="卡状态",name="statusStr") | |||||
| protected String statusStr; | protected String statusStr; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") | |||||
| private Date startdate; | private Date startdate; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | |||||
| private Date enddate; | private Date enddate; | ||||
| } | } | ||||
| @@ -12,10 +12,8 @@ import java.util.List; | |||||
| public class WxCouponCarVo extends WxCoupon implements Serializable { | public class WxCouponCarVo extends WxCoupon implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| /*车场厂商类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车场厂商类型1:ETCP,2:TJD",name="vendorType") | @io.swagger.annotations.ApiModelProperty(value="车场厂商类型1:ETCP,2:TJD",name="vendorType") | ||||
| private String vendorType; | private String vendorType; | ||||
| /*车场厂商相关信息**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") | @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") | ||||
| private String vendorParams; | private String vendorParams; | ||||
| @@ -29,60 +29,43 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { | |||||
| /*总库存**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") | ||||
| private Integer inventory; | private Integer inventory; | ||||
| /*剩余库存**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") | ||||
| private Integer remainInventory; | private Integer remainInventory; | ||||
| /*封面图**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| /*券名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") | ||||
| private String title; | private String title; | ||||
| /*副标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") | ||||
| private String subTitle; | private String subTitle; | ||||
| /*售价(适用于类型2,3,4,5)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") | @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") | ||||
| private Integer salePrice; | private Integer salePrice; | ||||
| /*使用条件金额(适用于类型1,2,3,4)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") | ||||
| private Integer usePrice; | private Integer usePrice; | ||||
| /*面额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | ||||
| private Integer price; | private Integer price; | ||||
| /*单位**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") | ||||
| private Integer unit; | private Integer unit; | ||||
| /*限领张数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") | @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") | ||||
| private Integer useLimitQuantity; | private Integer useLimitQuantity; | ||||
| /*1.主动领取2.定向投放**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") | @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") | ||||
| private Integer sendType; | private Integer sendType; | ||||
| /**过期退款(0:正常,1不退)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") | @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") | ||||
| private Integer 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") | @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") | ||||
| private Integer validType; | private Integer validType; | ||||
| /**有效日期-开始**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") | ||||
| private Date validStartDate; | private Date validStartDate; | ||||
| /**有效日期-结束**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") | ||||
| private Date validEndDate; | private Date validEndDate; | ||||
| /**自领取之日几日有效,(停车券当天有效)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") | @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") | ||||
| private Integer validDays; | private Integer validDays; | ||||
| /**积分售价(适用于类型10,11)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") | ||||
| private Integer creditPrice; | private Integer creditPrice; | ||||
| @@ -95,7 +78,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String priceStr; | private String priceStr; | ||||
| /*发券商户信息*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") | ||||
| private List<WxMerchantVo> merchantVoList; | private List<WxMerchantVo> merchantVoList; | ||||
| @@ -16,53 +16,49 @@ public class WxCouponStatisVo extends WxCoupon { | |||||
| private String xtime; | private String xtime; | ||||
| @Transient | @Transient | ||||
| private String xcount; | private String xcount; | ||||
| /**售出卡数量**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") | |||||
| private Long saleCount; | private Long saleCount; | ||||
| /**转增数量**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") | |||||
| private Long transferCount; | private Long transferCount; | ||||
| /**售出金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") | |||||
| private Integer saleAmount; | private Integer saleAmount; | ||||
| /**核销数量**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="核销数量",name="sumPayment") | |||||
| private Integer sumPayment; | private Integer sumPayment; | ||||
| /**退款数量**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="退款数量",name="backpayCount") | |||||
| private Integer backpayCount; | private Integer backpayCount; | ||||
| /**砍价发起次数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="砍价发起次数",name="pressSendCount") | |||||
| private Integer pressSendCount; | private Integer pressSendCount; | ||||
| /**砍价成功次数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="砍价成功次数",name="pressSuccCount") | |||||
| private Integer pressSuccCount; | private Integer pressSuccCount; | ||||
| /**砍价参与人数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="砍价参与人数",name="pressJoinCount") | |||||
| private Integer pressJoinCount; | private Integer pressJoinCount; | ||||
| /**商场补贴**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="商场补贴",name="sumSubsidy") | |||||
| private Integer sumSubsidy; | private Integer sumSubsidy; | ||||
| /**核销比**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") | |||||
| private String paymentRate; | private String paymentRate; | ||||
| /**转化率**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRate") | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRate") | |||||
| private String changeRate; | private String changeRate; | ||||
| @@ -1,163 +1,145 @@ | |||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||||
| <mapper namespace="com.iformall.mapper.WxCampaignMapper"> | <mapper namespace="com.iformall.mapper.WxCampaignMapper"> | ||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCampaign"> | |||||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | |||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | |||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> | |||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice" /> | |||||
| <result column="discount_price" jdbcType="INTEGER" property="discountPrice" /> | |||||
| <result column="detail" jdbcType="VARCHAR" property="detail" /> | |||||
| <result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate" /> | |||||
| <result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate" /> | |||||
| <result column="img_detail" jdbcType="VARCHAR" property="imgDetail" /> | |||||
| <result column="type" jdbcType="INTEGER" property="type" /> | |||||
| <result column="coupon_ids" jdbcType="VARCHAR" property="couponIds" /> | |||||
| <result column="mechant_id" jdbcType="BIGINT" property="mechantId" /> | |||||
| <result column="sort_num" jdbcType="INTEGER" property="sortNum" /> | |||||
| <result column="status" jdbcType="INTEGER" property="status" /> | |||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> | |||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> | |||||
| <result column="html" jdbcType="VARCHAR" property="html" /> | |||||
| </resultMap> | |||||
| <sql id="allColumns"> | |||||
| `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, | |||||
| <resultMap id="BaseResultMap" type="com.iformall.domain.po.WxCampaign"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | |||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | |||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | |||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | |||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | |||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice"/> | |||||
| <result column="discount_price" jdbcType="INTEGER" property="discountPrice"/> | |||||
| <result column="detail" jdbcType="VARCHAR" property="detail"/> | |||||
| <result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/> | |||||
| <result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/> | |||||
| <result column="img_detail" jdbcType="VARCHAR" property="imgDetail"/> | |||||
| <result column="type" jdbcType="INTEGER" property="type"/> | |||||
| <result column="coupon_ids" jdbcType="VARCHAR" property="couponIds"/> | |||||
| <result column="mechant_id" jdbcType="BIGINT" property="mechantId"/> | |||||
| <result column="sort_num" jdbcType="INTEGER" property="sortNum"/> | |||||
| <result column="status" jdbcType="INTEGER" property="status"/> | |||||
| <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/> | |||||
| <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/> | |||||
| <result column="html" jdbcType="VARCHAR" property="html"/> | |||||
| </resultMap> | |||||
| <sql id="allColumns"> | |||||
| `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` | `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` | ||||
| </sql> | </sql> | ||||
| <sql id="allCHeadColumns"> | <sql id="allCHeadColumns"> | ||||
| `id`,`tenant_id`,`cover_img`,`title`,`type`,`sort_num` | |||||
| `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`type`,`sort_num` | |||||
| </sql> | </sql> | ||||
| <sql id="allAHeadColumns"> | <sql id="allAHeadColumns"> | ||||
| `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` | `mechant_id`,`sort_num`,`status`,`create_time`,`update_time` | ||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | |||||
| where 1 = 1 | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != coverImg "> | |||||
| and `cover_img` like concat('%', #{coverImg},'%') | |||||
| </if> | |||||
| <if test=" null != title "> | |||||
| and `title` like concat('%', #{title},'%') | |||||
| </if> | |||||
| <if test=" null != subTitle "> | |||||
| and `sub_title` like concat('%', #{subTitle},'%') | |||||
| </if> | |||||
| <if test=" null != usePrice "> | |||||
| and `use_price` = #{usePrice} | |||||
| </if> | |||||
| <if test=" null != discountPrice "> | |||||
| and `discount_price` = #{discountPrice} | |||||
| </if> | |||||
| <if test=" null != detail "> | |||||
| and `detail` like concat('%', #{detail},'%') | |||||
| </if> | |||||
| <if test=" null != validStartDate "> | |||||
| and `valid_start_date` = #{validStartDate} | |||||
| </if> | |||||
| <if test=" null != validEndDate "> | |||||
| and `valid_end_date` = #{validEndDate} | |||||
| </if> | |||||
| <if test=" null != imgDetail "> | |||||
| and `img_detail` like concat('%', #{imgDetail},'%') | |||||
| </if> | |||||
| <if test=" null != type "> | |||||
| and `type` = #{type} | |||||
| </if> | |||||
| <if test=" null != couponIds "> | |||||
| and `coupon_ids` like concat('%', #{couponIds},'%') | |||||
| </if> | |||||
| <if test=" null != mechantId "> | |||||
| and `mechant_id` = #{mechantId} | |||||
| </if> | |||||
| <if test=" null != sortNum "> | |||||
| and `sort_num` = #{sortNum} | |||||
| </if> | |||||
| <if test=" null != status "> | |||||
| and `status` = #{status} | |||||
| </if> | |||||
| <if test=" null != createTime "> | |||||
| and `create_time` = #{createTime} | |||||
| </if> | |||||
| <if test=" null != updateTime "> | |||||
| and `update_time` = #{updateTime} | |||||
| </if> | |||||
| <if test=" null != ids "> | |||||
| and id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| </sql> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCampaign" resultMap="BaseResultMap"> | |||||
| select <include refid="allAHeadColumns" /> from wx_campaign | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| </select> | |||||
| <sql id="dynamicWhereConditions"> | |||||
| where 1 = 1 | |||||
| <if test=" null != id "> | |||||
| and `id` = #{id} | |||||
| </if> | |||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != coverImg "> | |||||
| and `cover_img` like concat('%', #{coverImg},'%') | |||||
| </if> | |||||
| <if test=" null != title "> | |||||
| and `title` like concat('%', #{title},'%') | |||||
| </if> | |||||
| <if test=" null != subTitle "> | |||||
| and `sub_title` like concat('%', #{subTitle},'%') | |||||
| </if> | |||||
| <if test=" null != usePrice "> | |||||
| and `use_price` = #{usePrice} | |||||
| </if> | |||||
| <if test=" null != discountPrice "> | |||||
| and `discount_price` = #{discountPrice} | |||||
| </if> | |||||
| <if test=" null != detail "> | |||||
| and `detail` like concat('%', #{detail},'%') | |||||
| </if> | |||||
| <if test=" null != validStartDate "> | |||||
| and `valid_start_date` = #{validStartDate} | |||||
| </if> | |||||
| <if test=" null != validEndDate "> | |||||
| and `valid_end_date` = #{validEndDate} | |||||
| </if> | |||||
| <if test=" null != imgDetail "> | |||||
| and `img_detail` like concat('%', #{imgDetail},'%') | |||||
| </if> | |||||
| <if test=" null != type "> | |||||
| and `type` = #{type} | |||||
| </if> | |||||
| <if test=" null != couponIds "> | |||||
| and `coupon_ids` like concat('%', #{couponIds},'%') | |||||
| </if> | |||||
| <if test=" null != mechantId "> | |||||
| and `mechant_id` = #{mechantId} | |||||
| </if> | |||||
| <if test=" null != sortNum "> | |||||
| and `sort_num` = #{sortNum} | |||||
| </if> | |||||
| <if test=" null != status "> | |||||
| and `status` = #{status} | |||||
| </if> | |||||
| <if test=" null != createTime "> | |||||
| and `create_time` = #{createTime} | |||||
| </if> | |||||
| <if test=" null != updateTime "> | |||||
| and `update_time` = #{updateTime} | |||||
| </if> | |||||
| <if test=" null != ids "> | |||||
| and id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | |||||
| </sql> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCampaign" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allAHeadColumns"/> | |||||
| from wx_campaign | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | |||||
| <select id="findCList" parameterType="com.iformall.domain.po.WxCampaign" resultMap="BaseResultMap"> | <select id="findCList" parameterType="com.iformall.domain.po.WxCampaign" resultMap="BaseResultMap"> | ||||
| select <include refid="allCHeadColumns" /> from wx_campaign | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| select | |||||
| <include refid="allCHeadColumns"/> | |||||
| from wx_campaign | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | </select> | ||||
| <select id="getMaxSortNum" parameterType="java.lang.String" resultType="java.lang.Integer"> | |||||
| <select id="getMaxSortNum" parameterType="java.lang.String" resultType="java.lang.Integer"> | |||||
| select max(sort_num) from wx_campaign where `tenant_id` = #{tenantId} | select max(sort_num) from wx_campaign where `tenant_id` = #{tenantId} | ||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||
| @@ -72,11 +72,6 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCardInfo" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns" /> from wx_card_info | |||||
| <include refid="dynamicWhereConditions" /> | |||||
| </select> | |||||
| <resultMap id="VoBaseResultMap" type="com.iformall.domain.vo.WxCardVo"> | <resultMap id="VoBaseResultMap" type="com.iformall.domain.vo.WxCardVo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| @@ -93,6 +88,7 @@ | |||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | ||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture" /> | |||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> | ||||
| <result column="detail" jdbcType="VARCHAR" property="detail" /> | <result column="detail" jdbcType="VARCHAR" property="detail" /> | ||||
| @@ -117,7 +113,7 @@ | |||||
| <sql id="allVoColumns"> | <sql id="allVoColumns"> | ||||
| 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.`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`, | 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, | 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 | cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone | ||||
| </sql> | </sql> | ||||
| @@ -98,6 +98,7 @@ | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | ||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | ||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture" /> | |||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> | ||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice" /> | <result column="sale_price" jdbcType="INTEGER" property="salePrice" /> | ||||
| @@ -125,7 +126,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="CouponCarColumns"> | <sql id="CouponCarColumns"> | ||||
| 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 | car.vendor_type, car.vendor_params,c.credit_price | ||||
| </sql> | </sql> | ||||
| <select id="findVoDetail" parameterType="java.lang.Long" resultMap="CouponCarMap"> | <select id="findVoDetail" parameterType="java.lang.Long" resultMap="CouponCarMap"> | ||||
| @@ -6,6 +6,7 @@ | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | ||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | |||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| @@ -42,6 +43,7 @@ | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | ||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | |||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| @@ -84,7 +86,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, | |||||
| `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, | |||||
| `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, | `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, | ||||
| `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, | `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, | ||||
| `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` | `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` | ||||
| @@ -426,6 +428,7 @@ | |||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type"/> | <result column="type" jdbcType="INTEGER" property="type"/> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | ||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | |||||
| <result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
| <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | <result column="sub_title" jdbcType="VARCHAR" property="subTitle"/> | ||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| @@ -452,13 +455,6 @@ | |||||
| <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> | ||||
| <result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/> | <result column="press_limit_num" jdbcType="INTEGER" property="pressLimitNum"/> | ||||
| <result column="press_limit_hours" jdbcType="INTEGER" property="pressLimitHours"/> | <result column="press_limit_hours" jdbcType="INTEGER" property="pressLimitHours"/> | ||||
| <result column="xtime" property="xtime"/> | |||||
| <result column="xcount" property="xcount"/> | |||||
| <result column="sale_count" property="saleCount"/> | |||||
| <result column="transfer_count" property="transferCount"/> | |||||
| <result column="sale_amount" property="saleAmount"/> | |||||
| <result column="sum_payment" property="sumPayment"/> | |||||
| <result column="backpay_count" property="backpayCount"/> | |||||
| <collection column="{productId=id}" property="merchantVoList" | <collection column="{productId=id}" property="merchantVoList" | ||||
| @@ -794,11 +790,11 @@ | |||||
| <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon"> | <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon"> | ||||
| select ct.id as id,wc.id as couponId, | select ct.id as id,wc.id as couponId, | ||||
| wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`, | |||||
| wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`, | |||||
| wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, | wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`, | ||||
| wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, | wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`, | ||||
| wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund` | wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund` | ||||
| ,wc.title as couponName,wc.`cover_img` as couponPic,wc.id as couponId from wx_coupon_channel ct left join | |||||
| ,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.id as couponId from wx_coupon_channel ct left join | |||||
| wx_coupon wc on wc.id = ct.coupon_id | wx_coupon wc on wc.id = ct.coupon_id | ||||
| where ct.`sub_target_id` = #{id} | where ct.`sub_target_id` = #{id} | ||||
| </select> | </select> | ||||
| @@ -48,13 +48,6 @@ | |||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxOrderGroup" resultMap="BaseResultMap"> | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_order_group | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | |||||
| <select id="queryRemainOne" parameterType="com.iformall.domain.po.WxOrderGroup" resultType="hashmap"> | <select id="queryRemainOne" parameterType="com.iformall.domain.po.WxOrderGroup" resultType="hashmap"> | ||||
| select o.press_end_date expiredDate,o.order_group_id orderGroupId,c.nick_name nickName, | select o.press_end_date expiredDate,o.order_group_id orderGroupId,c.nick_name nickName, | ||||
| @@ -8,6 +8,7 @@ | |||||
| <result column="title" property="title" /> | <result column="title" property="title" /> | ||||
| <result column="content" property="content" /> | <result column="content" property="content" /> | ||||
| <result column="cover" property="cover" /> | <result column="cover" property="cover" /> | ||||
| <result column="cover_picture" property="coverPicture" /> | |||||
| <result column="advert" property="advert" /> | <result column="advert" property="advert" /> | ||||
| <result column="begin_time" property="beginTime" /> | <result column="begin_time" property="beginTime" /> | ||||
| <result column="end_time" property="endTime" /> | <result column="end_time" property="endTime" /> | ||||
| @@ -20,7 +21,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`name`,`title`,content,cover,advert,begin_time,end_time,createtime,updatetime,bg_color | |||||
| `id`,`tenant_id`,`name`,`title`,`content`,`cover`,`cover_picture`,`advert`,`begin_time`,`end_time`,`createtime`,`updatetime`,`bg_color` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||