Browse Source

卡券过期时间

release_toaliyun_real
masterspirit 7 years ago
parent
commit
489496bbcb
4 changed files with 359 additions and 334 deletions
  1. +333
    -325
      mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java
  2. +12
    -2
      mallinkService/src/main/java/com/simple/domain/po/WxOrders.java
  3. +7
    -6
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  4. +7
    -1
      mallinkService/src/main/resources/mapper/WxOrdersMapper.xml

+ 333
- 325
mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java View File

@@ -10,344 +10,352 @@ import java.io.Serializable;

@Table(name = "wx_coupon")
public class WxCoupon implements Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;

@Id
protected Long id;
@Id
protected Long id;

@Transient
protected List<String> ids;
@Transient
protected String sortColumns;
@Transient
protected List<String> ids;
@Transient
protected String sortColumns;

public Long getId() {
return id;
}
public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}
public void setId(Long id) {
this.id = id;
}

public String getSortColumns() {
return sortColumns;
}
public String getSortColumns() {
return sortColumns;
}

public List<String> getIds() {
return ids;
}
public void setIds(List<String> ids) {
this.ids = ids;
}
public List<String> getIds() {
return ids;
}
public void setIds(List<String> ids) {
this.ids = ids;
}



/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Long merchantId;
/*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
@io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
private Integer type;
/*封面图**/
@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 BigDecimal salePrice;
/*使用条件金额(适用于类型1,2,3,4)**/
@io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice")
private BigDecimal usePrice;
/*限领张数**/
@io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity")
private Integer useLimitQuantity;
/*投放频道位置(1.banner图,2.限时抢购)**/
@io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd")
private Integer targetAd;
/*1.主动领取2.定向投放**/
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType")
private Integer sendType;
/*发放开始时间**/
@io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate")
private Date sendStartDate;
/*发放结束时间**/
@io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate")
private Date sendEndDate;
/*有效日期-开始**/
@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;
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Long merchantId;
/*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
@io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
private Integer type;
/*封面图**/
@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 BigDecimal salePrice;
/*使用条件金额(适用于类型1,2,3,4)**/
@io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice")
private BigDecimal usePrice;
/*限领张数**/
@io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity")
private Integer useLimitQuantity;
/*投放频道位置(1.banner图,2.限时抢购)**/
@io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd")
private Integer targetAd;
/*1.主动领取2.定向投放**/
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType")
private Integer sendType;
/*发放开始时间**/
@io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate")
private Date sendStartDate;
/*发放结束时间**/
@io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate")
private Date sendEndDate;
/*有效时间类型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 BigDecimal price;
/*库存**/
@io.swagger.annotations.ApiModelProperty(value="库存",name="number")
private Integer number;
/*总数**/
@io.swagger.annotations.ApiModelProperty(value="总数",name="total")
private Integer total;
/*购买须知**/
@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;
/*状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)**/
@io.swagger.annotations.ApiModelProperty(value="状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)",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 String business;
public String getTenantId() {
return tenantId;
}
public void setTenantId(String _tenantId) {
tenantId = _tenantId;
}
public Long getMerchantId() {
return merchantId;
}
public void setMerchantId(Long _merchantId) {
merchantId = _merchantId;
}
public Integer getType() {
return type;
}
public void setType(Integer _type) {
type = _type;
}
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 BigDecimal getSalePrice() {
return salePrice;
}
public void setSalePrice(BigDecimal _salePrice) {
salePrice = _salePrice;
}
public BigDecimal getUsePrice() {
return usePrice;
}
public void setUsePrice(BigDecimal _usePrice) {
usePrice = _usePrice;
}
public Integer getUseLimitQuantity() {
return useLimitQuantity;
}
public void setUseLimitQuantity(Integer _useLimitQuantity) {
useLimitQuantity = _useLimitQuantity;
}
public Integer getTargetAd() {
return targetAd;
}
public void setTargetAd(Integer _targetAd) {
targetAd = _targetAd;
}
public Integer getSendType() {
return sendType;
}
public void setSendType(Integer _sendType) {
sendType = _sendType;
}
public Date getSendStartDate() {
return sendStartDate;
}
public void setSendStartDate(Date _sendStartDate) {
sendStartDate = _sendStartDate;
}
public Date getSendEndDate() {
return sendEndDate;
}
public void setSendEndDate(Date _sendEndDate) {
sendEndDate = _sendEndDate;
}
public Integer getValidType() {
return validType;
}
public void setValidType(Integer _validType) {
validType = _validType;
}
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 Integer getValidDays() {
return validDays;
}
public void setValidDays(Integer _validDays) {
validDays = _validDays;
}
public String getDetail() {
return detail;
}
public void setDetail(String _detail) {
detail = _detail;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal _price) {
price = _price;
}
public Integer getNumber() {
return number;
}
public void setNumber(Integer _number) {
number = _number;
}
public Integer getTotal() {
return total;
}
public void setTotal(Integer _total) {
total = _total;
}
public String getRemark() {
return remark;
}
public void setRemark(String _remark) {
remark = _remark;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer _status) {
status = _status;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date _createDate) {
createDate = _createDate;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date _updateDate) {
updateDate = _updateDate;
}
public String getBusiness() {
return business;
}
public void setBusiness(String _business) {
business = _business;
}

/*面额**/
@io.swagger.annotations.ApiModelProperty(value="面额",name="price")
private BigDecimal price;
/*库存**/
@io.swagger.annotations.ApiModelProperty(value="库存",name="number")
private Integer number;
/*总数**/
@io.swagger.annotations.ApiModelProperty(value="总数",name="total")
private Integer total;
/***/
@io.swagger.annotations.ApiModelProperty(value="使用须知",name="remark")
private String remark;
/*状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)**/
@io.swagger.annotations.ApiModelProperty(value="状态(0:草稿,1:待生效,2:已生效,3:已失效,4:已作废)",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 String business;
public String getTenantId() {
return tenantId;
}
public void setTenantId(String _tenantId) {
tenantId = _tenantId;
}
public Long getMerchantId() {
return merchantId;
}
public void setMerchantId(Long _merchantId) {
merchantId = _merchantId;
}
public Integer getType() {
return type;
}
public void setType(Integer _type) {
type = _type;
}
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 BigDecimal getSalePrice() {
return salePrice;
}
public void setSalePrice(BigDecimal _salePrice) {
salePrice = _salePrice;
}
public BigDecimal getUsePrice() {
return usePrice;
}
public void setUsePrice(BigDecimal _usePrice) {
usePrice = _usePrice;
}
public Integer getUseLimitQuantity() {
return useLimitQuantity;
}
public void setUseLimitQuantity(Integer _useLimitQuantity) {
useLimitQuantity = _useLimitQuantity;
}
public Integer getTargetAd() {
return targetAd;
}
public void setTargetAd(Integer _targetAd) {
targetAd = _targetAd;
}
public Integer getSendType() {
return sendType;
}
public void setSendType(Integer _sendType) {
sendType = _sendType;
}
public Date getSendStartDate() {
return sendStartDate;
}
public void setSendStartDate(Date _sendStartDate) {
sendStartDate = _sendStartDate;
}
public Date getSendEndDate() {
return sendEndDate;
}
public void setSendEndDate(Date _sendEndDate) {
sendEndDate = _sendEndDate;
}
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 Integer getValidDays() {
return validDays;
}
public void setValidDays(Integer _validDays) {
validDays = _validDays;
}
public String getDetail() {
return detail;
}
public void setDetail(String _detail) {
detail = _detail;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal _price) {
price = _price;
}
public Integer getNumber() {
return number;
}
public void setNumber(Integer _number) {
number = _number;
}
public Integer getTotal() {
return total;
}
public void setTotal(Integer _total) {
total = _total;
}
public String getRemark() {
return remark;
}
public void setRemark(String _remark) {
remark = _remark;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer _status) {
status = _status;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date _createDate) {
createDate = _createDate;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date _updateDate) {
updateDate = _updateDate;
}
public String getBusiness() {
return business;
}
public void setBusiness(String _business) {
business = _business;
}


public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC")
,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC")
,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC")
,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC")
,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC")
,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC")
,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC")
,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC")
,ValidType_ASC("`validType` ASC"),ValidType_DESC("`validType` DESC")
,ValidStartDate_ASC("`validStartDate` ASC"),ValidStartDate_DESC("`validStartDate` DESC")
,ValidEndDate_ASC("`validEndDate` ASC"),ValidEndDate_DESC("`validEndDate` DESC")
,ValidDays_ASC("`validDays` ASC"),ValidDays_DESC("`validDays` DESC")
,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC")
,Price_ASC("`price` ASC"),Price_DESC("`price` DESC")
,Number_ASC("`number` ASC"),Number_DESC("`number` DESC")
,Total_ASC("`total` ASC"),Total_DESC("`total` DESC")
,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` DESC")
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC")
,Business_ASC("`business` ASC"),Business_DESC("`business` DESC")
;
private String value;
Field(String value){
this.value = value;
}
public String getValue() {
return value;
}
public void setCol(String value) {
this.value = value;
}
@Override
public String toString() {
return this.getValue();
}
}

public static enum Field
{
Id_ASC("`id` ASC"),Id_DESC("`id` DESC")
,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC")
,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC")
,Type_ASC("`type` ASC"),Type_DESC("`type` DESC")
,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC")
,Title_ASC("`title` ASC"),Title_DESC("`title` DESC")
,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC")
,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC")
,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC")
,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC")
,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC")
,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC")
,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC")
,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC")
,ValidStartDate_ASC("`validStartDate` ASC"),ValidStartDate_DESC("`validStartDate` DESC")
,ValidEndDate_ASC("`validEndDate` ASC"),ValidEndDate_DESC("`validEndDate` DESC")
,ValidDays_ASC("`validDays` ASC"),ValidDays_DESC("`validDays` DESC")
,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC")
,Businesses_ASC("`businesses` ASC"),Businesses_DESC("`businesses` DESC")
,Price_ASC("`price` ASC"),Price_DESC("`price` DESC")
,Number_ASC("`number` ASC"),Number_DESC("`number` DESC")
,Total_ASC("`total` ASC"),Total_DESC("`total` DESC")
,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` DESC")
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC")
,Business_ASC("`business` ASC"),Business_DESC("`business` DESC")
;
private String value;
Field(String value){
this.value = value;
}
public String getValue() {
return value;
}
public void setCol(String value) {
this.value = value;
}
@Override
public String toString() {
return this.getValue();
}
}
public void setSortColumns(WxCoupon.Field... fields)
{
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}

public void setSortColumns(WxCoupon.Field... fields)
{
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
}

}

public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
public void setSortColumns(String sortColumns)
{
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 12
- 2
mallinkService/src/main/java/com/simple/domain/po/WxOrders.java View File

@@ -56,6 +56,9 @@ public class WxOrders implements Serializable {
/*状态(0.待付款 1.已支付 2.已退款 3.已核销 4.已取消 )**/
@io.swagger.annotations.ApiModelProperty(value="状态(0.待付款 1.已支付 2.已退款 3.已核销 4.已取消 )",name="status")
private Integer status;
/*过期时间**/
@io.swagger.annotations.ApiModelProperty(value="过期时间",name="validDate")
private Date validDate;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@@ -92,6 +95,12 @@ public class WxOrders implements Serializable {
public void setStatus(Integer _status) {
status = _status;
}
public Date getValidDate() {
return validDate;
}
public void setValidDate(Date _validDate) {
validDate = _validDate;
}
public Date getCreateDate() {
return createDate;
}
@@ -115,6 +124,7 @@ public class WxOrders implements Serializable {
,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC")
,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC")
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC")
,ValidDate_ASC("`validDate` ASC"),ValidDate_DESC("`validDate` DESC")
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC")
,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC")
;
@@ -134,7 +144,7 @@ public class WxOrders implements Serializable {
}
}
public void setSortColumns(WxOrders.Field... fields)
public void setSortColumns(Field... fields)
{
if (fields == null || fields.length == 0) {
return;
@@ -159,7 +169,7 @@ public class WxOrders implements Serializable {
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
java.util.List<Field> fList = new java.util.ArrayList();
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}


+ 7
- 6
mallinkService/src/main/resources/mapper/WxCouponMapper.xml View File

@@ -16,6 +16,7 @@
<result column="send_type" jdbcType="INTEGER" property="sendType" />
<result column="send_start_date" jdbcType="TIMESTAMP" property="sendStartDate" />
<result column="send_end_date" jdbcType="TIMESTAMP" property="sendEndDate" />
<result column="valid_type" jdbcType="INTEGER" property="validType" />
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate" />
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate" />
<result column="valid_days" jdbcType="INTEGER" property="validDays" />
@@ -31,7 +32,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`target_ad`,`send_type`,`send_start_date`,`send_end_date`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`number`,`total`,`remark`,`status`,`create_date`,`update_date`,`business`
`id`,`tenant_id`,`merchant_id`,`type`,`cover_img`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`target_ad`,`send_type`,`send_start_date`,`send_end_date`,`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`number`,`total`,`remark`,`status`,`create_date`,`update_date`,`business`
</sql>

<sql id="dynamicWhereConditions">
@@ -107,6 +108,11 @@
</if>
<if test=" null != validType ">
and `valid_type` = #{validType}
</if>
<if test=" null != validStartDate ">
and `valid_start_date` = #{validStartDate}
@@ -127,11 +133,6 @@
</if>
<if test=" null != businesses ">
and `businesses` like concat('%', #{businesses},'%')
</if>
<if test=" null != price ">
and `price` = #{price}


+ 7
- 1
mallinkService/src/main/resources/mapper/WxOrdersMapper.xml View File

@@ -8,12 +8,13 @@
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="payment" jdbcType="DECIMAL" property="payment" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="valid_date" jdbcType="TIMESTAMP" property="validDate" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`status`,`create_date`,`update_date`
`id`,`tenant_id`,`coupon_id`,`c_user_id`,`payment`,`status`,`valid_date`,`create_date`,`update_date`
</sql>

<sql id="dynamicWhereConditions">
@@ -49,6 +50,11 @@
</if>
<if test=" null != validDate ">
and `valid_date` = #{validDate}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}


Loading…
Cancel
Save