From 711c9da301b586ae92dda65c96ee5dc32c1e7085 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 15:48:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=A1=A5=E8=B4=B4=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=90=84=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=94=AF=E6=8C=81=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=85=A8=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxMerchantSubsidyController.java | 6 +++--- .../iformall/domain/po/WxMerchantSubsidy.java | 10 +++++----- .../domain/vo/WxMerchantSubsidyVo.java | 14 ++++--------- .../service/WxMerchantSubsidyService.java | 2 +- .../impl/WxMerchantSubsidyServiceImpl.java | 4 ++-- .../mapper/WxMerchantSubsidyMapper.xml | 20 ++++++++++++++++--- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 8d68e14e8..e946da6f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -40,7 +40,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("补贴记录汇总") @GetMapping("sum") @SystemControllerLog(description = "商户-补贴记录-汇总") - public ResultData count(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy) { + public ResultData count(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) { @@ -92,7 +92,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("更新补贴记录") @PostMapping("updateSubsidied") @SystemControllerLog(description = "商户-更新补贴记录") - public ResultData updateSubsidied(@RequestBody WxMerchantSubsidy wxMerchantSubsidy) { + public ResultData updateSubsidied(@RequestBody WxMerchantSubsidyVo wxMerchantSubsidy) { String ipStr = getIpAddr(); logger.info("subsidy/update: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) { @@ -117,7 +117,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiOperation("补贴记录导出") @GetMapping("/exportData") @SystemControllerLog(description = "商户-补贴记录-导出") - public void exportData(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { + public void exportData(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { logger.info("[" + getIpAddr() + "] subsidy/exportData"); if (wxMerchantSubsidy == null) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件不能为空"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 9c4836da3..95a622f0f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -59,17 +59,17 @@ public class WxMerchantSubsidy extends BaseEntity { private Integer receiverPayment; @Transient - @Excel(name="本次消费(元)",width = 20,orderNum = "4") + @Excel(name="本次消费(元)",width = 20,orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPaymentStr") private String orderPaymentStr; @Transient - @Excel(name="商户应收(元)",width = 20,orderNum = "5") + @Excel(name="商户应收(元)",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPaymentStr") private String receiverPaymentStr; @Transient - @Excel(name="补贴(元)",width = 20,orderNum = "6") + @Excel(name="补贴(元)",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidyStr") private String subsidyStr; @@ -81,11 +81,11 @@ public class WxMerchantSubsidy extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") private Integer realSubsidy; - @Excel(name="补贴状态",width = 20,orderNum = "7",replace = { "未补贴_0", "已自动补贴_1","已手工补贴_2"}) + @Excel(name="补贴状态",width = 20,orderNum = "8",replace = { "未补贴_0", "已自动补贴_1","已手工补贴_2"}) @io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴, 2:已手工补贴)",name="status") private Integer status; - @Excel(name="交易时间",width = 20,orderNum = "3",format="yyyy-MM-dd HH:mm") + @Excel(name="交易时间",width = 20,orderNum = "4",format="yyyy-MM-dd HH:mm") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; 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 daadf9e7c..2b84574d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -12,36 +12,30 @@ import javax.persistence.Transient; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxMerchantSubsidyVo extends WxMerchantSubsidy { - /**卡信息*/ - /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ + + @Excel(name="活动名称",width = 20,orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /**单位**/ + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; - /**须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") private String detail; - /**购买须知**/ @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; - /**使用商户名**/ @Excel(name="消费商户",width = 20,orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /**持有人昵称**/ @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="nickName") private String nickName; - /**持有人手机**/ @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") private String phone; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index 513c8dc78..a5f035ad3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -17,7 +17,7 @@ public interface WxMerchantSubsidyService { * @param record * @return */ - List> sumForSubsidy(WxMerchantSubsidy record); + List> sumForSubsidy(WxMerchantSubsidyVo record); /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index cf795d4ae..1ba74daef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -31,7 +31,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { ExcelService excelService; @Override - public List> sumForSubsidy(WxMerchantSubsidy record) { + public List> sumForSubsidy(WxMerchantSubsidyVo record) { return wxMerchantSubsidyMapper.sumVoList(record); } @@ -74,7 +74,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { wxMerchantSubsidyMapper.deleteByPrimaryKey(id); } - @Override + @Override public void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy); excelService.exportExcel(list, null, "补贴记录", WxMerchantSubsidyVo.class, "补贴记录.xlsx", response, false); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index c2ea2be73..0ebfeb34e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -95,8 +95,19 @@ update wx_merchant_subsidy set `status` = #{status} - where `tenant_id`=#{tenantId} and merchant_id=#{merchantId} - and id in (${idStr}) + where 1=1 + + and `tenant_id`=#{tenantId} + + + and `merchant_id`=#{merchantId} + + + and id in + + #{idItem} + + @@ -228,7 +239,7 @@ - select ms.`merchant_id` merchantId, m.`name` as merchantName, IFNULL(sum(ms.`order_payment`),0) as sumOrderPayment, IFNULL(sum(ms.`receiver_payment`),0) as sumReceiverPayment, @@ -245,6 +256,9 @@ and ms.`merchant_id` = #{merchantId} + + and c.`title` like concat('%', #{title},'%') + and ms.`status` in From faa9a889e5585e6ac758b985e0b7466c1d497bf5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 16:04:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[po][=E4=BF=AE=E6=94=B9]:po=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxMall.java | 44 ++----------------- .../com/iformall/domain/po/WxMallApply.java | 31 ++----------- .../iformall/domain/po/WxMallBuilding.java | 31 ++----------- .../com/iformall/domain/po/WxMallFloor.java | 32 ++------------ .../com/iformall/domain/po/WxMerchant.java | 28 ------------ .../iformall/domain/po/WxMerchantBUser.java | 38 +--------------- .../iformall/domain/po/WxMerchantCorp.java | 39 ++-------------- .../iformall/domain/po/WxMerchantShop.java | 32 ++------------ .../iformall/domain/po/WxMerchantSubsidy.java | 34 -------------- .../com/iformall/domain/po/WxMerchantTax.java | 41 ++--------------- .../domain/po/WxMerchantTradeDaily.java | 32 ++------------ .../com/iformall/domain/po/WxMsgCallback.java | 32 +------------- .../com/iformall/domain/po/WxMsgConfig.java | 37 ++-------------- .../com/iformall/domain/po/WxMsgLimit.java | 24 ---------- .../com/iformall/domain/po/WxMsgModel.java | 29 ------------ .../iformall/domain/po/WxMsgSignature.java | 25 ----------- .../domain/po/WxMsgValidationcode.java | 34 ++------------ .../domain/po/WxMsgValidationcodeModel.java | 34 ++------------ .../java/com/iformall/domain/po/WxOrder.java | 38 ---------------- .../com/iformall/domain/po/WxOrderGroup.java | 28 ++---------- .../com/iformall/domain/po/WxOrderPress.java | 35 ++------------- 21 files changed, 42 insertions(+), 656 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 07042c019..20788363b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -1,19 +1,19 @@ package com.iformall.domain.po; -import com.iformall.utils.DateUtils; import lombok.Data; +import lombok.EqualsAndHashCode; 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_mall") @Data -public class WxMall implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMall extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -93,43 +93,5 @@ public class WxMall implements Serializable { return true; } - - 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") - ,Group_ASC("`group` ASC"),Group_DESC("`group` DESC") - ,Country_ASC("`country` ASC"),Country_DESC("`country` DESC") - ,Province_ASC("`province` ASC"),Province_DESC("`province` DESC") - ,City_ASC("`city` ASC"),City_DESC("`city` DESC") - ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") - ,TotalArea_ASC("`total_area` ASC"),TotalArea_DESC("`total_area` DESC") - ,OperatingArea_ASC("`operating_area` ASC"),OperatingArea_DESC("`operating_area` DESC") - ,ParkArea_ASC("`parkArea` ASC"),ParkArea_DESC("`parkArea` DESC") - ,ParkPlaceNumber_ASC("`park_place_number` ASC"),ParkPlaceNumber_DESC("`park_place_number` DESC") - ,ServicePhone_ASC("`service_phone` ASC"),ServicePhone_DESC("`service_phone` DESC") - ,ImgUrl_ASC("`img_url` ASC"),ImgUrl_DESC("`img_url` DESC") - ,ImgUrlH_ASC("`img_url_h` ASC"),ImgUrlH_DESC("`img_url_h` DESC") - ,WeapNote_ASC("`weap_note` ASC"),WeapNote_DESC("`weap_note` DESC") - ,SaleType_ASC("`sale_type` ASC"),SaleType_DESC("`sale_type` DESC") - ,ValidStart_ASC("`valid_start` ASC"),ValidStart_DESC("`valid_start` DESC") - ,ValidEnd_ASC("`valid_end` ASC"),ValidEnd_DESC("`valid_end` 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/WxMallApply.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java index 4fd737a74..8fc106b0a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallApply.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_mall_apply") @Data -public class WxMallApply implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMallApply extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -33,29 +33,4 @@ public class WxMallApply implements Serializable { @io.swagger.annotations.ApiModelProperty(value="申请时间",name="applyDate") private Date applyDate; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,MallName_ASC("`mall_name` ASC"),MallName_DESC("`mall_name` DESC") - ,Applicant_ASC("`applicant` ASC"),Applicant_DESC("`applicant` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,ApplyDate_ASC("`apply_date` ASC"),ApplyDate_DESC("`apply_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/WxMallBuilding.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java index 1164b94a2..0f9a3a54d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.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_mall_building") @Data -public class WxMallBuilding implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMallBuilding extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -34,31 +35,5 @@ public class WxMallBuilding 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") - ,MallId_ASC("`mall_id` ASC"),MallId_DESC("`mall_id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,FloorNumber_ASC("`floor_number` ASC"),FloorNumber_DESC("`floor_number` 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/WxMallFloor.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java index 867c527cd..ae9c496d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallFloor.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_mall_floor") @Data -public class WxMallFloor implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMallFloor extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -34,32 +35,5 @@ public class WxMallFloor 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") - ,MallId_ASC("`mall_id` ASC"),MallId_DESC("`mall_id` DESC") - ,BuildingId_ASC("`building_id` ASC"),BuildingId_DESC("`building_id` DESC") - ,FloorName_ASC("`floor_name` ASC"),FloorName_DESC("`floor_name` DESC") - ,BackgroundImg_ASC("`background_img` ASC"),BackgroundImg_DESC("`background_img` 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/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 5754d85cb..32f39ab9c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -198,32 +198,4 @@ public class WxMerchant extends BaseEntity { return ""; return "t:md:" + id; } - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,ImgUrl_ASC("`img_url` ASC"),ImgUrl_DESC("`img_url` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,LinkPhone_ASC("`link_phone` ASC"),LinkPhone_DESC("`link_phone` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,CarVendorType_ASC("`car_vendor_type` ASC"),CarVendorType_DESC("`car_vendor_type` DESC") - ,CarParams_ASC("`car_params` ASC"),CarParams_DESC("`car_params` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), TopTime_ASC("`top_time` ASC"), TopTime_DESC("`top_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/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 9fc4b75c4..3a5a0b7b0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.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.util.Date; import java.util.List; import java.util.UUID; @Table(name = "wx_merchant_b_user") @Data -public class WxMerchantBUser implements Serializable { +public class WxMerchantBUser extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -45,41 +44,6 @@ public class WxMerchantBUser implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status") private Integer status; - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), - TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), - Phone_ASC("`phone` ASC"), Phone_DESC("`phone` DESC"), - UserPwd_ASC("`user_pwd` ASC"), UserPwd_DESC("`user_pwd` 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"), - 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"), - Name_ASC("`name` ASC"), Name_DESC("`name` DESC"), - Status_ASC("`status` ASC"), Status_DESC("`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(); - } - } - - public String createToken(Date currentDate) { if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) { //提前一小时, 新生成一个token diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java index 2967ae543..6bc693480 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantCorp.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_merchant_corp") @Data -public class WxMerchantCorp implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMerchantCorp extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -48,38 +48,5 @@ public class WxMerchantCorp 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") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,CorpPapersType_ASC("`corp_papers_type` ASC"),CorpPapersType_DESC("`corp_papers_type` DESC") - ,CorpPapersNumber_ASC("`corp_papers_number` ASC"),CorpPapersNumber_DESC("`corp_papers_number` DESC") - ,CorpPapersPerson_ASC("`corp_papers_person` ASC"),CorpPapersPerson_DESC("`corp_papers_person` DESC") - ,CorpPapersPicFace_ASC("`corp_papers_pic_face` ASC"),CorpPapersPicFace_DESC("`corp_papers_pic_face` DESC") - ,CorpPapersPicBack_ASC("`corp_papers_pic_back` ASC"),CorpPapersPicBack_DESC("`corp_papers_pic_back` DESC") - ,CorpPapersAddress_ASC("`corp_papers_address` ASC"),CorpPapersAddress_DESC("`corp_papers_address` DESC") - ,CorpPapersRegisterNumber_ASC("`corp_papers_register_number` ASC"),CorpPapersRegisterNumber_DESC("`corp_papers_register_number` DESC") - ,CorpPapersFile_ASC("`corp_papers_file` ASC"),CorpPapersFile_DESC("`corp_papers_file` 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/WxMerchantShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java index 12a05f292..4d369e5c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantShop.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_merchant_shop") @Data -public class WxMerchantShop implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMerchantShop extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -33,32 +34,5 @@ public class WxMerchantShop implements Serializable { @io.swagger.annotations.ApiModelProperty(value="删除状态",name="isDel") private Integer isDel; - - 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") - ,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){ - 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/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 95a622f0f..d2e35be27 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -129,38 +129,4 @@ public class WxMerchantSubsidy extends BaseEntity { return subsidyStr; } - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") - ,OrderType_ASC("`order_type` ASC"),OrderType_DESC("`order_type` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,CouponOrderId_ASC("`coupon_order_id` ASC"),CouponOrderId_DESC("`coupon_order_id` DESC") - ,CouponType_ASC("`coupon_type` ASC"),CouponType_DESC("`coupon_type` DESC") - ,OrderPayment_ASC("`order_payment` ASC"),OrderPayment_DESC("`order_payment` DESC") - ,ReceiverPayment_ASC("`receiver_payment` ASC"),ReceiverPayment_DESC("`receiver_payment` DESC") - ,RealPayment_ASC("`real_payment` ASC"),RealPayment_DESC("`real_payment` DESC") - ,Subsidy_ASC("`subsidy` ASC"),Subsidy_DESC("`subsidy` DESC") - ,RealSubsidy_ASC("`real_subsidy` ASC"),RealSubsidy_DESC("`real_subsidy` 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/WxMerchantTax.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java index ebb6e5e4a..85626ffb4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTax.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_merchant_tax") @Data -public class WxMerchantTax implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMerchantTax extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -51,40 +51,5 @@ public class WxMerchantTax 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") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,TaxpayerType_ASC("`taxpayerType` ASC"),TaxpayerType_DESC("`taxpayerType` DESC") - ,TaxPapersType_ASC("`taxPapersType` ASC"),TaxPapersType_DESC("`taxPapersType` DESC") - ,TaxPapersNumber_ASC("`taxPapersNumber` ASC"),TaxPapersNumber_DESC("`taxPapersNumber` DESC") - ,InvoiceType_ASC("`invoiceType` ASC"),InvoiceType_DESC("`invoiceType` DESC") - ,InvoiceBuyer_ASC("`invoiceBuyer` ASC"),InvoiceBuyer_DESC("`invoiceBuyer` DESC") - ,TaxpayerIdentifyNumber_ASC("`taxpayerIdentifyNumber` ASC"),TaxpayerIdentifyNumber_DESC("`taxpayerIdentifyNumber` DESC") - ,InvoiceAddressPhone_ASC("`invoiceAddressPhone` ASC"),InvoiceAddressPhone_DESC("`invoiceAddressPhone` DESC") - ,BankAccountNumber_ASC("`bankAccountNumber` ASC"),BankAccountNumber_DESC("`bankAccountNumber` DESC") - ,BankAccountPerson_ASC("`bankAccountPerson` ASC"),BankAccountPerson_DESC("`bankAccountPerson` DESC") - ,BankName_ASC("`bankName` ASC"),BankName_DESC("`bankName` DESC") - ,BankAccount_ASC("`bankAccount` ASC"),BankAccount_DESC("`bankAccount` 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/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java index 769a07cc3..03f0eeb4b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java @@ -1,18 +1,19 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.StringUtils; 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") @Data -public class WxMerchantTradeDaily implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMerchantTradeDaily extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -79,31 +80,4 @@ public class WxMerchantTradeDaily implements Serializable { @Transient private Integer isToday; - 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(); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java index 93028e10b..2b1e8a6b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -14,7 +14,7 @@ import java.util.List; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxMsgCallback extends BaseEntity{ +public class WxMsgCallback extends BaseEntity { @Id protected Long id; @@ -49,34 +49,4 @@ public class WxMsgCallback extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="msgId",name="msgId") private Long msgId; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,BatchNo_ASC("`batch_no` ASC"),BatchNo_DESC("`batch_no` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,Begintime_ASC("`begintime` ASC"),Begintime_DESC("`begintime` DESC") - ,Endtime_ASC("`endtime` ASC"),Endtime_DESC("`endtime` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,StatusMsg_ASC("`status_msg` ASC"),StatusMsg_DESC("`status_msg` DESC") - ,Sign_ASC("`sign` ASC"),Sign_DESC("`sign` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` 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/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 468cdc2e0..331000c3b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -1,16 +1,17 @@ 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.List; @Table(name = "wx_msg_config") @Data -public class WxMsgConfig implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMsgConfig extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -52,37 +53,5 @@ public class WxMsgConfig implements Serializable { @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") private String appid; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") - ,Publickey_ASC("`publickey` ASC"),Publickey_DESC("`publickey` DESC") - ,Bid_ASC("`bid` ASC"),Bid_DESC("`bid` DESC") - ,Recharge_ASC("`recharge` ASC"),Recharge_DESC("`recharge` DESC") - ,Remains_ASC("`remains` ASC"),Remains_DESC("`remains` DESC") - ,Total_ASC("`total` ASC"),Total_DESC("`total` DESC") - ,Account_ASC("`account` ASC"),Account_DESC("`account` DESC") - ,Reminderstatus_ASC("`reminderstatus` ASC"),Reminderstatus_DESC("`reminderstatus` DESC") - ,Reminder_ASC("`reminder` ASC"),Reminder_DESC("`reminder` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,Notifyurl_ASC("`notifyurl` ASC"),Notifyurl_DESC("`notifyurl` 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/WxMsgLimit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java index a98634de8..9bb9577d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgLimit.java @@ -37,28 +37,4 @@ public class WxMsgLimit extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="过期时间(一般为当前时间)",name="expireDate") private Date expireDate; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,Type_ASC("`type` ASC"),Name_DESC("`type` DESC") - ,LimitId_ASC("`limit_id` ASC"),LimitId_DESC("`limit_id` DESC") - ,LimitDate_ASC("`limit_date` ASC"),LimitDate_DESC("`limit_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/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index a40c8a020..ab15f9b80 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -7,7 +7,6 @@ import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -37,33 +36,5 @@ public class WxMsgModel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId") private Integer modelId; - - 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") - ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") - ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_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/WxMsgSignature.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java index c99982b3f..4bbc2c0e9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -9,7 +9,6 @@ import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_msg_signature") @Data @@ -29,28 +28,4 @@ public class WxMsgSignature extends BaseEntity { private String name; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - - - 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") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` 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/WxMsgValidationcode.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java index ecc8d1782..9a8a76a79 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcode.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_msg_validationcode") @Data -public class WxMsgValidationcode implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMsgValidationcode extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -45,33 +45,5 @@ public class WxMsgValidationcode implements Serializable { @Transient private String createtimeStr; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") - ,Expiretime_ASC("`expiretime` ASC"),Expiretime_DESC("`expiretime` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Msg_ASC("`msg` ASC"),Msg_DESC("`msg` DESC") - ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") - ,Code_ASC("`code` ASC"),Code_DESC("`code` 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/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index e4a8fb9fa..9663482da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.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_msg_validationcode_model") @Data -public class WxMsgValidationcodeModel implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxMsgValidationcodeModel extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -51,33 +51,5 @@ public class WxMsgValidationcodeModel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="消息类型 0全部 1短信 2邮箱",name="open") @Transient private Integer msgType; - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") - ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") - ,Content_ASC("`content` ASC"),Content_DESC("`content` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") - ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_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/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 61921bfab..12d8ef6af 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -3,12 +3,10 @@ package com.iformall.domain.po; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.checkerframework.framework.qual.EnsuresQualifier; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -78,40 +76,4 @@ public class WxOrder extends BaseEntity { @Transient protected String statusStr; - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,OrderNumber_ASC("`order_number` ASC"),OrderNumber_DESC("`order_number` DESC") - ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") - ,CUserId_ASC("`c_user_id` ASC"),CUserId_DESC("`c_user_id` DESC") - ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") - ,BUserId_ASC("`b_user_id` ASC"),BUserId_DESC("`b_user_id` DESC") - ,CouponChannelId_ASC("`coupon_channel_id` ASC"),CouponChannelId_DESC("`coupon_channel_id` DESC") - ,ProductId_ASC("`product_id` ASC"),ProductId_DESC("`product_id` DESC") - ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") - ,PaymentType_ASC("`payment_type` ASC"),PaymentType_DESC("`payment_type` DESC") - ,Payment_ASC("`payment` ASC"),Payment_DESC("`payment` DESC") - ,PaymentTime_ASC("`payment_time` ASC"),PaymentTime_DESC("`payment_time` DESC") - ,OrderStatus_ASC("`order_status` ASC"),OrderStatus_DESC("`order_status` DESC") - ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") - ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") - ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` 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/WxOrderGroup.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java index 5b55437f6..b0758a4b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderGroup.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_order_group") @Data -public class WxOrderGroup implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxOrderGroup extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -39,28 +40,5 @@ public class WxOrderGroup implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") private Long userId; - 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/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index 4422a7682..5ec217f45 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -1,17 +1,18 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; + import javax.persistence.*; import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_order_press") @Data -public class WxOrderPress implements Serializable { +@EqualsAndHashCode(callSuper = true) +public class WxOrderPress extends BaseEntity { private static final long serialVersionUID = 1L; @Id @@ -34,33 +35,5 @@ public class WxOrderPress implements Serializable { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="是否发起人",name="first") private Integer first; - - - - 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") - ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") - ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") - ,PressValue_ASC("`press_value` ASC"),PressValue_DESC("`press_value` 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(); - } - } }