From 7e016628379e9660059379bbf0e01d74f969710f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 24 Jul 2019 18:35:11 +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/WxScoreRules.java | 10 ++-- .../iformall/domain/vo/MallUserActionVo.java | 27 ----------- .../com/iformall/domain/vo/WxCardCVo.java | 33 ------------- .../domain/vo/WxMerchantSubsidyVo.java | 37 --------------- .../com/iformall/domain/vo/WxWeappInfo.java | 47 ------------------- 5 files changed, 4 insertions(+), 150 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 53860a366..f99566642 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -4,12 +4,11 @@ import com.alibaba.fastjson.JSONObject; import com.iformall.enums.EnumScoreType; 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; /** * 1. 每天登录首次给成长值 @@ -23,8 +22,7 @@ import java.io.Serializable; @Table(name = "wx_score_rules") @Data -public class WxScoreRules implements Serializable { - private static final long serialVersionUID = 1L; +public class WxScoreRules extends BaseEntity { @Transient private static final String scoreDefaultRules = diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java index 6d71a7985..e488437d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -29,31 +29,4 @@ public class MallUserActionVo extends MallUserAction { @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") private Date enddate; - public static enum Field - { - Id_ASC("mua.`id` ASC"),Id_DESC("mua.`id` DESC") - ,TenantId_ASC("mua.`tenant_id` ASC"),TenantId_DESC("mua.`tenant_id` DESC") - ,UserId_ASC("mua.`user_id` ASC"),UserId_DESC("mua.`user_id` DESC") - ,Name_ASC("mui.`name` ASC"),Name_DESC("mui.`name` DESC") - ,Type_ASC("mua.`type` ASC"),Type_DESC("mua.`type` DESC") - ,Ip_ASC("mua.`ip` ASC"),Ip_DESC("mua.`ip` DESC") - ,ActionDesc_ASC("mua.`action_desc` ASC"),ActionDesc_DESC("mua.`action_desc` DESC") - ,ActionTime_ASC("mua.`action_time` ASC"),ActionTime_DESC("mua.`action_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/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index d47884a90..d8c92b95a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -59,38 +59,5 @@ public class WxCardCVo extends WxCouponOrder { @Transient protected String statusStr; - public static enum Field { - Id_ASC("co.`id` ASC"), Id_DESC("co.`id` DESC"), - TenantId_ASC("co.`tenant_id` ASC"), TenantId_DESC("co.`tenant_id` DESC"), - CouponId_ASC("co.`coupon_id` ASC"), CouponId_DESC("co.`coupon_id` DESC"), - CouponType_ASC("co.`coupon_type` ASC"), CouponType_DESC("co.`coupon_type` DESC"), - CUserId_ASC("co.`c_user_id` ASC"), CUserId_DESC("co.`c_user_id` DESC"), - OwnerId_ASC("co.`owner_id` ASC"), OwnerId_DESC("co.`owner_id` DESC"), - BUserId_ASC("co.`b_user_id` ASC"), BUserId_DESC("co.`b_user_id` DESC"), - OrderId_ASC("co.`order_id` ASC"), OrderId_DESC("co.`order_id` DESC"), - ExpiredTime_ASC("co.`expired_time` ASC"), ExpiredTime_DESC("co.`expired_time` DESC"), - CouponOrderStatus_ASC("co.`coupon_order_status` ASC"), CouponOrderStatus_DESC("co.`coupon_order_status` DESC"), - CreateDate_ASC("co.`create_date` ASC"), CreateDate_DESC("co.`create_date` DESC"), - UpdateDate_ASC("co.`update_date` ASC"), UpdateDate_DESC("co.`update_date` DESC"), - CouponPrice_ASC("co.`coupon_price` ASC"), CouponPrice_DESC("co.`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(); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java index 2b84574d2..31002b4c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -6,8 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import javax.persistence.Transient; - @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -39,39 +37,4 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy { @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") private String phone; - - public static enum Field - { - Id_ASC("t.`id` ASC"),Id_DESC("t.`id` DESC") - ,TenantId_ASC("t.`tenant_id` ASC"),TenantId_DESC("t.`tenant_id` DESC") - ,OrderId_ASC("t.`order_id` ASC"),OrderId_DESC("t.`order_id` DESC") - ,OrderType_ASC("t.`order_type` ASC"),OrderType_DESC("t.`order_type` DESC") - ,MerchantId_ASC("t.`merchant_id` ASC"),MerchantId_DESC("t.`merchant_id` DESC") - ,CouponOrderId_ASC("t.`coupon_order_id` ASC"),CouponOrderId_DESC("t.`coupon_order_id` DESC") - ,CouponType_ASC("t.`coupon_type` ASC"),CouponType_DESC("t.`coupon_type` DESC") - ,OrderPayment_ASC("t.`order_payment` ASC"),OrderPayment_DESC("t.`order_payment` DESC") - ,ReceiverPayment_ASC("t.`receiver_payment` ASC"),ReceiverPayment_DESC("t.`receiver_payment` DESC") - ,RealPayment_ASC("t.`real_payment` ASC"),RealPayment_DESC("t.`real_payment` DESC") - ,Subsidy_ASC("t.`subsidy` ASC"),Subsidy_DESC("t.`subsidy` DESC") - ,RealSubsidy_ASC("t.`real_subsidy` ASC"),RealSubsidy_DESC("t.`real_subsidy` DESC") - ,Status_ASC("t.`status` ASC"),Status_DESC("t.`status` DESC") - ,CreateDate_ASC("t.`create_date` ASC"),CreateDate_DESC("t.`create_date` DESC") - ,UpdateDate_ASC("t.`update_date` ASC"),UpdateDate_DESC("t.`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/vo/WxWeappInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java index 5189084f3..08963f49a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java @@ -5,9 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.util.ArrayList; -import java.util.List; - @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @@ -16,48 +13,4 @@ public class WxWeappInfo extends WxAuthorizerInfo { @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; - public static enum Field - { - Id_ASC("ai.`id` ASC"),Id_DESC("ai.`id` DESC") - ,TenantID_ASC("ai.`tenant_id` ASC"),TenantID_DESC("ai.`tenant_id` DESC") - ,Type_ASC("ai.`type` ASC"),Type_DESC("ai.`type` DESC") - ,AuthorizerAppid_ASC("ai.`authorizer_appid` ASC"),AuthorizerAppid_DESC("ai.`authorizer_appid` DESC") - ,HeadImg_ASC("ai.`head_img` ASC"),HeadImg_DESC("ai.`head_img` DESC") - ,Alias_ASC("ai.`alias` ASC"),Alias_DESC("ai.`alias` DESC") - ,QrcodeUrl_ASC("ai.`qrcode_url` ASC"),QrcodeUrl_DESC("ai.`qrcode_url` DESC") - ,CreateTime_ASC("ai.`create_time` ASC"),CreateTime_DESC("ai.`create_time` DESC") - ,UpdateTime_ASC("ai.`update_time` ASC"),UpdateTime_DESC("ai.`update_time` DESC") - ,AuthorizationStatus_ASC("ai.`authorization_status` ASC"),AuthorizationStatus_DESC("ai.`authorization_status` DESC") - ,AuthTime_ASC("ai.`auth_time` ASC"),AuthTime_DESC("ai.`auth_time` DESC") - ,BaseStatus_ASC("ai.`base_status` ASC"),BaseStatus_DESC("ai.`base_status` DESC") - ,BaseTime_ASC("ai.`base_time` ASC"),BaseTime_DESC("ai.`base_time` DESC") - ,DomainStatus_ASC("ai.`domain_status` ASC"),DomainStatus_DESC("ai.`domain_status` DESC") - ,DomainTime_ASC("ai.`domain_time` ASC"),DomainTime_DESC("ai.`domain_time` DESC") - ,WebDomainStatus_ASC("ai.`webdomain_status` ASC"),WebDomainStatus_DESC("ai.`webdomain_status` DESC") - ,WebDomainTime_ASC("ai.`webdomain_time` ASC"),WebDomainTime_DESC("ai.`webdomain_time` DESC") - ,TemplateStatus_ASC("ai.`template_status` ASC"),TemplateStatus_DESC("ai.`template_status` DESC") - ,TemplateTime_ASC("ai.`template_time` ASC"),TemplateTime_DESC("ai.`template_time` DESC") - ,CurrentVersion_ASC("ai.`current_version` ASC"),CurrentVersion_DESC("ai.`current_version` DESC") - ,CurrentDesc_ASC("ai.`current_desc` ASC"),CurrentDesc_DESC("ai.`current_desc` DESC") - ,ReleaseTime_ASC("ai.`release_time` ASC"),ReleaseTime_DESC("ai.`release_time` DESC") - ,OpenAppid_ASC("ai.`open_appid` ASC"),OpenAppid_DESC("ai.`open_appid` DESC") - ,BindOpenTime_ASC("ai.`bind_open_time` ASC"),BindOpenTime_DESC("ai.`bind_open_time` DESC") - ,Name_ASC("a.`name` ASC"),Name_DESC("a.`name` 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(); - } - } - }