From 64a78e47854431aa5c57fbaf90d9054315ef2deb Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Tue, 18 Sep 2018 14:32:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=A7=A3=E5=8D=95=E5=8F=8A?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=95=86=E9=93=BA][=E6=95=B4=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/po/WxMerchantShop.java | 14 +- .../domain/po/WxMerchantTradeDaily.java | 304 +++++++++--------- 2 files changed, 164 insertions(+), 154 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java index ea472c74f..49adf4932 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java @@ -119,13 +119,13 @@ public class WxMerchantShop implements Serializable { 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") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") - ,RentalStartDate_ASC("`rentalStartDate` ASC"),RentalStartDate_DESC("`rentalStartDate` DESC") - ,RentalEndDate_ASC("`rentalEndDate` ASC"),RentalEndDate_DESC("`rentalEndDate` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,RentalStartDate_ASC("`rental_start_date` ASC"),RentalStartDate_DESC("`rental_start_date` DESC") + ,RentalEndDate_ASC("`rental_end_date` ASC"),RentalEndDate_DESC("`rental_end_date` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 3c2a3e06f..9fd4994de 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -1,160 +1,170 @@ package com.iformall.domain.po; -import javax.persistence.*; -import java.util.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_merchant_trade_daily") public class WxMerchantTradeDaily implements Serializable { - private static final long serialVersionUID = 1L; - - @Id + private static final long serialVersionUID = 1L; + + @Id protected Long id; - + @Transient protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List 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; - /*交易额**/ - @io.swagger.annotations.ApiModelProperty(value="交易额",name="tradeAmt") - private Integer tradeAmt; - /*提交日期**/ - @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="reportDate") - private String reportDate; - - 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 getTradeAmt() { - return tradeAmt; - } - public void setTradeAmt(Integer _tradeAmt) { - tradeAmt = _tradeAmt; - } - 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 getReportDate() { - return reportDate; - } - public void setReportDate(String _reportDate) { - reportDate = _reportDate; - } - - - - 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") - ,TradeAmt_ASC("`tradeAmt` ASC"),TradeAmt_DESC("`tradeAmt` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` 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(WxMerchantTradeDaily.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 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 Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + + public void setIds(List 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; + /*交易额**/ + @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") + private Integer tradeAmt; + /*提交日期**/ + @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 = "reportDate") + private String reportDate; + + 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 getTradeAmt() { + return tradeAmt; + } + + public void setTradeAmt(Integer _tradeAmt) { + tradeAmt = _tradeAmt; + } + + 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 getReportDate() { + return reportDate; + } + + public void setReportDate(String _reportDate) { + reportDate = _reportDate; + } + + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), + MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), + TradeAmt_ASC("`trade_amt` ASC"), TradeAmt_DESC("`trade_amt` DESC"), + CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` 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(WxMerchantTradeDaily.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()); + } + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List 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)); + } + } }