From 32829b83a4b809a03448f4c0f6760b5776b56e83 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 24 Jul 2019 16:18:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=9E=E4=BD=93[=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxActivity.java | 23 ------- .../iformall/domain/po/WxActivityJoin.java | 22 ------- .../com/iformall/domain/po/WxAdminLog.java | 35 ++--------- .../com/iformall/domain/po/WxAppinfo.java | 40 +------------ .../iformall/domain/po/WxAuthorizerInfo.java | 60 ++----------------- .../java/com/iformall/domain/po/WxBLog.java | 34 ++--------- .../com/iformall/domain/po/WxBillAction.java | 26 +------- .../com/iformall/domain/po/WxBillDaily.java | 34 ----------- .../com/iformall/domain/po/WxBillDeposit.java | 43 +------------ .../com/iformall/domain/po/WxBillOther.java | 35 ----------- .../domain/po/WxBillOtherDeposit.java | 37 ------------ .../iformall/domain/po/WxBillProperty.java | 38 ------------ .../domain/po/WxBillPropertyDeposit.java | 43 +------------ .../com/iformall/domain/po/WxBillRent.java | 37 ------------ .../java/com/iformall/domain/po/WxBrand.java | 25 +------- .../com/iformall/domain/po/WxBusiness.java | 36 ++--------- .../com/iformall/domain/po/WxCampaign.java | 37 ------------ .../com/iformall/domain/po/WxCarCmdLog.java | 38 ++---------- .../com/iformall/domain/po/WxCardInfo.java | 36 +---------- .../com/iformall/domain/po/WxCardSpend.java | 38 +----------- .../domain/po/WxCardTransferInfo.java | 4 +- .../com/iformall/domain/po/WxChannel.java | 30 +--------- .../iformall/domain/po/WxChartDataEntity.java | 3 +- 23 files changed, 38 insertions(+), 716 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java index 05754ba1f..cf427477e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivity.java @@ -120,28 +120,5 @@ public class WxActivity extends BaseEntity { } - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), CoverImg_ASC("`cover_img` ASC"), CoverImg_DESC("`cover_img` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), SubTitle_ASC("`sub_title` ASC"), SubTitle_DESC("`sub_title` DESC"), StartTime_ASC("`start_time` ASC"), StartTime_DESC("`start_time` DESC"), EndTime_ASC("`end_time` ASC"), EndTime_DESC("`end_time` DESC"), Type_ASC("`type` ASC"), Type_DESC("`type` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ActivityTime_ASC("`activity_start_time` ASC"), ActivityTime_DESC("`activity_start_time` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(); - } - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 30670fa6b..d37ac71d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -81,26 +81,4 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "状态", name = "statusStr") private String statusStr; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java index 63cdc142b..c4f85a69e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAdminLog.java @@ -2,17 +2,15 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_admin_log") @Data -public class WxAdminLog implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxAdminLog extends BaseEntity { + @Id protected Long id; @@ -29,30 +27,5 @@ public class WxAdminLog implements Serializable { private Integer type; @io.swagger.annotations.ApiModelProperty(value="计数",name="count") private Integer count; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Url_ASC("`url` ASC"),Url_DESC("`url` DESC") - ,ActionDate_ASC("`action_date` ASC"),ActionDate_DESC("`action_date` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Count_ASC("`count` ASC"),Count_DESC("`count` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index d57353ee1..c4a38df47 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -5,15 +5,13 @@ import lombok.Data; 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_appinfo") @Data -public class WxAppinfo implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxAppinfo extends BaseEntity { + @Id protected Long id; @@ -49,38 +47,4 @@ public class WxAppinfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") private Long payBillId; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") - ,ParentAppId_ASC("`parent_app_id` ASC"),ParentAppId_DESC("`parent_app_id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") - ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") - ,AesKey_ASC("`aesKey` ASC"),AesKey_DESC("`aesKey` DESC") - ,MsgDataFormat_ASC("`msg_data_format` ASC"),MsgDataFormat_DESC("`msg_data_format` DESC") - ,AccessToken_ASC("`access_token` ASC"),AccessToken_DESC("`access_token` DESC") - ,LastTokenTime_ASC("`last_token_time` ASC"),LastTokenTime_DESC("`last_token_time` DESC") - ,ExpiresIn_ASC("`expires_in` ASC"),ExpiresIn_DESC("`expires_in` DESC") - ,PayId_ASC("`pay_id` ASC"),PayId_DESC("`pay_id` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index 31c93077f..ec617d72e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -1,18 +1,17 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; -import java.util.*; + +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Date; import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_authorizer_info") @Data -public class WxAuthorizerInfo implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxAuthorizerInfo extends BaseEntity { + @Id protected Long id; @@ -75,52 +74,5 @@ public class WxAuthorizerInfo implements Serializable { private String accessToken; @io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire") private Date accessTokenExpire; - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,AuthorizerAppid_ASC("`authorizer_appid` ASC"),AuthorizerAppid_DESC("`authorizer_appid` DESC") - ,HeadImg_ASC("`head_img` ASC"),HeadImg_DESC("`head_img` DESC") - ,Alias_ASC("`alias` ASC"),Alias_DESC("`alias` DESC") - ,QrcodeUrl_ASC("`qrcode_url` ASC"),QrcodeUrl_DESC("`qrcode_url` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` DESC") - ,AuthorizationStatus_ASC("`authorization_status` ASC"),AuthorizationStatus_DESC("`authorization_status` DESC") - ,AuthTime_ASC("`auth_time` ASC"),AuthTime_DESC("`auth_time` DESC") - ,BaseStatus_ASC("`base_status` ASC"),BaseStatus_DESC("`base_status` DESC") - ,BaseTime_ASC("`base_time` ASC"),BaseTime_DESC("`base_time` DESC") - ,DomainStatus_ASC("`domain_status` ASC"),DomainStatus_DESC("`domain_status` DESC") - ,DomainTime_ASC("`domain_time` ASC"),DomainTime_DESC("`domain_time` DESC") - ,WebDomainStatus_ASC("`webdomain_status` ASC"),WebDomainStatus_DESC("`webdomain_status` DESC") - ,WebDomainTime_ASC("`webdomain_time` ASC"),WebDomainTime_DESC("`webdomain_time` DESC") - ,TemplateStatus_ASC("`template_status` ASC"),TemplateStatus_DESC("`template_status` DESC") - ,TemplateTime_ASC("`template_time` ASC"),TemplateTime_DESC("`template_time` DESC") - ,AuditBackNum_ASC("`audit_back_num` ASC"),AuditBackNum_DESC("`audit_back_num` DESC") - ,AuditBackTime_ASC("`audit_back_time` ASC"),AuditBackTime_DESC("`audit_back_time` DESC") - ,CurrentVersion_ASC("`current_version` ASC"),CurrentVersion_DESC("`current_version` DESC") - ,CurrentDesc_ASC("`current_desc` ASC"),CurrentDesc_DESC("`current_desc` DESC") - ,ReleaseTime_ASC("`release_time` ASC"),ReleaseTime_DESC("`release_time` DESC") - ,OpenAppId_ASC("`open_appid` ASC"),OpenAppId_DESC("`open_appid` DESC") - ,BindOpenTime_ASC("`bind_open_time` ASC"),BindOpen_DESC("`bind_open_time` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java index e970314de..e758969c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBLog.java @@ -2,16 +2,15 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; -import java.util.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Date; import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_b_log") @Data -public class WxBLog implements Serializable { +public class WxBLog extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -20,35 +19,10 @@ public class WxBLog implements Serializable { @Transient protected List ids; - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="",name="data") private String data; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Data_ASC("`data` ASC"),Data_DESC("`data` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java index 87e5cd959..480302561 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillAction.java @@ -5,7 +5,6 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -14,8 +13,7 @@ import java.util.List; */ @Table(name = "wx_bill_action") @Data -public class WxBillAction implements Serializable { - private static final long serialVersionUID = 1L; +public class WxBillAction extends BaseEntity { @Id protected Long id; @@ -60,26 +58,4 @@ public class WxBillAction implements Serializable { @Transient private Long newPrice; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 6a90eea9b..7150d717d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import javax.validation.constraints.NotNull; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -108,37 +107,4 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") private Date endtime; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index 8788ee52d..35ed8f575 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -5,8 +5,6 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -15,9 +13,8 @@ import java.util.List; */ @Table(name = "wx_bill_rent_deposit") @Data -public class WxBillDeposit implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillDeposit extends BaseEntity { + @Id protected Long id; @@ -78,41 +75,5 @@ public class WxBillDeposit implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`rentContractId` ASC"),RentContractId_DESC("`rentContractId` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,NeedPay_ASC("`needPay` ASC"),NeedPay_DESC("`needPay` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index cdb4baa25..f6a584e60 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -131,39 +130,5 @@ public class WxBillOther extends BaseEntity { @Transient private List> shops; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ReceivePay_ASC("`receive_pay` ASC"),ReceivePay_DESC("`receive_pay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receive_date` ASC"),ReceiveDate_DESC("`receive_date` DESC") - ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expired_day` ASC"),ExpiredDay_DESC("`expired_day` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") - ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 02d745661..920fd8f06 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -141,40 +140,4 @@ public class WxBillOtherDeposit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime") private Date endtime; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC") - , ReceivePay_ASC("`receivePay` ASC"), ReceivePay_DESC("`receivePay` DESC") - , Pay_ASC("`pay` ASC"), Pay_DESC("`pay` DESC") - , ReceiveDate_ASC("`receiveDate` ASC"), ReceiveDate_DESC("`receiveDate` DESC") - , PayDate_ASC("`payDate` ASC"), PayDate_DESC("`payDate` DESC") - , Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC") - , ExpiredDay_ASC("`expiredDay` ASC"), ExpiredDay_DESC("`expiredDay` DESC") - , TenantId_ASC("`tenantId` ASC"), TenantId_DESC("`tenantId` DESC") - , Owe_ASC("`owe` ASC"), Owe_DESC("`owe` DESC") - , Status_ASC("`status` ASC"), Status_DESC("`status` DESC") - , IsDel_ASC("`isDel` ASC"), IsDel_DESC("`isDel` DESC") - , MerchantId_ASC("`merchantId` ASC"), MerchantId_DESC("`merchantId` DESC") - , UserId_ASC("`userId` ASC"), UserId_DESC("`userId` DESC") - , ShopId_ASC("`shopId` ASC"), ShopId_DESC("`shopId` DESC") - , Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index b24611633..ad7b01e51 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -169,41 +168,4 @@ public class WxBillProperty extends BaseEntity { @Transient private Long deposit; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`property_contract_id` ASC"),RentContractId_DESC("`property_contract_id` DESC") - ,ReceivePay_ASC("`receive_pay` ASC"),ReceivePay_DESC("`receive_pay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receive_date` ASC"),ReceiveDate_DESC("`receive_date` DESC") - ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expired_day` ASC"),ExpiredDay_DESC("`expired_day` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") - ,NeedPay_ASC("`need_pay` ASC"),NeedPay_DESC("`need_pay` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") - ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` DESC") - ,Period_ASC("`period` ASC"),Period_DESC("`period` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index 391d4c377..ded057694 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -5,8 +5,6 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -15,9 +13,8 @@ import java.util.List; */ @Table(name = "wx_bill_property_deposit") @Data -public class WxBillPropertyDeposit implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBillPropertyDeposit extends BaseEntity { + @Id protected Long id; @@ -77,41 +74,5 @@ public class WxBillPropertyDeposit implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") private Integer payWay; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`rentContractId` ASC"),RentContractId_DESC("`rentContractId` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,NeedPay_ASC("`needPay` ASC"),NeedPay_DESC("`needPay` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 0715d4ac3..d3903a4ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -10,7 +10,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -180,41 +179,5 @@ public class WxBillRent extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value = "联营费率", name = "payRatio") private Long payRatio; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`rentContractId` ASC"),RentContractId_DESC("`rentContractId` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") - ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,NeedPay_ASC("`needPay` ASC"),NeedPay_DESC("`needPay` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") - ,Period_ASC("`period` ASC") - ; - 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index 7af5eee2d..288bc7d14 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -3,10 +3,10 @@ package com.iformall.domain.po; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -48,27 +48,4 @@ public class WxBrand extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") private Integer isDel; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index 61ef93a64..011a8c3e1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -2,18 +2,16 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; -import java.util.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Date; import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_business") @Data -public class WxBusiness implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxBusiness extends BaseEntity { + @Id protected Integer id; @@ -43,29 +41,5 @@ public class WxBusiness implements Serializable { private Integer limitStart; @Transient private Integer limitEnd; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 6f65797c0..19b786a6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -102,41 +102,4 @@ public class WxCampaign extends BaseEntity { return "t:bd:" + type + ":" +id; } - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CoverImg_ASC("`cover_img` ASC"),CoverImg_DESC("`cover_img` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,SubTitle_ASC("`sub_title` ASC"),SubTitle_DESC("`sub_title` DESC") - ,UsePrice_ASC("`use_price` ASC"),UsePrice_DESC("`use_price` DESC") - ,DiscountPrice_ASC("`discount_price` ASC"),DiscountPrice_DESC("`discount_price` DESC") - ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") - ,ValidStartDate_ASC("`valid_start_date` ASC"),ValidStartDate_DESC("`valid_start_date` DESC") - ,ValidEndDate_ASC("`valid_end_date` ASC"),ValidEndDate_DESC("`valid_end_date` DESC") - ,ImgDetail_ASC("`img_detail` ASC"),ImgDetail_DESC("`img_detail` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,CouponIds_ASC("`coupon_ids` ASC"),CouponIds_DESC("`coupon_ids` DESC") - ,MechantId_ASC("`mechant_id` ASC"),MechantId_DESC("`mechantId` DESC") - ,SortNum_ASC("`sort_num` ASC"),SortNum_DESC("`sortNum` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,UpdateTime_ASC("`update_time` ASC"),UpdateTime_DESC("`update_time` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java index a4577d2cd..2471f9cbe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarCmdLog.java @@ -2,18 +2,16 @@ package com.iformall.domain.po; import lombok.Data; -import javax.persistence.*; -import java.util.*; +import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Date; import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_car_cmd_log") @Data -public class WxCarCmdLog implements Serializable { - private static final long serialVersionUID = 1L; - +public class WxCarCmdLog extends BaseEntity { + @Id protected Long id; @@ -32,31 +30,5 @@ public class WxCarCmdLog implements Serializable { private Date updateDate; @io.swagger.annotations.ApiModelProperty(value="命令请求或者结果及相应花费的时间",name="cmdJson") private String cmdJson; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,VendorType_ASC("`vendor_type` ASC"),VendorType_DESC("`vendor_type` DESC") - ,CmdType_ASC("`cmd_type` ASC"),CmdType_DESC("`cmd_type` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,CmdJson_ASC("`cmd_json` ASC"),CmdJson_DESC("`cmd_json` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index ceb876535..5fc346f6b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -6,14 +6,13 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; @Table(name = "wx_card_info") @Data -public class WxCardInfo implements Serializable { +public class WxCardInfo extends BaseEntity { private static final long serialVersionUID = 1L; @Excel(name = "卡号", width = 20, orderNum = "1") @@ -63,36 +62,5 @@ public class WxCardInfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") private Integer supportTransfer; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") - ,TransactionId_ASC("`transaction_id` ASC"),TransactionId_DESC("`transaction_id` DESC") - ,Amount_ASC("`amount` ASC"),Amount_DESC("`amount` DESC") - ,SaleAmount_ASC("`sale_amount` ASC"),SaleAmount_DESC("`sale_amount` DESC") - ,RemainingAmount_ASC("`remaining_amount` ASC"),RemainingAmount_DESC("`remaining_amount` DESC") - ,ServiceFeeAmount_ASC("`service_fee_amount` ASC"),ServiceFeeAmount_DESC("`service_fee_amount` DESC") - ,ShareFeeAmount_ASC("`share_fee_amount` ASC"),ShareFeeAmount_DESC("`share_fee_amount` DESC") - ,RemainingShareFeeAmount_ASC("`remaining_share_fee_amount` ASC"),RemainingShareFeeAmount_DESC("`remaining_share_fee_amount` DESC") - ,RateAmount_ASC("`rate_amount` ASC"),RateAmount_DESC("`rate_amount` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_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(); - } - } - + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index 78bcaf7ef..8c4ef50f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -6,14 +6,13 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; @Table(name = "wx_card_spend") @Data -public class WxCardSpend implements Serializable { +public class WxCardSpend extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -126,40 +125,5 @@ public class WxCardSpend implements Serializable { } return realPaymentStr; } - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CardId_ASC("`card_id` ASC"),CardId_DESC("`card_id` DESC") - ,OwnerId_ASC("`owner_id` ASC"),OwnerId_DESC("`owner_id` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") - ,Ip_ASC("`ip` ASC"),Ip_DESC("`ip` DESC") - ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") - ,RealPayment_ASC("`real_payment` ASC"),RealPayment_DESC("`real_payment` DESC") - ,CardRemainAmount_ASC("`card_remain_amount` ASC"),CardRemainAmount_DESC("`card_remain_amount` DESC") - ,CardBeforeAmount_ASC("`card_before_amount` ASC"),CardBeforeAmount_DESC("`card_before_amount` DESC") - ,CardRemainRealAmount_ASC("`card_remain_real_amount` ASC"),CardRemainRealAmount_DESC("`card_remain_real_amount` DESC") - ,CardBeforeRealAmount_ASC("`card_before_real_amount` ASC"),CardBeforeRealAmount_DESC("`card_before_real_amount` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,Status_ASC("`pay_status` ASC"),Status_DESC("`pay_status` 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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java index 0ab16a8af..a181c06a7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardTransferInfo.java @@ -3,13 +3,11 @@ package com.iformall.domain.po; 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_card_transfer_info") -public class WxCardTransferInfo implements Serializable { - private static final long serialVersionUID = 1L; +public class WxCardTransferInfo extends BaseEntity { @Id protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java index e626b787d..512f350da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChannel.java @@ -5,13 +5,11 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.List; @Table(name = "wx_channel") @Data -public class WxChannel implements Serializable { - private static final long serialVersionUID = 1L; +public class WxChannel extends BaseEntity { @Id protected Long id; @@ -28,30 +26,4 @@ public class WxChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "是否支持批量投放0:不支持,1:支持", name = "batch") private Integer batch; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC") - , ChannelId_ASC("`channel_id` ASC"), ChannelId_DESC("`channel_id` DESC") - , Title_ASC("`title` ASC"), Title_DESC("`title` DESC") - , Img_ASC("`img` ASC"), Img_DESC("`img` DESC") - , Batch_ASC("`batch` ASC"), atch_DESC("`batch` 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java index 3b47c9c26..1365a8a6e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxChartDataEntity.java @@ -4,12 +4,11 @@ import lombok.Data; import javax.persistence.Id; import javax.persistence.Table; -import java.io.Serializable; import java.util.Date; @Table(name = "wx_chart_data") @Data -public class WxChartDataEntity implements Serializable { +public class WxChartDataEntity extends BaseEntity { private static final long serialVersionUID = 1L;