diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java index e2908fca4..7927f7c3c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCLog.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_c_log") @Data -public class WxCLog implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCLog extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -26,28 +27,5 @@ public class WxCLog implements Serializable { 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/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 28bd755e3..69f85a095 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -9,7 +9,6 @@ import lombok.ToString; 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; @@ -147,59 +146,6 @@ public class WxCUser extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") private Long operatorId; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,OpenId_ASC("`open_id` ASC"),OpenId_DESC("`open_id` DESC") - ,UnionId_ASC("`union_id` ASC"),UnionId_DESC("`union_id` DESC") - ,NickName_ASC("`nick_name` ASC"),NickName_DESC("`nick_name` DESC") - ,Gender_ASC("`gender` ASC"),Gender_DESC("`gender` DESC") - ,AvatarUrl_ASC("`avatar_url` ASC"),AvatarUrl_DESC("`avatar_url` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,PurePhone_ASC("`pure_phone` ASC"),PurePhone_DESC("`pure_phone` DESC") - ,City_ASC("`city` ASC"),City_DESC("`city` DESC") - ,Province_ASC("`province` ASC"),Province_DESC("`province` DESC") - ,Language_ASC("`language` ASC"),Language_DESC("`language` DESC") - ,CountryCode_ASC("`country_code` ASC"),CountryCode_DESC("`country_code` DESC") - ,RegisterIp_ASC("`register_ip` ASC"),RegisterIp_DESC("`register_ip` DESC") - ,VerifyCodePhone_ASC("`verify_code_phone` ASC"),VerifyCodePhone_DESC("`verify_code_phone` DESC") - ,QrcodeSource_ASC("`qrcode_source` ASC"),QrcodeSource_DESC("`qrcode_source` DESC") - ,Scene_ASC("`scene` ASC"),Scene_DESC("`scene` DESC") - ,SceneAddress_ASC("`scene_address` ASC"),SceneAddress_DESC("`scene_address` DESC") - ,SessionKey_ASC("`session_key` ASC"),SessionKey_DESC("`session_key` DESC") - ,Score_ASC("`score` ASC"),Score_DESC("`score` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") - ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") - ,ExpireTime_ASC("`expire_time` ASC"),ExpireTime_DESC("`expire_time` DESC") - ,Longitude_ASC("`longitude` ASC"),Longitude_DESC("`longitude` DESC") - ,Latitude_ASC("`latitude` ASC"),Latitude_DESC("`latitude` DESC") - ,LoginCount_ASC("`login_count` ASC"),LoginCount_DESC("`login_count` DESC") - ,ExtraInfo_ASC("`extra_info` ASC"),ExtraInfo_DESC("`extra_info` DESC") - ,IsSubscribe_ASC("`is_subscribe` ASC"),IsSubscribe_DESC("`is_subscribe` DESC") - ,Credit_ASC("`credit` ASC"),Credit_DESC("`credit` DESC") - ,ActiveTime_ASC("`active_time` ASC"),ActiveTime_DESC("`active_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(); - } - } - - public String createToken(Date currentDate) { if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 994c24a4c..f791ab351 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -131,41 +131,6 @@ public class WxCUserBasicInfo extends BaseEntity { return addressStr; } - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,Birthdate_ASC("`birthdate` ASC"),Birthdate_DESC("`birthdate` DESC") - ,Education_ASC("`education` ASC"),Education_DESC("`education` DESC") - ,Sex_ASC("`sex` ASC"),Sex_DESC("`sex` DESC") - ,Email_ASC("`email` ASC"),Email_DESC("`email` DESC") - ,Address_ASC("`address` ASC"),Address_DESC("`address` DESC") - ,Poins_ASC("`poins` ASC"),Poins_DESC("`poins` DESC") - ,TagId_ASC("`tag_id` ASC"),TagId_DESC("`tag_id` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Credit_ASC("`credit` ASC"),Credit_DESC("`credit` DESC") - ,ActiveTime_ASC("`active_time` ASC"),ActiveTime_DESC("`active_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(); - } - } @Override diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java index eff7febfe..707d37a03 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserCar.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_c_user_car") @Data -public class WxCUserCar implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCUserCar extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -34,32 +35,5 @@ public class WxCUserCar implements Serializable { private Integer vendorType; @io.swagger.annotations.ApiModelProperty(value="停车厂家参数",name="vendorParams") private String vendorParams; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") - ,CarNumber_ASC("`car_number` ASC"),CarNumber_DESC("`car_number` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,VendorType_ASC("`vendor_type` ASC"),VendorType_DESC("`vendor_type` DESC") - ,VendorParams_ASC("`vendor_params` ASC"),VendorParams_DESC("`vendor_params` 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/WxCUserFromB.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java index cf6f9f22f..6dd0e014e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserFromB.java @@ -1,18 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; 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; @Table(name = "wx_c_user_from_b") @Data -public class WxCUserFromB implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCUserFromB extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -40,34 +40,4 @@ public class WxCUserFromB implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="appId") private String appId; - - 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") - ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") - ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") - ,Info_ASC("`info` ASC"),Info_DESC("`info` DESC") - ,CreateTime_ASC("`createTime` ASC"),CreateTime_DESC("`createTime` DESC") - ,UpdateTime_ASC("`updateTime` ASC"),UpdateTime_DESC("`updateTime` DESC") - ,Openid_ASC("`openid` ASC"),Openid_DESC("`openid` 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/WxCUserTags.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java index 887931696..387d29b0f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_c_user_tags") @Data -public class WxCUserTags implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCUserTags extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -30,30 +31,5 @@ public class WxCUserTags implements Serializable { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,Tags_ASC("`tags` ASC"),Tags_DESC("`tags` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` 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/WxComponentVerifyTicket.java b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java index c712e7584..899551766 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxComponentVerifyTicket.java @@ -1,16 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_component_verify_ticket") @Data -public class WxComponentVerifyTicket implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxComponentVerifyTicket extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -32,31 +34,4 @@ public class WxComponentVerifyTicket implements Serializable { @io.swagger.annotations.ApiModelProperty(value="access_token过期时间",name="accessTokenExpire") private Date accessTokenExpire; - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ComponentAppid_ASC("`component_appid` ASC"),ComponentAppid_DESC("`component_appid` DESC") - ,ComponentVerifyTicket_ASC("`component_verify_ticket` ASC"),ComponentVerifyTicket_DESC("`component_verify_ticket` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,Deadline_ASC("`deadline` ASC"),Deadline_DESC("`deadline` 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/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 030e604d6..3926873ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -265,53 +265,4 @@ public class WxCoupon extends BaseEntity { return false; } - 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") - ,Type_ASC("`type` ASC"),Type_DESC("`type` 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") - ,SalePrice_ASC("`sale_price` ASC"),SalePrice_DESC("`sale_price` DESC") - ,UsePrice_ASC("`use_price` ASC"),UsePrice_DESC("`use_price` DESC") - ,UseLimitQuantity_ASC("`use_limit_quantity` ASC"),UseLimitQuantity_DESC("`use_limit_quantity` DESC") - ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") - ,SendStartDate_ASC("`send_start_date` ASC"),SendStartDate_DESC("`send_start_date` DESC") - ,SendEndDate_ASC("`send_end_date` ASC"),SendEndDate_DESC("`send_end_ate` DESC") - ,ValidType_ASC("`valid_type` ASC"),ValidType_DESC("`valid_type` 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") - ,ValidDays_ASC("`valid_days` ASC"),ValidDays_DESC("`valid_days` DESC") - ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") - ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") - ,RemainInventory_ASC("`remain_inventory` ASC"),RemainInventory_DESC("`remain_inventory` DESC") - ,Inventory_ASC("`inventory` ASC"),Inventory_DESC("`inventory` DESC") - ,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,Business_ASC("`business` ASC"),Business_DESC("`business` DESC") - ,SupportTransfer_ASC("`support_transfer` ASC"),SupportTransfer_DESC("`support_transfer` DESC") - ,SubsidyType_ASC("`subsidy_type` ASC"),SubsidyType_DESC("`subsidy_type` DESC") - ,SubsidyNum_ASC("`subsidy_num` ASC"),SubsidyNum_DESC("`subsidy_num` 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/WxCouponActionLog.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java index 936a474f1..a5a95eb00 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponActionLog.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_coupon_action_log") @Data -public class WxCouponActionLog implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCouponActionLog extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -39,31 +40,4 @@ public class WxCouponActionLog implements Serializable { @io.swagger.annotations.ApiModelProperty(value="月日",name="createTimeMd") private String createTimeMd; - 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") - ,CouponOrderId_ASC("`coupon_order_id` ASC"),CouponOrderId_DESC("`coupon_order_id` DESC") - ,ChannelType_ASC("`channel_type` ASC"),ChannelType_DESC("`channel_type` DESC") - ,ChannelId_ASC("`channel_id` ASC"),ChannelId_DESC("`channel_id` DESC") - ,CreateTime_ASC("`create_time` ASC"),CreateTime_DESC("`create_time` DESC") - ,CreateTimeMd_ASC("`create_time_md` ASC"),CreateTimeMd_DESC("`create_time_md` 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/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index 39847b8b6..0f2a613da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_coupon_car") @Data -public class WxCouponCar implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCouponCar extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -32,31 +33,5 @@ public class WxCouponCar implements Serializable { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,ParkId_ASC("`park_id` ASC"),ParkId_DESC("`park_id` DESC") - ,VendorType_ASC("`vendor_type` ASC"),VendorType_DESC("`vendor_type` DESC") - ,VendorParams_ASC("`vendor_params` ASC"),VendorParams_DESC("`vendor_params` 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/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index a2d067f53..ecb7e890f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -108,37 +108,4 @@ public class WxCouponChannel extends BaseEntity { } } - 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") - ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") - ,CouponStatus_ASC("`coupon_status` ASC"),CouponStatus_DESC("`coupon_status` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,TargetAd_ASC("`target_ad` ASC"),TargetAd_DESC("`target_ad` DESC") - ,Business_ASC("`business` ASC"),Business_DESC("`business` DESC") - ,BeginTime_ASC("`begin_time` ASC"),BeginTime_DESC("`begin_time` DESC") - ,EndTime_ASC("`end_time` ASC"),EndTime_DESC("`end_time` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` 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/WxCouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java index ed6a248b1..6751f7fab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -72,38 +72,4 @@ public class WxCouponInject extends BaseEntity { @Transient protected String phones; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,MUserId_ASC("`m_user_id` ASC"),MUserId_DESC("`m_user_id` DESC") - ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") - ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") - ,CouponName_ASC("`coupon_name` ASC"),CouponName_DESC("`coupon_name` DESC") - ,SendTime_ASC("`send_time` ASC"),SendTime_DESC("`send_time` DESC") - ,SendAmount_ASC("`send_amount` ASC"),SendAmount_DESC("`send_amount` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,ErrorMsg_ASC("`error_msg` ASC"),ErrorMsg_DESC("`error_msg` DESC") - ,Tags_ASC("`tags` ASC"),Tags_DESC("`tags` DESC") - ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` 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/WxCouponMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java index 9a76a0cf9..e4320c533 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMerchant.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; 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_coupon_merchant") @Data -public class WxCouponMerchant implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCouponMerchant extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -37,28 +38,4 @@ public class WxCouponMerchant implements Serializable { @io.swagger.annotations.ApiModelProperty(value="状态,0 有效 1 无效",name="status") private Integer status; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ProductId_ASC("`product_id` ASC"),ProductId_DESC("`product_id` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` 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/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index 17094e1d7..75807c1c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -92,40 +92,6 @@ public class WxCouponOrder extends BaseEntity{ return salePriceStr; } - 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"), - CouponType_ASC("`coupon_type` ASC"), CouponType_DESC("`coupon_type` DESC"), - CUserId_ASC("`c_user_id` ASC"), CUserId_DESC("`c_user_id` DESC"), - OwnerId_ASC("`owner_id` ASC"), OwnerId_DESC("`owner_id` DESC"), - BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), - OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"), - ExpiredTime_ASC("`expired_time` ASC"), ExpiredTime_DESC("`expired_time` DESC"), - CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"), - CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), - UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), - CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` 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 Long getcUserId() { return cUserId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index 430c032aa..04730bb92 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -47,32 +47,4 @@ public class WxCouponSend extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1是0否", name = "是否发送短信1是0否") private Integer sendSms; - 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") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") - ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - , SendSms_ASC("`send_sms` ASC"), SendSms_DESC("`send_sms` 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/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index 7c5ff1f9f..e5caf10a3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_coupon_send_config") @Data -public class WxCouponSendConfig implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCouponSendConfig extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -32,31 +33,5 @@ public class WxCouponSendConfig implements Serializable { private Date createTime; @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updateTime") private Date updateTime; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,SendType_ASC("`send_type` ASC"),SendType_DESC("`send_type` DESC") - ,Value_ASC("`value` ASC"),Value_DESC("`value` DESC") - ,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` 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/WxCouponType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java index e0cabeb90..e7abddb7a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponType.java @@ -1,16 +1,17 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_coupon_type") @Data -public class WxCouponType implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxCouponType extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -21,27 +22,6 @@ public class WxCouponType implements Serializable { @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") private String title; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` 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/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index 986b00c22..60afd204b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -5,14 +5,12 @@ 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; @Table(name = "wx_credit_history") @Data -public class WxCreditHistory implements Serializable { +public class WxCreditHistory extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -73,38 +71,5 @@ public class WxCreditHistory implements Serializable { @Transient @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") private String merchantName; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") - ,CreditAmount_ASC("`credit_amount` ASC"),CreditAmount_DESC("`credit_amount` DESC") - ,CreditNum_ASC("`credit_num` ASC"),CreditNum_DESC("`credit_num` DESC") - ,CreditType_ASC("`credit_type` ASC"),CreditType_DESC("`credit_type` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,ReceiptUrl_ASC("`receipt_url` ASC"),ReceiptUrl_DESC("`receipt_url` DESC") - ,OperatorType_ASC("`operator_type` ASC"),OperatorType_DESC("`operator_type` DESC") - ,OperatorId_ASC("`operator_id` ASC"),OperatorId_DESC("`operator_id` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") - ,BusinessId_ASC("`business_id` ASC"),BusinessId_DESC("`business_id` DESC") - ,Spend_ASC("`spend` ASC"),Spend_DESC("`spend` 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(); - } - } }