From 568df394e7e4e23e0dcc48ac68a677eca8957cdf Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 18 May 2019 23:04:46 +0800 Subject: [PATCH] =?UTF-8?q?[po][=E4=BF=AE=E6=94=B9]:po=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mem/WxCUserBasicInfoController.java | 2 +- .../controller/mem/WxCUserDataController.java | 2 +- .../iformall/controller/WxCarController.java | 4 +- .../controller/WxCouponOrderController.java | 8 +- .../com/iformall/domain/po/MallUserInfo.java | 8 - .../com/iformall/domain/po/WxBillDaily.java | 206 +-------- .../com/iformall/domain/po/WxBillOther.java | 198 +-------- .../domain/po/WxBillOtherDeposit.java | 259 ++--------- .../iformall/domain/po/WxBillProperty.java | 325 ++------------ .../com/iformall/domain/po/WxBillRent.java | 307 ++----------- .../java/com/iformall/domain/po/WxBrand.java | 71 +-- .../java/com/iformall/domain/po/WxCUser.java | 408 +----------------- .../iformall/domain/po/WxCUserBasicInfo.java | 213 +-------- .../iformall/domain/po/WxCarPayRecord.java | 206 +-------- .../java/com/iformall/domain/po/WxCoupon.java | 379 +--------------- .../iformall/domain/po/WxCouponChannel.java | 192 +-------- .../iformall/domain/po/WxCouponInject.java | 180 +------- .../com/iformall/domain/po/WxCouponOrder.java | 206 +-------- .../com/iformall/domain/po/WxCouponSend.java | 109 +---- .../java/com/iformall/domain/po/WxDevice.java | 149 +------ .../com/iformall/domain/po/WxMerchant.java | 373 +--------------- .../iformall/domain/po/WxMerchantSubsidy.java | 12 - .../com/iformall/domain/po/WxMsgCallback.java | 115 +---- .../com/iformall/domain/po/WxMsgModel.java | 77 +--- .../iformall/domain/po/WxMsgSignature.java | 47 +- .../domain/vo/MarkingSceneDataVo.java | 45 +- .../domain/vo/TouchUsersReportVo.java | 58 +-- .../domain/vo/WxCUserBasicInfoVo.java | 15 +- .../com/iformall/domain/vo/WxCUserVo.java | 87 +--- .../com/iformall/domain/vo/WxCardCVo.java | 139 +----- .../com/iformall/domain/vo/WxCardSpendVo.java | 14 +- .../com/iformall/domain/vo/WxCouponCVo.java | 95 +--- .../com/iformall/domain/vo/WxCouponCarVo.java | 19 +- .../domain/vo/WxCouponChannelAddVo.java | 43 +- .../iformall/domain/vo/WxCouponChannelVo.java | 191 +------- .../iformall/domain/vo/WxCouponOrderBVo.java | 186 +------- .../iformall/domain/vo/WxCouponOrderCVo.java | 220 +--------- .../domain/vo/WxCouponOrderCarCVo.java | 18 +- .../iformall/domain/vo/WxCouponSendVo.java | 61 +-- .../iformall/domain/vo/WxCouponStatisVo.java | 123 +----- .../domain/vo/WxOrderCouponPressVo.java | 139 +----- .../iformall/domain/vo/WxOrderQueryVo.java | 1 - .../iformall/domain/vo/WxOrderReportVo.java | 27 +- .../vo/WxProfitSharingOrderQueryVo.java | 1 - .../iformall/domain/vo/WxShopRentRateVo.java | 24 +- .../java/com/iformall/domain/vo/WxShopVo.java | 81 +--- .../com/iformall/domain/vo/WxTagsGroupVo.java | 14 +- .../com/iformall/domain/vo/WxTagsTypeVo.java | 14 +- .../impl/MarkingDataReportServiceImpl.java | 44 +- .../service/impl/WxCUserTagsServiceImpl.java | 8 +- .../service/impl/WxChartServiceImpl.java | 14 +- .../impl/WxCouponOrderServiceImpl.java | 10 +- .../service/impl/WxGameServiceImpl.java | 2 +- .../service/impl/WxOrderServiceImpl.java | 4 +- .../impl/WxRefundOrderServiceImpl.java | 4 +- .../service/impl/WxUserCouponServiceImpl.java | 4 +- 56 files changed, 426 insertions(+), 5335 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 935e809e8..7d58ea470 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -225,7 +225,7 @@ public class WxCUserBasicInfoController extends BaseController { public ResultData findOrderCouponByUserId(Long userId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); WxCouponOrder corder = new WxCouponOrder(); - corder.setcUserId(userId); + corder.setCUserId(userId); corder.setTenantId(getTenantId()); corder.setSortColumns(CreateDate_DESC); PageInfo page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index e46b0fcc9..19eaf3379 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -173,7 +173,7 @@ public class WxCUserDataController extends BaseController { List list = wxUserVisitService.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { - dateMap.put(vo.getxTime(), vo); + dateMap.put(vo.getXTime(), vo); } List weekVos = new ArrayList<>();//每周uv List monthVos = new ArrayList<>();//每月uv diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index e9ff8121b..48e0c359a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -734,7 +734,7 @@ public class WxCarController extends BaseController { WxCouponOrderCarCVo userCar = null; WxCouponOrder userCarQ = new WxCouponOrder(); userCarQ.setTenantId(getTenantId()); - userCarQ.setcUserId(getUserId()); + userCarQ.setCUserId(getUserId()); userCarQ.setId(couponOrderId); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); List list = wxCouponOrderService.carListCUserVo(userCarQ); @@ -806,7 +806,7 @@ public class WxCarController extends BaseController { } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); wxCouponOrder.setTenantId(getTenantId()); - wxCouponOrder.setcUserId(getUserId()); + wxCouponOrder.setCUserId(getUserId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index a40da5a93..c312e05d4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -49,7 +49,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); - wxCouponOrder.setcUserId(getUserId()); + wxCouponOrder.setCUserId(getUserId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) @@ -91,7 +91,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } - if (!wxCouponOrderCVo.getcUserId().equals(getUserId())) { + if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } Date now = new Date(); @@ -187,7 +187,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - Long cUserId = wxCouponOrder.getcUserId(); + Long cUserId = wxCouponOrder.getCUserId(); if (cUserId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } @@ -217,7 +217,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - Long cUserId = wxCouponOrder.getcUserId(); + Long cUserId = wxCouponOrder.getCUserId(); if (cUserId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 70b8da9a3..764675c3d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -104,14 +104,6 @@ public class MallUserInfo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "邮箱", name = "email") private String email; - public Integer getWithWechatForQuery() { - return withWechatForQuery; - } - - public void setWithWechatForQuery(Integer withWechatForQuery) { - this.withWechatForQuery = withWechatForQuery; - } - public Integer getWithWechatNotFormat() { return this.withWechat; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index a4731dd64..ea3b68c4c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -2,6 +2,9 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -15,6 +18,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_daily") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillDaily extends BaseEntity{ @Id protected Long id; @@ -23,20 +29,6 @@ public class WxBillDaily extends BaseEntity{ protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); @@ -45,29 +37,13 @@ public class WxBillDaily extends BaseEntity{ @Transient private String merchantName; - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - @Excel(name = "费用类型", replace = {"水费_1", "电费_2"}, width = 10, orderNum = "2") @NotNull @io.swagger.annotations.ApiModelProperty(value="账单类型",name="type") private Integer type; - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") @SortColumn(column = "receivePay") + @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") @@ -75,12 +51,12 @@ public class WxBillDaily extends BaseEntity{ @Excel(name = "截止收款日期", orderNum = "5", width = 20, format = "yyyy-MM-dd") @NotNull - @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") @SortColumn(column = "receiveDate") + @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; - @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") @SortColumn(column = "payDate") + @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") @@ -88,31 +64,23 @@ public class WxBillDaily extends BaseEntity{ @Excel(name = "逾期天数", orderNum = "6", width = 20, numFormat = "#") @NotNull - @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") @SortColumn(column = "expiredDay") + @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") private String tenantId; - /*欠缴**/ @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; - /*账单状态1待缴2欠缴3已结清**/ @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") private Integer status; - /*删除 是1否0**/ @io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel") private Integer isDel; - /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - /*账号ID**/ @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") private Long userId; - /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; @@ -145,160 +113,6 @@ public class WxBillDaily extends BaseEntity{ @SortColumn(column = "shopNumber") private String shopNumber; - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public Integer getAllPeriod() { - return allPeriod; - } - - public void setAllPeriod(Integer allPeriod) { - this.allPeriod = allPeriod; - } - - public Long getNeedPay() { - return needPay; - } - - public void setNeedPay(Long needPay) { - this.needPay = needPay; - } - - public Long getLatePayPrice() { - return latePayPrice; - } - - public void setLatePayPrice(Long latePayPrice) { - this.latePayPrice = latePayPrice; - } - - public Integer getPeriod() { - return period; - } - - public void setPeriod(Integer period) { - this.period = period; - } - - public String getPriceDetail() { - return priceDetail; - } - - public void setPriceDetail(String priceDetail) { - this.priceDetail = priceDetail; - } - - public Integer getPayWay() { - return payWay; - } - - public void setPayWay(Integer payWay) { - this.payWay = payWay; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long _receivePay) { - receivePay = _receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long _pay) { - pay = _pay; - } - public Date getReceiveDate() { - return receiveDate; - } - public void setReceiveDate(Date _receiveDate) { - receiveDate = _receiveDate; - } - public Date getPayDate() { - return payDate; - } - public void setPayDate(Date _payDate) { - payDate = _payDate; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Long getExpiredDay() { - return expiredDay; - } - public void setExpiredDay(Long _expiredDay) { - expiredDay = _expiredDay; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long _owe) { - owe = _owe; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsDel() { - return isDel; - } - public void setIsDel(Integer _isDel) { - isDel = _isDel; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getUserId() { - return userId; - } - public void setUserId(Long _userId) { - userId = _userId; - } - public Long getShopId() { - return shopId; - } - public void setShopId(Long _shopId) { - shopId = _shopId; - } - public Date getUpdatetime() { - return updatetime; - } - public void setUpdatetime(Date _updatetime) { - updatetime = _updatetime; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index dcf5bb0c8..8906395ae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -1,6 +1,9 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -14,6 +17,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_other") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillOther extends BaseEntity { @Id protected Long id; @@ -22,102 +28,52 @@ public class WxBillOther extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } @Transient private String merchantName; - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - @io.swagger.annotations.ApiModelProperty(value="账单名称",name="name") private String name; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - @io.swagger.annotations.ApiModelProperty(value="账单备注",name="comments") private String comments; - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - /*实际应收金额**/ - @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") @SortColumn(column = "receivePay") + @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; - /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; - /*截止收款日期**/ - @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") @SortColumn(column = "receiveDate") + @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") private Date receiveDate; - /*到账日期**/ - @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") @SortColumn(column = "payDate") + @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - /*逾期天数**/ - @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") @SortColumn(column = "expiredDay") + @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - /*租户**/ @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") private String tenantId; - /*欠缴**/ @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; - /*账单状态1待缴2欠缴3已结清**/ @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") private Integer status; - /*删除 是1否0**/ @io.swagger.annotations.ApiModelProperty(value="删除 是1否0",name="isDel") private Integer isDel; - /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - /*账号ID**/ @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") private Long userId; - /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; @@ -147,136 +103,22 @@ public class WxBillOther extends BaseEntity { @SortColumn(column = "shopNumber") private String shopNumber; - public Integer getAllPeriod() { - return allPeriod; - } - - public void setAllPeriod(Integer allPeriod) { - this.allPeriod = allPeriod; - } - - public Integer getPayWay() { - return payWay; - } - - public void setPayWay(Integer payWay) { - this.payWay = payWay; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long _receivePay) { - receivePay = _receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long _pay) { - pay = _pay; - } - public Date getReceiveDate() { - return receiveDate; - } - public void setReceiveDate(Date _receiveDate) { - receiveDate = _receiveDate; - } - public Date getPayDate() { - return payDate; - } - public void setPayDate(Date _payDate) { - payDate = _payDate; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Long getExpiredDay() { - return expiredDay; - } - public void setExpiredDay(Long _expiredDay) { - expiredDay = _expiredDay; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long _owe) { - owe = _owe; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsDel() { - return isDel; - } - public void setIsDel(Integer _isDel) { - isDel = _isDel; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getUserId() { - return userId; - } - public void setUserId(Long _userId) { - userId = _userId; - } - public Long getShopId() { - return shopId; - } - public void setShopId(Long _shopId) { - shopId = _shopId; - } - public Date getUpdatetime() { - return updatetime; - } - public void setUpdatetime(Date _updatetime) { - updatetime = _updatetime; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") + ,ReceivePay_ASC("`receive_pay` ASC"),ReceivePay_DESC("`receive_pay` DESC") ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") + ,ReceiveDate_ASC("`receive_date` ASC"),ReceiveDate_DESC("`receive_date` DESC") + ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,ExpiredDay_ASC("`expired_day` ASC"),ExpiredDay_DESC("`expired_day` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") + ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") + ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index b975c482d..7ec2c25ed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -1,6 +1,10 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -12,6 +16,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_other_deposit") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillOtherDeposit extends BaseEntity { @Id protected Long id; @@ -21,104 +28,58 @@ public class WxBillOtherDeposit extends BaseEntity { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - @Transient private String merchantName; - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - @io.swagger.annotations.ApiModelProperty(value = "账单名称", name = "name") private String name; - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - @io.swagger.annotations.ApiModelProperty(value = "账单备注", name = "comments") private String comments; - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - /*实际应收金额**/ - @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") @SortColumn(column = "receivePay") + @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePay") private Long receivePay; - /*实收金额**/ + @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "pay") private Long pay; - /*截止收款日期**/ - @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") + @SortColumn(column = "receiveDate") + @io.swagger.annotations.ApiModelProperty(value = "截止收款日期", name = "receiveDate") private Date receiveDate; - /*到账日期**/ - @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") + @SortColumn(column = "payDate") + @io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate") private Date payDate; - /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime") private Date createtime; - /*逾期天数**/ + @io.swagger.annotations.ApiModelProperty(value = "逾期天数", name = "expiredDay") private Long expiredDay; - /*租户**/ + @io.swagger.annotations.ApiModelProperty(value = "租户", name = "tenantId") private String tenantId; - /*欠缴**/ + @io.swagger.annotations.ApiModelProperty(value = "欠缴", name = "owe") private Long owe; - /*账单状态1待缴2欠缴3已结清**/ + @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") private Integer status; - /*删除 是1否0**/ @io.swagger.annotations.ApiModelProperty(value = "删除 是1否0", name = "isDel") private Integer isDel; - /*商户ID**/ @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; - /*账号ID**/ @io.swagger.annotations.ApiModelProperty(value = "账号ID", name = "userId") private Long userId; - /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") private Long shopId; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") private Date updatetime; @@ -151,176 +112,22 @@ public class WxBillOtherDeposit extends BaseEntity { @SortColumn(column = "shopNumber") private String shopNumber; - public Integer getAllPeriod() { - return allPeriod; - } - - public void setAllPeriod(Integer allPeriod) { - this.allPeriod = allPeriod; - } - - public Long getNeedPay() { - return needPay; - } - - public void setNeedPay(Long needPay) { - this.needPay = needPay; - } - - public Long getLatePayPrice() { - return latePayPrice; - } - - public void setLatePayPrice(Long latePayPrice) { - this.latePayPrice = latePayPrice; - } - - public Integer getPeriod() { - return period; - } - - public void setPeriod(Integer period) { - this.period = period; - } - - public Integer getPayWay() { - return payWay; - } - - public void setPayWay(Integer payWay) { - this.payWay = payWay; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long _receivePay) { - receivePay = _receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long _pay) { - pay = _pay; - } - - public Date getReceiveDate() { - return receiveDate; - } - - public void setReceiveDate(Date _receiveDate) { - receiveDate = _receiveDate; - } - - public Date getPayDate() { - return payDate; - } - - public void setPayDate(Date _payDate) { - payDate = _payDate; - } - - public Date getCreatetime() { - return createtime; - } - - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - - public Long getExpiredDay() { - return expiredDay; - } - - public void setExpiredDay(Long _expiredDay) { - expiredDay = _expiredDay; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long _owe) { - owe = _owe; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer _status) { - status = _status; - } - - public Integer getIsDel() { - return isDel; - } - - public void setIsDel(Integer _isDel) { - isDel = _isDel; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long _userId) { - userId = _userId; - } - - public Long getShopId() { - return shopId; - } - - public void setShopId(Long _shopId) { - shopId = _shopId; - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date _updatetime) { - updatetime = _updatetime; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - - public Long getReturnPrice() { - return returnPrice; - } - - public void setReturnPrice(Long returnPrice) { - this.returnPrice = returnPrice; - } - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), ReceivePay_ASC("`receivePay` ASC"), ReceivePay_DESC("`receivePay` DESC"), Pay_ASC("`pay` ASC"), Pay_DESC("`pay` DESC"), ReceiveDate_ASC("`receiveDate` ASC"), ReceiveDate_DESC("`receiveDate` DESC"), PayDate_ASC("`payDate` ASC"), PayDate_DESC("`payDate` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"), ExpiredDay_ASC("`expiredDay` ASC"), ExpiredDay_DESC("`expiredDay` DESC"), TenantId_ASC("`tenantId` ASC"), TenantId_DESC("`tenantId` DESC"), Owe_ASC("`owe` ASC"), Owe_DESC("`owe` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), IsDel_ASC("`isDel` ASC"), IsDel_DESC("`isDel` DESC"), MerchantId_ASC("`merchantId` ASC"), MerchantId_DESC("`merchantId` DESC"), UserId_ASC("`userId` ASC"), UserId_DESC("`userId` DESC"), ShopId_ASC("`shopId` ASC"), ShopId_DESC("`shopId` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"); + Id_ASC("`id` ASC"), Id_DESC("`id` DESC") + , ReceivePay_ASC("`receivePay` ASC"), ReceivePay_DESC("`receivePay` DESC") + , Pay_ASC("`pay` ASC"), Pay_DESC("`pay` DESC") + , ReceiveDate_ASC("`receiveDate` ASC"), ReceiveDate_DESC("`receiveDate` DESC") + , PayDate_ASC("`payDate` ASC"), PayDate_DESC("`payDate` DESC") + , Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC") + , ExpiredDay_ASC("`expiredDay` ASC"), ExpiredDay_DESC("`expiredDay` DESC") + , TenantId_ASC("`tenantId` ASC"), TenantId_DESC("`tenantId` DESC") + , Owe_ASC("`owe` ASC"), Owe_DESC("`owe` DESC") + , Status_ASC("`status` ASC"), Status_DESC("`status` DESC") + , IsDel_ASC("`isDel` ASC"), IsDel_DESC("`isDel` DESC") + , MerchantId_ASC("`merchantId` ASC"), MerchantId_DESC("`merchantId` DESC") + , UserId_ASC("`userId` ASC"), UserId_DESC("`userId` DESC") + , ShopId_ASC("`shopId` ASC"), ShopId_DESC("`shopId` DESC") + , Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"); private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index ae4331f6f..16de7dd9f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -1,6 +1,9 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -13,6 +16,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_property") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillProperty extends BaseEntity { @Id @@ -27,73 +33,55 @@ public class WxBillProperty extends BaseEntity { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } @Transient private String merchantName; - - /*租金合同ID**/ + @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") private Long propertyContractId; - /*实际应收金额**/ - @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") + @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; - /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; - /*收款日期**/ - @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") + @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; - /*到账日期**/ - @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") + @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - /*逾期天数**/ - @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") + @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - /*租户**/ + @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") private String tenantId; - /*欠缴**/ @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; - /*账单状态1未到期2待缴3欠缴4已结清**/ @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") private Integer status; - /*是否删除 是1否0 未到期不显示**/ @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; - /*应收金额**/ - @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") + @SortColumn(column = "needPay") + @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; - /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - /*账号ID**/ + @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") private Long userId; - /*商铺ID**/ + @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; - /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; @@ -115,8 +103,8 @@ public class WxBillProperty extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") private Date latePayTime; - @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") @SortColumn(column = "latePayPrice") + @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") private Long latePayPrice; @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") @@ -146,269 +134,26 @@ public class WxBillProperty extends BaseEntity { @Transient private Integer depositStatus; - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public Integer getDepositStatus() { - return depositStatus; - } - - public void setDepositStatus(Integer depositStatus) { - this.depositStatus = depositStatus; - } - - public Integer getAllPeriod() { - return allPeriod; - } - - public void setAllPeriod(Integer allPeriod) { - this.allPeriod = allPeriod; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public Integer getLatePayStatus() { - return latePayStatus; - } - - public void setLatePayStatus(Integer latePayStatus) { - this.latePayStatus = latePayStatus; - } - - public Integer getPayWay() { - return payWay; - } - - public void setPayWay(Integer payWay) { - this.payWay = payWay; - } - - public String getShopInfo() { - return shopInfo; - } - - public void setShopInfo(String shopInfo) { - this.shopInfo = shopInfo; - } - - public Integer getIsPreview() { - return isPreview; - } - - public void setIsPreview(Integer isPreview) { - this.isPreview = isPreview; - } - - public Date getStarttime() { - return starttime; - } - - public void setStarttime(Date starttime) { - this.starttime = starttime; - } - - public Date getEndtime() { - return endtime; - } - - public void setEndtime(Date endtime) { - this.endtime = endtime; - } - - - public Long getPropertyContractId() { - return propertyContractId; - } - - public void setPropertyContractId(Long propertyContractId) { - this.propertyContractId = propertyContractId; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long _receivePay) { - receivePay = _receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long _pay) { - pay = _pay; - } - public Date getReceiveDate() { - return receiveDate; - } - public void setReceiveDate(Date _receiveDate) { - receiveDate = _receiveDate; - } - public Date getPayDate() { - return payDate; - } - public void setPayDate(Date _payDate) { - payDate = _payDate; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Long getExpiredDay() { - return expiredDay; - } - public void setExpiredDay(Long _expiredDay) { - expiredDay = _expiredDay; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long _owe) { - owe = _owe; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsDel() { - return isDel; - } - public void setIsDel(Integer _isDel) { - isDel = _isDel; - } - - public Long getNeedPay() { - return needPay; - } - - public void setNeedPay(Long _needPay) { - needPay = _needPay; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getUserId() { - return userId; - } - public void setUserId(Long _userId) { - userId = _userId; - } - public Long getShopId() { - return shopId; - } - public void setShopId(Long _shopId) { - shopId = _shopId; - } - public Date getUpdatetime() { - return updatetime; - } - public void setUpdatetime(Date _updatetime) { - updatetime = _updatetime; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - - public Long getRevenue() { - return revenue; - } - - public void setRevenue(Long revenue) { - this.revenue = revenue; - } - - public Integer getLatePayRatio() { - return latePayRatio; - } - - public void setLatePayRatio(Integer latePayRatio) { - this.latePayRatio = latePayRatio; - } - - public Date getLatePayTime() { - return latePayTime; - } - - public void setLatePayTime(Date latePayTime) { - this.latePayTime = latePayTime; - } - - public Long getLatePayPrice() { - return latePayPrice; - } - - public void setLatePayPrice(Long latePayPrice) { - this.latePayPrice = latePayPrice; - } - - public Integer getPeriod() { - return period; - } - - public void setPeriod(Integer period) { - this.period = period; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,RentContractId_ASC("`propertyContractId` ASC"),RentContractId_DESC("`propertyContractId` DESC") - ,ReceivePay_ASC("`receivePay` ASC"),ReceivePay_DESC("`receivePay` DESC") + ,RentContractId_ASC("`property_contract_id` ASC"),RentContractId_DESC("`property_contract_id` DESC") + ,ReceivePay_ASC("`receive_pay` ASC"),ReceivePay_DESC("`receive_pay` DESC") ,Pay_ASC("`pay` ASC"),Pay_DESC("`pay` DESC") - ,ReceiveDate_ASC("`receiveDate` ASC"),ReceiveDate_DESC("`receiveDate` DESC") - ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") + ,ReceiveDate_ASC("`receive_date` ASC"),ReceiveDate_DESC("`receive_date` DESC") + ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,ExpiredDay_ASC("`expiredDay` ASC"),ExpiredDay_DESC("`expiredDay` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,ExpiredDay_ASC("`expired_day` ASC"),ExpiredDay_DESC("`expired_day` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Owe_ASC("`owe` ASC"),Owe_DESC("`owe` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") - ,NeedPay_ASC("`needPay` ASC"),NeedPay_DESC("`needPay` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") - ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") - ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") + ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") + ,NeedPay_ASC("`need_pay` ASC"),NeedPay_DESC("`need_pay` DESC") + ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") + ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") + ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` DESC") - ,Period_ASC("`period` ASC") + ,Period_ASC("`period` ASC"),Period_DESC("`period` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index e0bfe358a..c536a9ee1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -1,6 +1,9 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -13,6 +16,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_bill_rent") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillRent extends BaseEntity { @Id @@ -27,79 +33,61 @@ public class WxBillRent extends BaseEntity { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - @Transient private String merchantName; - /*租金合同ID**/ @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; - /*实际应收金额**/ - @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") + @SortColumn(column = "receivePay") + @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") private Long receivePay; - /*实收金额**/ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; - /*收款日期**/ - @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") + @SortColumn(column = "receiveDate") + @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") private Date receiveDate; - /*到账日期**/ - @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") + @SortColumn(column = "payDate") + @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; - /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - /*逾期天数**/ - @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") + @SortColumn(column = "expiredDay") + @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") private Long expiredDay; - /*租户**/ + @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") private String tenantId; - /*欠缴**/ + @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") private Long owe; - /*账单状态1未到期2待缴3逾期未缴4部分逾期5已结清**/ + @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") private Integer status; - /*是否删除 是1否0 未到期不显示**/ + @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") private Integer isDel; - /*应收金额**/ - @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") + @SortColumn(column = "needPay") + @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") private Long needPay; - /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - /*账号ID**/ + @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") private Long userId; - /*商铺ID**/ + @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") private Date starttime; @@ -118,12 +106,12 @@ public class WxBillRent extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "滞纳金时间", name = "latePayTime") private Date latePayTime; + @SortColumn(column = "latePayPrice") @io.swagger.annotations.ApiModelProperty(value = "滞纳金总额", name = "latePayPrice") - @SortColumn(column = "latePayPrice") private Long latePayPrice; + @SortColumn(column = "period") @io.swagger.annotations.ApiModelProperty(value = "账期", name = "period") - @SortColumn(column = "period") private Integer period; @io.swagger.annotations.ApiModelProperty(value = "预览账单0否1是", name = "isPreview") @@ -151,249 +139,6 @@ public class WxBillRent extends BaseEntity { @Transient private Integer depositStatus; - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public Integer getDepositStatus() { - return depositStatus; - } - - public void setDepositStatus(Integer depositStatus) { - this.depositStatus = depositStatus; - } - - public Integer getAllPeriod() { - return allPeriod; - } - - public void setAllPeriod(Integer allPeriod) { - this.allPeriod = allPeriod; - } - - public String getComments() { - return comments; - } - - public void setComments(String comments) { - this.comments = comments; - } - - public Integer getLatePayStatus() { - return latePayStatus; - } - - public void setLatePayStatus(Integer latePayStatus) { - this.latePayStatus = latePayStatus; - } - - public Integer getPayWay() { - return payWay; - } - - public void setPayWay(Integer payWay) { - this.payWay = payWay; - } - - public String getShopInfo() { - return shopInfo; - } - - public void setShopInfo(String shopInfo) { - this.shopInfo = shopInfo; - } - - public Integer getIsPreview() { - return isPreview; - } - - public void setIsPreview(Integer isPreview) { - this.isPreview = isPreview; - } - - public Date getStarttime() { - return starttime; - } - - public void setStarttime(Date starttime) { - this.starttime = starttime; - } - - public Date getEndtime() { - return endtime; - } - - public void setEndtime(Date endtime) { - this.endtime = endtime; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public Long getRentContractId() { - return rentContractId; - } - public void setRentContractId(Long _rentContractId) { - rentContractId = _rentContractId; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long _receivePay) { - receivePay = _receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long _pay) { - pay = _pay; - } - public Date getReceiveDate() { - return receiveDate; - } - public void setReceiveDate(Date _receiveDate) { - receiveDate = _receiveDate; - } - public Date getPayDate() { - return payDate; - } - public void setPayDate(Date _payDate) { - payDate = _payDate; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Long getExpiredDay() { - return expiredDay; - } - public void setExpiredDay(Long _expiredDay) { - expiredDay = _expiredDay; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long _owe) { - owe = _owe; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Integer getIsDel() { - return isDel; - } - public void setIsDel(Integer _isDel) { - isDel = _isDel; - } - - public Long getNeedPay() { - return needPay; - } - - public void setNeedPay(Long _needPay) { - needPay = _needPay; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getUserId() { - return userId; - } - public void setUserId(Long _userId) { - userId = _userId; - } - public Long getShopId() { - return shopId; - } - public void setShopId(Long _shopId) { - shopId = _shopId; - } - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - - public Long getRevenue() { - return revenue; - } - - public void setRevenue(Long revenue) { - this.revenue = revenue; - } - - public Integer getLatePayRatio() { - return latePayRatio; - } - - public void setLatePayRatio(Integer latePayRatio) { - this.latePayRatio = latePayRatio; - } - - public Date getLatePayTime() { - return latePayTime; - } - - public void setLatePayTime(Date latePayTime) { - this.latePayTime = latePayTime; - } - - public Long getLatePayPrice() { - return latePayPrice; - } - - public void setLatePayPrice(Long latePayPrice) { - this.latePayPrice = latePayPrice; - } - - public Integer getPeriod() { - return period; - } - - public void setPeriod(Integer period) { - this.period = period; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index 0f39a9882..840b92f74 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -11,6 +15,9 @@ import java.util.List; * @author gongbiao */ @Table(name = "wx_brand") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBrand extends BaseEntity{ @Id protected Long id; @@ -24,19 +31,6 @@ public class WxBrand extends BaseEntity{ super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") private String tenantId; @@ -59,57 +53,6 @@ public class WxBrand extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "createdate") private Date createdate; - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Date getUpdatetime() { - return updatetime; - } - public void setUpdatetime(Date _updatetime) { - updatetime = _updatetime; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo; - } - - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } - - public Date getCreatedate() { - return createdate; - } - - public void setCreatedate(Date createdate) { - this.createdate = createdate; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 8ebe07feb..1db5124bf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java @@ -2,6 +2,9 @@ package com.iformall.domain.po; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.utils.Constant; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -14,6 +17,9 @@ import java.util.UUID; @Table(name = "wx_c_user") @JsonIgnoreProperties(ignoreUnknown = true) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCUser extends BaseEntity { @Id @@ -24,98 +30,56 @@ public class WxCUser extends BaseEntity { @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*微信openId**/ @io.swagger.annotations.ApiModelProperty(value="微信openId",name="openId") private String openId; - /*微信unionId**/ @io.swagger.annotations.ApiModelProperty(value="微信unionId",name="unionId") private String unionId; - /*用户昵称**/ @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") private String nickName; - /*用户性别**/ @io.swagger.annotations.ApiModelProperty(value="用户性别",name="gender") private Integer gender; - /*用户头像地址**/ @io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl") private String avatarUrl; - /*用户绑定的手机号**/ @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="phone") private String phone; - /*用户没有区号的手机号**/ @io.swagger.annotations.ApiModelProperty(value="用户没有区号的手机号",name="purePhone") private String purePhone; - /*用户所在城市**/ @io.swagger.annotations.ApiModelProperty(value="用户所在城市",name="city") private String city; - /*用户所在省份**/ @io.swagger.annotations.ApiModelProperty(value="用户所在省份",name="province") private String province; - /*用户所在语言**/ @io.swagger.annotations.ApiModelProperty(value="用户所在语言",name="language") private String language; - /*用户手机区号**/ @io.swagger.annotations.ApiModelProperty(value="用户手机区号",name="countryCode") private String countryCode; - /*用户注册IP**/ @io.swagger.annotations.ApiModelProperty(value="用户注册IP",name="registerIp") private String registerIp; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="verifyCodePhone") + @io.swagger.annotations.ApiModelProperty(value="验证码手机",name="verifyCodePhone") private String verifyCodePhone; - /*注册时记录用户扫码渠道,如朋友圈广告**/ @io.swagger.annotations.ApiModelProperty(value="注册时记录用户扫码渠道,如朋友圈广告",name="qrcodeSource") private String qrcodeSource; - /*二维码来源,小程序**/ @io.swagger.annotations.ApiModelProperty(value="二维码来源,小程序",name="scene") private String scene; - /*渠道,小程序**/ @io.swagger.annotations.ApiModelProperty(value="渠道,小程序",name="sceneAddress") private String sceneAddress; - /*session key for 微信小程序**/ @io.swagger.annotations.ApiModelProperty(value="session key for 微信小程序",name="sessionKey") private String sessionKey; - /*成长值**/ @io.swagger.annotations.ApiModelProperty(value="成长值",name="score") private Integer score; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /*上次活跃时间*/ @io.swagger.annotations.ApiModelProperty(value="上次活跃时间",name="activeTime") private Date activeTime; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /*小程序的appId**/ @io.swagger.annotations.ApiModelProperty(value="小程序的appId",name="appId") private String appId; /*用户登录用token**/ @@ -162,16 +126,16 @@ public class WxCUser extends BaseEntity { private Date subsSubscribeTime; @io.swagger.annotations.ApiModelProperty(value="关注订阅号Scene",name="subsSubscribeScene") private String subsSubscribeScene; - /**积分**/ + @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; - - //渠道名称 @Transient + @io.swagger.annotations.ApiModelProperty(value="渠道名称",name="channelName") private String channelName; - //渠道描述 + @Transient + @io.swagger.annotations.ApiModelProperty(value="渠道描述",name="sceneDescription") protected String sceneDescription; @Transient @@ -183,358 +147,14 @@ public class WxCUser extends BaseEntity { @Transient protected Date endDate; - /**操作人类型 枚举:EnumUserType*/ @Transient + @io.swagger.annotations.ApiModelProperty(value="操作人类型 枚举:EnumUserType",name="operatorType") private Integer operatorType; - /**操作人ID*/ + @Transient + @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") private Long operatorId; - public Integer getOperatorType() { - return operatorType; - } - - public void setOperatorType(Integer operatorType) { - this.operatorType = operatorType; - } - - public Long getOperatorId() { - return operatorId; - } - - public void setOperatorId(Long operatorId) { - this.operatorId = operatorId; - } - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public List getSceneList() { - return sceneList; - } - - public void setSceneList(List sceneList) { - this.sceneList = sceneList; - } - - public String getChannelName() { - return channelName; - } - - public void setChannelName(String channelName) { - this.channelName = channelName; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getOpenId() { - return openId; - } - public void setOpenId(String _openId) { - openId = _openId; - } - public String getUnionId() { - return unionId; - } - public void setUnionId(String _unionId) { - unionId = _unionId; - } - public String getNickName() { - return nickName; - } - public void setNickName(String _nickName) { - nickName = _nickName; - } - public Integer getGender() { - return gender; - } - public void setGender(Integer _gender) { - gender = _gender; - } - public String getAvatarUrl() { - return avatarUrl; - } - public void setAvatarUrl(String _avatarUrl) { - avatarUrl = _avatarUrl; - } - public String getPhone() { - return phone; - } - public void setPhone(String _phone) { - phone = _phone; - } - public String getPurePhone() { - return purePhone; - } - public void setPurePhone(String _purePhone) { - purePhone = _purePhone; - } - public String getCity() { - return city; - } - public void setCity(String _city) { - city = _city; - } - public String getProvince() { - return province; - } - public void setProvince(String _province) { - province = _province; - } - public String getLanguage() { - return language; - } - public void setLanguage(String _language) { - language = _language; - } - public String getCountryCode() { - return countryCode; - } - public void setCountryCode(String _countryCode) { - countryCode = _countryCode; - } - public String getRegisterIp() { - return registerIp; - } - public void setRegisterIp(String _registerIp) { - registerIp = _registerIp; - } - public String getVerifyCodePhone() { - return verifyCodePhone; - } - public void setVerifyCodePhone(String _verifyCodePhone) { - verifyCodePhone = _verifyCodePhone; - } - public String getQrcodeSource() { - return qrcodeSource; - } - public void setQrcodeSource(String _qrcodeSource) { - qrcodeSource = _qrcodeSource; - } - public String getScene() { - return scene; - } - public void setScene(String _scene) { - scene = _scene; - } - public String getSceneAddress() { - return sceneAddress; - } - public void setSceneAddress(String _sceneAddress) { - sceneAddress = _sceneAddress; - } - public String getSessionKey() { - return sessionKey; - } - public void setSessionKey(String _sessionKey) { - sessionKey = _sessionKey; - } - public Integer getScore() { - return score; - } - public void setScore(Integer _score) { - score = _score; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public String getAppId() { - return appId; - } - public void setAppId(String _appId) { - appId = _appId; - } - public String getToken() { - return token; - } - public void setToken(String _token) { - token = _token; - } - public Date getExpireTime() { - return expireTime; - } - public void setExpireTime(Date _expireTime) { - expireTime = _expireTime; - } - - public BigDecimal getLongitude() { - return longitude; - } - - public void setLongitude(BigDecimal longitude) { - this.longitude = longitude; - } - - public BigDecimal getLatitude() { - return latitude; - } - - public void setLatitude(BigDecimal latitude) { - this.latitude = latitude; - } - - public Integer getLoginCount() { - return loginCount; - } - - public void setLoginCount(Integer loginCount) { - this.loginCount = loginCount; - } - - public String getSceneDescription() { - return sceneDescription; - } - - public void setSceneDescription(String sceneDescription) { - this.sceneDescription = sceneDescription; - } - - public String getExtraInfo() { - return extraInfo; - } - - public void setExtraInfo(String extraInfo) { - this.extraInfo = extraInfo; - } - - public Integer getIsSubscribe() { - return isSubscribe; - } - - public void setIsSubscribe(Integer isSubscribe) { - this.isSubscribe = isSubscribe; - } - - public String getOpenAppId() { - return openAppId; - } - - public void setOpenAppId(String openAppId) { - this.openAppId = openAppId; - } - - public String getMpOpenId() { - return mpOpenId; - } - - public void setMpOpenId(String mpOpenId) { - this.mpOpenId = mpOpenId; - } - - public String getMpAppId() { - return mpAppId; - } - - public void setMpAppId(String mpAppId) { - this.mpAppId = mpAppId; - } - - public Integer getMpSubscribe() { - return mpSubscribe; - } - - public void setMpSubscribe(Integer mpSubscribe) { - this.mpSubscribe = mpSubscribe; - } - - public Date getMpSubscribeTime() { - return mpSubscribeTime; - } - - public void setMpSubscribeTime(Date mpSubscribeTime) { - this.mpSubscribeTime = mpSubscribeTime; - } - - public String getMpSubscribeScene() { - return mpSubscribeScene; - } - - public void setMpSubscribeScene(String mpSubscribeScene) { - this.mpSubscribeScene = mpSubscribeScene; - } - - public String getSubsOpenId() { - return subsOpenId; - } - - public void setSubsOpenId(String subsOpenId) { - this.subsOpenId = subsOpenId; - } - - public String getSubsAppId() { - return subsAppId; - } - - public void setSubsAppId(String subsAppId) { - this.subsAppId = subsAppId; - } - - public Integer getSubsSubscribe() { - return subsSubscribe; - } - - public void setSubsSubscribe(Integer subsSubscribe) { - this.subsSubscribe = subsSubscribe; - } - - public Date getSubsSubscribeTime() { - return subsSubscribeTime; - } - - public void setSubsSubscribeTime(Date subsSubscribeTime) { - this.subsSubscribeTime = subsSubscribeTime; - } - - public String getSubsSubscribeScene() { - return subsSubscribeScene; - } - - public void setSubsSubscribeScene(String subsSubscribeScene) { - this.subsSubscribeScene = subsSubscribeScene; - } - - public Integer getCredit() { - return credit; - } - - public void setCredit(Integer credit) { - this.credit = credit; - } - - public Date getActiveTime() { - return activeTime; - } - - public void setActiveTime(Date activeTime) { - this.activeTime = activeTime; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 da36e110d..204ce32ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -2,6 +2,9 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -13,6 +16,9 @@ import java.util.List; import java.util.Objects; @Table(name = "wx_c_user_basic_info") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCUserBasicInfo extends BaseEntity { @Id @@ -22,14 +28,6 @@ public class WxCUserBasicInfo extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { @@ -37,41 +35,30 @@ public class WxCUserBasicInfo extends BaseEntity { return super.getSortColumns(); } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - /**用户姓名**/ @Excel(name="姓名",width = 20,orderNum = "1") @NotNull @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; - /**性别:0:保密 1.男 2女**/ + @Excel(name="性别",width = 20,replace = { "保密_0", "男_1", "女_2"},orderNum = "2") @NotNull @io.swagger.annotations.ApiModelProperty(value="性别:0:保密 1.男 2女",name="sex") private Integer sex; - /**微信用户绑定的手机号**/ + @Excel(name="手机号",width = 20,orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="微信用户绑定的手机号",name="phone") + @NotNull private String phone; - /**用户昵称**/ @Excel(name="微信昵称",width = 20,orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") private String nickName; - /**学历**/ + @Excel(name="学历",width = 20,orderNum = "5") @NotNull @io.swagger.annotations.ApiModelProperty(value="学历",name="education") private String education; - /**出生日期**/ + @Excel(name="生日",width = 20,format="yyyy-MM-dd",orderNum = "6") @NotNull @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") @@ -81,46 +68,36 @@ public class WxCUserBasicInfo extends BaseEntity { @Transient private String addressStr; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /**上次活跃时间**/ @Excel(name="上次活跃时间",width = 20,format="yyyy-MM-dd", orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="上次活跃时间",name="activeTime") private Date activeTime; - /**创建时间**/ @Excel(name="注册时间",width = 20,format="yyyy-MM-dd", orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**成长值**/ @Excel(name="成长值",width = 20, orderNum = "11") @io.swagger.annotations.ApiModelProperty(value="成长值",name="poins") private Integer poins; - /**地址**/ @io.swagger.annotations.ApiModelProperty(value="地址",name="address") private String address; - /**邮箱**/ @io.swagger.annotations.ApiModelProperty(value="邮箱",name="email") private String email; - /**用户标签**/ @io.swagger.annotations.ApiModelProperty(value="用户标签",name="tagId") private Long tagId; - /**租户id**/ @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - /**会员等级**/ @io.swagger.annotations.ApiModelProperty(value="会员等级",name="level") private String level; - /**积分**/ @Excel(name="积分",width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private Integer credit; @@ -148,130 +125,6 @@ public class WxCUserBasicInfo extends BaseEntity { @Transient private Date endTime; - - - public String getLevel() { - return level; - } - - public void setLevel(String level) { - this.level = level; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getTagNames() { - return tagNames; - } - - public void setTagNames(String tagNames) { - this.tagNames = tagNames; - } - - public String getTagIds() { - return tagIds; - } - - public void setTagIds(String tagIds) { - this.tagIds = tagIds; - } - - public String getPhone() { - return phone; - } - public void setPhone(String _phone) { - phone = _phone; - } - public Date getBirthdate() { - return birthdate; - } - public void setBirthdate(Date _birthdate) { - birthdate = _birthdate; - } - public String getEducation() { - return education; - } - public void setEducation(String _education) { - education = _education; - } - public Integer getSex() { - return sex; - } - public void setSex(Integer _sex) { - sex = _sex; - } - public String getEmail() { - return email; - } - public void setEmail(String _email) { - email = _email; - } - public String getAddress() { - return address; - } - public void setAddress(String _address) { - address = _address; - } - public Integer getPoins() { - return poins; - } - public void setPoins(Integer _poins) { - poins = _poins; - } - public Long getTagId() { - return tagId; - } - public void setTagId(Long _tagId) { - tagId = _tagId; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - public String getAddressStr() { if (address == null) return null; @@ -286,50 +139,6 @@ public class WxCUserBasicInfo extends BaseEntity { return addressStr; } - public void setAddressStr(String _addressStr) { - addressStr = _addressStr; - } - - public List getTagsList() { - return tagsList; - } - - public void setTagsList(List tagsList) { - this.tagsList = tagsList; - } - - public List getCarList() { - return carList; - } - - public void setCarList(List carList) { - this.carList = carList; - } - - public Integer getCarCount() { - return carCount; - } - - public void setCarCount(Integer carCount) { - this.carCount = carCount; - } - - public Integer getCredit() { - return credit; - } - - public void setCredit(Integer credit) { - this.credit = credit; - } - - public Date getActiveTime() { - return activeTime; - } - - public void setActiveTime(Date activeTime) { - this.activeTime = activeTime; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java index 2712395b3..7c4eb1aec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayRecord.java @@ -1,6 +1,9 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -9,6 +12,9 @@ import java.io.Serializable; import java.util.Date; @Table(name = "wx_car_pay_record") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCarPayRecord extends BaseEntity { @Id private Long id; @@ -61,204 +67,4 @@ public class WxCarPayRecord extends BaseEntity { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public Date getFeeTime() { - return feeTime; - } - - public void setFeeTime(Date feeTime) { - this.feeTime = feeTime; - } - - public Long getStayedTime() { - return stayedTime; - } - - public void setStayedTime(Long stayedTime) { - this.stayedTime = stayedTime; - } - - public String getStartDate() { - return startDate; - } - - public void setStartDate(String startDate) { - this.startDate = startDate; - } - - public String getEndDate() { - return endDate; - } - - public void setEndDate(String endDate) { - this.endDate = endDate; - } - - public Integer getIsPay() { - return isPay; - } - - public void setIsPay(Integer isPay) { - this.isPay = isPay; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public Integer getVendorType() { - return vendorType; - } - - public void setVendorType(Integer vendorType) { - this.vendorType = vendorType; - } - - public String getSynId() { - return synId; - } - - public void setSynId(String synId) { - this.synId = synId; - } - - public String getParkId() { - return parkId; - } - - public void setParkId(String parkId) { - this.parkId = parkId; - } - - public String getParkName() { - return parkName; - } - - public void setParkName(String parkName) { - this.parkName = parkName; - } - - public String getUserType() { - return userType; - } - - public void setUserType(String userType) { - this.userType = userType; - } - - public String getPlateNumber() { - return plateNumber; - } - - public void setPlateNumber(String plateNumber) { - this.plateNumber = plateNumber; - } - - public Date getEntranceTime() { - return entranceTime; - } - - public void setEntranceTime(Date entranceTime) { - this.entranceTime = entranceTime; - } - - public Date getExitTime() { - return exitTime; - } - - public void setExitTime(Date exitTime) { - this.exitTime = exitTime; - } - - public String getFee() { - return fee; - } - - public void setFee(String fee) { - this.fee = fee; - } - - public String getCoupon() { - return coupon; - } - - public void setCoupon(String coupon) { - this.coupon = coupon; - } - - - public String getCouponCode() { - return couponCode; - } - - public void setCouponCode(String couponCode) { - this.couponCode = couponCode; - } - - public String getFixParkingId() { - return fixParkingId; - } - - public void setFixParkingId(String fixParkingId) { - this.fixParkingId = fixParkingId; - } - - public String getRemainingDays() { - return remainingDays; - } - - public void setRemainingDays(String remainingDays) { - this.remainingDays = remainingDays; - } - - public String getDiscountAmount() { - return discountAmount; - } - - public void setDiscountAmount(String discountAmount) { - this.discountAmount = discountAmount; - } - - public String getPaidServiceFee() { - return paidServiceFee; - } - - public void setPaidServiceFee(String paidServiceFee) { - this.paidServiceFee = paidServiceFee; - } - - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public Date getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } } 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 9ebc24c11..fa77eab33 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -3,6 +3,10 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.EnumCouponType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -11,6 +15,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_coupon") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCoupon extends BaseEntity { @Id protected Long id; @@ -28,14 +35,6 @@ public class WxCoupon extends BaseEntity { @Transient protected String channels; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { @@ -43,22 +42,6 @@ public class WxCoupon extends BaseEntity { return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - public List getTypes() { - return types; - } - - public void setTypes(List types) { - this.types = types; - } - @Transient @SortColumn(column = "sale_price") private String salePriceStr; @@ -209,193 +192,6 @@ public class WxCoupon extends BaseEntity { @Transient private Integer pressSuccCount; - public Long getCouponChannelId() { - return couponChannelId; - } - - public void setCouponChannelId(Long couponChannelId) { - this.couponChannelId = couponChannelId; - } - - public WxCouponStatisVo getWxCouponStatisVo() { - return wxCouponStatisVo; - } - - public void setWxCouponStatisVo(WxCouponStatisVo wxCouponStatisVo) { - this.wxCouponStatisVo = wxCouponStatisVo; - } - - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public String getCoverImg() { - return coverImg; - } - public void setCoverImg(String _coverImg) { - coverImg = _coverImg; - } - - public String getCoverPicture() { - return coverPicture; - } - - public void setCoverPicture(String coverPicture) { - this.coverPicture = coverPicture; - } - - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public String getSubTitle() { - return subTitle; - } - public void setSubTitle(String _subTitle) { - subTitle = _subTitle; - } - public Integer getSalePrice() { - return salePrice; - } - public void setSalePrice(Integer _salePrice) { - salePrice = _salePrice; - } - public Integer getUsePrice() { - return usePrice; - } - public void setUsePrice(Integer _usePrice) { - usePrice = _usePrice; - } - public Integer getUseLimitQuantity() { - return useLimitQuantity; - } - public void setUseLimitQuantity(Integer _useLimitQuantity) { - useLimitQuantity = _useLimitQuantity; - } - public Integer getSendType() { - return sendType; - } - public void setSendType(Integer _sendType) { - sendType = _sendType; - } - public Integer getValidType() { - return validType; - } - public void setValidType(Integer _validType) { - validType = _validType; - } - public Date getValidStartDate() { - return validStartDate; - } - public void setValidStartDate(Date _validStartDate) { - validStartDate = _validStartDate; - } - public Date getValidEndDate() { - return validEndDate; - } - public void setValidEndDate(Date _validEndDate) { - validEndDate = _validEndDate; - } - public Integer getValidDays() { - return validDays; - } - public void setValidDays(Integer _validDays) { - validDays = _validDays; - } - public String getDetail() { - return detail; - } - public void setDetail(String _detail) { - detail = _detail; - } - public Integer getPrice() { - return price; - } - public void setPrice(Integer _price) { - price = _price; - } - public Integer getUnit() { - return unit; - } - public void setUnit(Integer _unit) { - unit = _unit; - } - public Integer getRemainInventory() { - return remainInventory; - } - public void setRemainInventory(Integer _remainInventory) { - remainInventory = _remainInventory; - } - public Integer getInventory() { - return inventory; - } - public void setInventory(Integer _inventory) { - inventory = _inventory; - } - public String getRemark() { - return remark; - } - public void setRemark(String _remark) { - remark = _remark; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Integer getBusiness() { - return business; - } - public void setBusiness(Integer _business) { - business = _business; - } - public Integer getSubBusiness() { - return subBusiness; - } - public void setSubBusiness(Integer _subBusiness) { - subBusiness = _subBusiness; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public Integer getSupportTransfer() { - return supportTransfer; - } - - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - public String getSalePriceStr() { if(salePrice!=null) { salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); @@ -403,10 +199,6 @@ public class WxCoupon extends BaseEntity { return salePriceStr; } - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } - public String getUsePriceStr() { if(usePrice!=null) { usePriceStr = new BigDecimal(usePrice).divide(new BigDecimal(100)).toString(); @@ -414,10 +206,6 @@ public class WxCoupon extends BaseEntity { return usePriceStr; } - public void setUsePriceStr(String usePriceStr) { - this.usePriceStr = usePriceStr; - } - public String getPriceStr() { if(price!=null) { priceStr = new BigDecimal(price).divide(new BigDecimal(100)).toString(); @@ -432,127 +220,6 @@ public class WxCoupon extends BaseEntity { return subsidyNumStr; } - public void setSubsidyNumStr(String subsidyNumStr) { - this.subsidyNumStr = subsidyNumStr; - - } - - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - - public String getChannels() { - return channels; - } - - public void setChannels(String channels) { - this.channels = channels; - } - - public Date getStartdate() { - return startdate; - } - - public void setStartdate(Date startdate) { - this.startdate = startdate; - } - - public Date getEnddate() { - return enddate; - } - - public void setEnddate(Date enddate) { - this.enddate = enddate; - } - - public String getMerchantParams() { - return merchantParams; - } - - public void setMerchantParams(String merchantParams) { - this.merchantParams = merchantParams; - } - - public Integer getSubsidyType() { - return subsidyType; - } - - public void setSubsidyType(Integer subsidyType) { - this.subsidyType = subsidyType; - } - - public Integer getSubsidyNum() { - return subsidyNum; - } - - public void setSubsidyNum(Integer subsidyNum) { - this.subsidyNum = subsidyNum; - } - - public Integer getPressLimitNum() { - return pressLimitNum; - } - - public void setPressLimitNum(Integer pressLimitNum) { - this.pressLimitNum = pressLimitNum; - } - - public Integer getPressLimitHours() { - return pressLimitHours; - } - - public void setPressLimitHours(Integer pressLimitHours) { - this.pressLimitHours = pressLimitHours; - } - - public Integer getAutoRefund() { - return autoRefund; - } - - public void setAutoRefund(Integer autoRefund) { - this.autoRefund = autoRefund; - } - - public Integer getTargetAd() { - return targetAd; - } - - public void setTargetAd(Integer targetAd) { - this.targetAd = targetAd; - } - - public Integer getCreditPrice() { - return creditPrice; - } - - public void setCreditPrice(Integer creditPrice) { - this.creditPrice = creditPrice; - } - - public Integer getCreditRefund() { - return creditRefund; - } - - public void setCreditRefund(Integer creditRefund) { - this.creditRefund = creditRefund; - } - - public Integer getOrgRemainInventory() { - return orgRemainInventory; - } - - public void setOrgRemainInventory(Integer orgRemainInventory) { - this.orgRemainInventory = orgRemainInventory; - } - - public Integer getOrgInventory() { - return orgInventory; - } - - public void setOrgInventory(Integer orgInventory) { - this.orgInventory = orgInventory; - } - public boolean checkIsCreditCoupon() { if(type == null) { return false; @@ -565,38 +232,6 @@ public class WxCoupon extends BaseEntity { return false; } - public Integer getPressSendCount() { - return pressSendCount; - } - - public void setPressSendCount(Integer pressSendCount) { - this.pressSendCount = pressSendCount; - } - - public Integer getPressCount() { - return pressCount; - } - - public void setPressCount(Integer pressCount) { - this.pressCount = pressCount; - } - - public Integer getPressJoinCount() { - return pressJoinCount; - } - - public void setPressJoinCount(Integer pressJoinCount) { - this.pressJoinCount = pressJoinCount; - } - - public List getNotinTypes() { - return notinTypes; - } - - public void setNotinTypes(List notinTypes) { - this.notinTypes = notinTypes; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 abf76dcce..30dfcf5d7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -2,6 +2,10 @@ package com.iformall.domain.po; import com.iformall.common.SortColumn; import com.iformall.enums.EnumCouponType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -9,6 +13,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_coupon_channel") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponChannel extends BaseEntity { @Id protected Long id; @@ -19,28 +26,12 @@ public class WxCouponChannel extends BaseEntity { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns(){ super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - @Transient private Date startdate; @@ -53,42 +44,25 @@ public class WxCouponChannel extends BaseEntity { @Transient protected List couponIds; - public List getCouponIds() { - return couponIds; - } - public void setCouponIds(List couponIds) { - this.couponIds = couponIds; - } - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; - /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; - /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /*投放频道位置(1.列表, 2.限时抢购)**/ @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.列表, 2.限时抢购)",name="targetAd") private Integer targetAd; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="business") + @io.swagger.annotations.ApiModelProperty(value="业态",name="business") private Integer business; - /**子业态**/ @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusiness") private Integer subBusiness; - /*开始时间**/ @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") private Date beginTime; - /*结束时间**/ @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") private Date endTime; - /*0:上架 1:下架**/ @io.swagger.annotations.ApiModelProperty(value="0:上架 1:下架",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @@ -106,7 +80,6 @@ public class WxCouponChannel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "小程序二维码scene", name = "weaAppScene") private String weaAppScene; - /**积分售价(适用于类型10,11)**/ @Transient @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; @@ -126,155 +99,6 @@ public class WxCouponChannel extends BaseEntity { @Transient private Long merchantId; - - public String getSalePriceStr() { - return salePriceStr; - } - - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } - - public String getUsePriceStr() { - return usePriceStr; - } - - public void setUsePriceStr(String usePriceStr) { - this.usePriceStr = usePriceStr; - } - - public String getPriceStr() { - return priceStr; - } - - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public Integer getTargetAd() { - return targetAd; - } - public void setTargetAd(Integer _targetAd) { - targetAd = _targetAd; - } - public Integer getBusiness() { - return business; - } - public void setBusiness(Integer _business) { - business = _business; - } - - public Integer getSubBusiness() { - return subBusiness; - } - - public void setSubBusiness(Integer subBusiness) { - this.subBusiness = subBusiness; - } - - public Date getBeginTime() { - return beginTime; - } - public void setBeginTime(Date _beginTime) { - beginTime = _beginTime; - } - public Date getEndTime() { - return endTime; - } - public void setEndTime(Date _endTime) { - endTime = _endTime; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - - public Long getSubTargetId() { - return subTargetId; - } - public void setSubTargetId(Long subTargetId) { - this.subTargetId = subTargetId; - } - - public Date getStartdate() { - return startdate; - } - - public void setStartdate(Date startdate) { - this.startdate = startdate; - } - - public Date getEnddate() { - return enddate; - } - - public void setEnddate(Date enddate) { - this.enddate = enddate; - } - - public Integer getSupportTransfer() { - return supportTransfer; - } - - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - - public Integer getCreditPrice() { - return creditPrice; - } - - public void setCreditPrice(Integer creditPrice) { - this.creditPrice = creditPrice; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - public String getWeaAppPath() { if(type == null) return "pages/index/index"; 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 217ee35ac..19fc211c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponInject.java @@ -1,16 +1,20 @@ package com.iformall.domain.po; -import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; +import lombok.Data; +import lombok.EqualsAndHashCode; +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; @Table(name = "wx_coupon_inject") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponInject extends BaseEntity { @Id @@ -21,14 +25,6 @@ public class WxCouponInject extends BaseEntity { @Transient protected String sortColumns; - public WxMsgModel getMsgModel() { - return msgModel; - } - - public void setMsgModel(WxMsgModel msgModel) { - this.msgModel = msgModel; - } - @Transient protected WxMsgModel msgModel; @@ -38,214 +34,50 @@ public class WxCouponInject extends BaseEntity { @Transient protected Date sendTimeEnd; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") private String tenantId; - /*任务名称**/ @io.swagger.annotations.ApiModelProperty(value="任务名称",name="name") private String name; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="mUserId") private Long mUserId; - /*发送方式0:立即发送 1:定时发送**/ @io.swagger.annotations.ApiModelProperty(value="发送方式0:立即发送 1:定时发送",name="sendType") private Integer sendType; - /*券id**/ @io.swagger.annotations.ApiModelProperty(value="券id",name="couponId") private Long couponId; - /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="couponName") private String couponName; - /*发送时间**/ @io.swagger.annotations.ApiModelProperty(value="发送时间",name="sendTime") private Date sendTime; - /*实际发送数量**/ @io.swagger.annotations.ApiModelProperty(value="实际发送数量",name="sendAmount") private Integer sendAmount; - /*0:待发送1:发送中2:已发送3:发送失败4已作废**/ @io.swagger.annotations.ApiModelProperty(value="0:待发送1:发送中2:已发送3:发送失败4已作废",name="status") private Integer status; - /*发送失败原因**/ @io.swagger.annotations.ApiModelProperty(value="发送失败原因",name="errorMsg") private String errorMsg; - /*发送人群标签**/ @io.swagger.annotations.ApiModelProperty(value="发送人群标签",name="tags") private String tags; @io.swagger.annotations.ApiModelProperty(value="",name="modelId") private Long modelId; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; - /*修改时间**/ @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updateTime") private Date updateTime; @io.swagger.annotations.ApiModelProperty(value="短信id",name="msgId") private Long msgId; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public Long getMUserId() { - return mUserId; - } - public void setMUserId(Long _mUserId) { - mUserId = _mUserId; - } - public Integer getSendType() { - return sendType; - } - public void setSendType(Integer _sendType) { - sendType = _sendType; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public String getCouponName() { - return couponName; - } - public void setCouponName(String _couponName) { - couponName = _couponName; - } - public Date getSendTime() { - return sendTime; - } - public void setSendTime(Date _sendTime) { - sendTime = _sendTime; - } - public Integer getSendAmount() { - return sendAmount; - } - public void setSendAmount(Integer _sendAmount) { - sendAmount = _sendAmount; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public String getErrorMsg() { - return errorMsg; - } - public void setErrorMsg(String _errorMsg) { - errorMsg = _errorMsg; - } - public String getTags() { - return tags; - } - public void setTags(String _tags) { - tags = _tags; - } - public Long getModelId() { - return modelId; - } - public void setModelId(Long _modelId) { - modelId = _modelId; - } - public Date getCreateTime() { - return createTime; - } - public void setCreateTime(Date _createTime) { - createTime = _createTime; - } - public Date getUpdateTime() { - return updateTime; - } - public void setUpdateTime(Date _updateTime) { - updateTime = _updateTime; - } - - public Date getSendTimeStart() { - return sendTimeStart; - } - - public void setSendTimeStart(Date sendTimeStart) { - this.sendTimeStart = sendTimeStart; - } - - public Date getSendTimeEnd() { - return sendTimeEnd; - } - - public void setSendTimeEnd(Date sendTimeEnd) { - this.sendTimeEnd = sendTimeEnd; - } - - public Long getmUserId() { - return mUserId; - } - - public void setmUserId(Long mUserId) { - this.mUserId = mUserId; - } - - public Long getMsgId() { - return msgId; - } - - public void setMsgId(Long msgId) { - this.msgId = msgId; - } - - - @Transient List filterList; - public List getFilterList() { - return filterList; - } - public void setFilterList(List filterList) { - this.filterList = filterList; - } - @Transient protected String phones; - public String getPhones() { - return phones; - } - public void setPhones(String phones) { - this.phones = phones; - } public static enum Field { 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 98fd11ca9..4af82fc18 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -9,6 +13,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_coupon_order") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponOrder extends BaseEntity{ @Id @@ -25,62 +32,31 @@ public class WxCouponOrder extends BaseEntity{ return super.getSortColumns(); } - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - /**租户ID*/ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - /**卡券ID**/ @io.swagger.annotations.ApiModelProperty(value = "卡券ID", name = "couponId") private Long couponId; - /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡) */ @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)", name = "couponType") private Integer couponType; - /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") private Long cUserId; - /**持有者ID*/ @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") private Long ownerId; - /**操作券B端小程序用户ID**/ @io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId") private Long bUserId; - /**用户订单ID**/ @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; - /**该订单对应券的实际过期时间**/ @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - /**状态:0-待使用 1-已核销 2-已过期 3-已作废 4-卡使用中 5-卡已过期 6-卡已用完 7-卡已线下退款**/ @io.swagger.annotations.ApiModelProperty(value = "状态:0-待使用 1-已核销 2-已过期 3-已作废 4-卡使用中 5-卡已过期 6-卡已用完 7-卡已线下退款", name = "couponOrderStatus") private Integer couponOrderStatus; - /**创建时间*/ @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; - /**更新时间*/ @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") private Date updateDate; - /**单券实际购买价格**/ @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") private Integer couponPrice; - /**过期退款(0:正常,1不退)**/ @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") private Integer autoRefund; @@ -117,10 +93,6 @@ public class WxCouponOrder extends BaseEntity{ return couponPriceStr; } - public void setCouponPriceStr(String couponPriceStr) { - this.couponPriceStr = couponPriceStr; - } - public String getSalePriceStr() { if(salePrice!=null) { DecimalFormat df=new DecimalFormat("0.00"); @@ -129,170 +101,6 @@ public class WxCouponOrder extends BaseEntity{ return salePriceStr; } - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } - - public Integer getSalePrice() { - return salePrice; - } - - public void setSalePrice(Integer salePrice) { - this.salePrice = salePrice; - } - - public String getCouponName() { - return couponName; - } - - public void setCouponName(String couponName) { - this.couponName = couponName; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - - public Integer getCouponType() { - return couponType; - } - - public void setCouponType(Integer couponType) { - this.couponType = couponType; - } - - public Long getOwnerId() { - return ownerId; - } - - public void setOwnerId(Long ownerId) { - this.ownerId = ownerId; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - - public Date getExpiredTime() { - return expiredTime; - } - - public void setExpiredTime(Date _expiredTime) { - expiredTime = _expiredTime; - } - - public Integer getCouponOrderStatus() { - return couponOrderStatus; - } - - public void setCouponOrderStatus(Integer _couponOrderStatus) { - couponOrderStatus = _couponOrderStatus; - } - - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - - public Date getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - public Integer getCouponPrice() { - return couponPrice; - } - - public void setCouponPrice(Integer _couponPrice) { - couponPrice = _couponPrice; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - - public Integer getAutoRefund() { - return autoRefund; - } - - public void setAutoRefund(Integer autoRefund) { - this.autoRefund = autoRefund; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public Integer getTimeSlot() { - return timeSlot; - } - - public void setTimeSlot(Integer timeSlot) { - this.timeSlot = timeSlot; - } - - public Integer getBusinessId() { - return businessId; - } - - public void setBusinessId(Integer businessId) { - this.businessId = businessId; - } - - public Integer getSubBusinessId() { - return subBusinessId; - } - - public void setSubBusinessId(Integer subBusinessId) { - this.subBusinessId = subBusinessId; - } - public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), 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 fa5479071..8975469b6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -7,6 +11,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_coupon_send") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponSend extends BaseEntity { @Id protected Long id; @@ -16,135 +23,38 @@ public class WxCouponSend extends BaseEntity { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*卡券id**/ @io.swagger.annotations.ApiModelProperty(value="卡券id",name="couponId") private Long couponId; - /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /*发券方式(1.主动领取,2.停车发券,3.核销发券)**/ @io.swagger.annotations.ApiModelProperty(value="发券方式(1.主动领取,2.停车发券,3.核销发券)",name="sendType") private Integer sendType; - /*发券条件**/ @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") private String conditions; - /*0:有效 1:无效**/ @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status") private Integer status; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - - /*场景发券计数**/ @Transient + @io.swagger.annotations.ApiModelProperty(value="场景发券计数",name="sendCount") protected int sendCount; @io.swagger.annotations.ApiModelProperty(value = "1是0否", name = "是否发送短信1是0否") private Integer sendSms; - public Integer getSendSms() { - return sendSms; - } - - public void setSendSms(Integer sendSms) { - this.sendSms = sendSms; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public Integer getSendType() { - return sendType; - } - public void setSendType(Integer _sendType) { - sendType = _sendType; - } - - public String getConditions() { - return conditions; - } - - public void setConditions(String conditions) { - this.conditions = conditions; - } - - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - - public int getSendCount() { - return sendCount; - } - - public void setSendCount(int sendCount) { - this.sendCount = sendCount; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -154,7 +64,8 @@ public class WxCouponSend extends BaseEntity { ,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") + ,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){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index 8af038190..b59a8f41c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -9,6 +13,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_device") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxDevice extends BaseEntity { @Id protected Long id; @@ -18,194 +25,54 @@ public class WxDevice extends BaseEntity { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - - /**租户id**/ @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - /**设备id**/ @io.swagger.annotations.ApiModelProperty(value="设备id",name="deviceId") private String deviceId; - /**设备类型**/ @io.swagger.annotations.ApiModelProperty(value="设备类型",name="type") private Integer type; - /**设备状态**/ @io.swagger.annotations.ApiModelProperty(value="设备状态",name="status") private Integer status; - /**版本号信息**/ @io.swagger.annotations.ApiModelProperty(value="版本号信息",name="version") private String version; - /**设备名**/ @io.swagger.annotations.ApiModelProperty(value="设备名",name="name") private String name; - /**设备位置**/ @io.swagger.annotations.ApiModelProperty(value="设备位置",name="location") private String location; - /**创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /**更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /**在线状态**/ @io.swagger.annotations.ApiModelProperty(value="在线状态",name="onlineStatus") private Integer onlineStatus; - /**第一次连线时间**/ @io.swagger.annotations.ApiModelProperty(value="第一次连线时间",name="firstHbTime") private Date firstHbTime; - /**最后一次在线时间**/ @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="lastHbTime") private Date lastHbTime; - /**需要执行的命令**/ - @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") + @io.swagger.annotations.ApiModelProperty(value="需要执行的命令",name="hbCmd") private Integer hbCmd; - /**设备名**/ @io.swagger.annotations.ApiModelProperty(value="设备配置",name="config") private String config; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public Date getCreateDate() { - return createDate; - } - - public void setCreateDate(Date createDate) { - this.createDate = createDate; - } - - public Date getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(Date updateDate) { - this.updateDate = updateDate; - } - - public Integer getOnlineStatus() { - return onlineStatus; - } - - public void setOnlineStatus(Integer onlineStatus) { - this.onlineStatus = onlineStatus; - } - - public Date getFirstHbTime() { - return firstHbTime; - } - - public void setFirstHbTime(Date firstHbTime) { - this.firstHbTime = firstHbTime; - } - - public Date getLastHbTime() { - return lastHbTime; - } - - public void setLastHbTime(Date lastHbTime) { - this.lastHbTime = lastHbTime; - } - - public Integer getHbCmd() { - return hbCmd; - } - - public void setHbCmd(Integer hbCmd) { - this.hbCmd = hbCmd; - } - - public String getConfig() { - return config; - } - - public void setConfig(String config) { - this.config = config; - } public static enum Field { 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 af5a0b8b1..05f16e1ae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -1,6 +1,9 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -11,6 +14,9 @@ import java.util.List; import java.util.Map; @Table(name = "wx_merchant") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMerchant extends BaseEntity { @Id protected Long id; @@ -19,21 +25,6 @@ public class WxMerchant extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } @Transient private List userids; @@ -49,11 +40,10 @@ public class WxMerchant extends BaseEntity { @Transient private Long rentContractId; - /*租期开始时间**/ @Transient @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "4") private Date rentalStartDate; - /*租期结束时间**/ + @Transient @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "5") private Date rentalEndDate; @@ -103,44 +93,35 @@ public class WxMerchant extends BaseEntity { @Transient private Integer isUse; - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*商户图片**/ @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") private String imgUrl; - /*商户名**/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") @Excel(name="商户名",width = 20,orderNum = "1") private String name; - /*联系人**/ @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") @Excel(name="联系人",width = 20,orderNum = "2") private String linkPerson; - /*联系方式**/ @io.swagger.annotations.ApiModelProperty(value="联系方式",name="linkPhone") @Excel(name="联系方式",width = 20,orderNum = "3") private String linkPhone; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @Excel(name="创建时间",width = 20,format="yyyy-MM-dd",orderNum = "10") private Date createDate; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - /*停车厂商(1:ETCP)**/ @io.swagger.annotations.ApiModelProperty(value="停车厂商(1:ETCP)",name="carVendorType") private Integer carVendorType; - /*停车厂商参数**/ @io.swagger.annotations.ApiModelProperty(value="停车厂商参数",name="carParams") private String carParams; - /*商户状态**/ - @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") + @Excel(name="商户状态",width = 20,orderNum = "6",replace = {"停用_0","正常_1"}) + @io.swagger.annotations.ApiModelProperty(value="状态1可用0停用",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") @@ -158,8 +139,8 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "isPublic") @Excel(name="是否展示",width = 20,orderNum = "11",replace = {"否_0","是_1"}) + @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "isPublic") private Integer isPublic; @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") @@ -171,7 +152,6 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverPicture") private String coverPicture; - /*商户状态**/ @io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status") private Integer isAdmin; @@ -191,339 +171,6 @@ public class WxMerchant extends BaseEntity { @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; - public WxProfitSharingReceiver getWxProfitSharingReceiver() { - return wxProfitSharingReceiver; - } - - public void setWxProfitSharingReceiver(WxProfitSharingReceiver wxProfitSharingReceiver) { - this.wxProfitSharingReceiver = wxProfitSharingReceiver; - } - - public String getQrCode() { - return qrCode; - } - - public void setQrCode(String qrCode) { - this.qrCode = qrCode; - } - - public Date getTopTime() { - return topTime; - } - - public void setTopTime(Date topTime) { - this.topTime = topTime; - } - - public Integer getBillSetting() { - return billSetting; - } - - public void setBillSetting(Integer billSetting) { - this.billSetting = billSetting; - } - - public Integer getIsAdmin() { - return isAdmin; - } - - public void setIsAdmin(Integer isAdmin) { - this.isAdmin = isAdmin; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCoverPicture() { - return coverPicture; - } - - public void setCoverPicture(String coverPicture) { - this.coverPicture = coverPicture; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public List getLevelConfigList() { - return levelConfigList; - } - - public void setLevelConfigList(List levelConfigList) { - this.levelConfigList = levelConfigList; - } - - public List> getShoplist() { - return shoplist; - } - - public void setShoplist(List> shoplist) { - this.shoplist = shoplist; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getImgUrl() { - return imgUrl; - } - public void setImgUrl(String _imgUrl) { - imgUrl = _imgUrl; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getLinkPhone() { - return linkPhone; - } - public void setLinkPhone(String _linkPhone) { - linkPhone = _linkPhone; - } - - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Integer getCarVendorType() { - return carVendorType; - } - public void setCarVendorType(Integer _carVendorType) { - carVendorType = _carVendorType; - } - public String getCarParams() { - return carParams; - } - public void setCarParams(String _carParams) { - carParams = _carParams; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public List getUserids() { - return userids; - } - - public void setUserids(List userids) { - this.userids = userids; - } - - public List getShopids() { - return shopids; - } - - public void setShopids(List shopids) { - this.shopids = shopids; - } - - public List getShops() { - return shops; - } - - public void setShops(List shops) { - this.shops = shops; - } - - public List getUsers() { - return users; - } - - public void setUsers(List users) { - this.users = users; - } - - public Date getRentalStartDate() { - return rentalStartDate; - } - - public void setRentalStartDate(Date rentalStartDate) { - this.rentalStartDate = rentalStartDate; - } - - public Date getRentalEndDate() { - return rentalEndDate; - } - - public void setRentalEndDate(Date rentalEndDate) { - this.rentalEndDate = rentalEndDate; - } - - public String getLinkPerson() { - return linkPerson; - } - - public void setLinkPerson(String linkPerson) { - this.linkPerson = linkPerson; - } - - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - - public Integer getReceivePeriod() { - return receivePeriod; - } - - public void setReceivePeriod(Integer receivePeriod) { - this.receivePeriod = receivePeriod; - } - - - public String getAccountName() { - return accountName; - } - - public void setAccountName(String accountName) { - this.accountName = accountName; - } - - public String getAccountId() { - return accountId; - } - - public void setAccountId(String accountId) { - this.accountId = accountId; - } - - public Integer getAccountTypeValue() { - return accountTypeValue; - } - - public void setAccountTypeValue(Integer accountTypeValue) { - this.accountTypeValue = accountTypeValue; - } - - public Long getRentContractId() { - return rentContractId; - } - - public void setRentContractId(Long rentContractId) { - this.rentContractId = rentContractId; - } - - public Integer getBusinessId() { - return businessId; - } - - public void setBusinessId(Integer businessId) { - this.businessId = businessId; - } - - public Integer getSubBusinessId() { - return subBusinessId; - } - - public void setSubBusinessId(Integer subBusinessId) { - this.subBusinessId = subBusinessId; - } - - public Integer getShopType() { - return shopType; - } - - public void setShopType(Integer shopType) { - this.shopType = shopType; - } - - public Long getBrand() { - return brand; - } - - public void setBrand(Long brand) { - this.brand = brand; - } - - public WxMerchantCorp getWxMerchantCorp() { - return wxMerchantCorp; - } - - public void setWxMerchantCorp(WxMerchantCorp wxMerchantCorp) { - this.wxMerchantCorp = wxMerchantCorp; - } - - public WxMerchantTax getWxMerchantTax() { - return wxMerchantTax; - } - - public void setWxMerchantTax(WxMerchantTax wxMerchantTax) { - this.wxMerchantTax = wxMerchantTax; - } - - - public String getAccountParameter() { - return accountParameter; - } - - public void setAccountParameter(String accountParameter) { - this.accountParameter = accountParameter; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getIsPublic() { - return isPublic; - } - - public void setIsPublic(Integer isPublic) { - this.isPublic = isPublic; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - - public String getIntroduction() { - return introduction; - } - - public void setIntroduction(String introduction) { - this.introduction = introduction; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); 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 637da1989..6e81b34ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -123,10 +123,6 @@ public class WxMerchantSubsidy extends BaseEntity { return orderPaymentStr; } - public void setOrderPaymentStr(String orderPaymentStr) { - this.orderPaymentStr = orderPaymentStr; - } - public String getReceiverPaymentStr() { if(getReceiverPayment()!=null) { receiverPaymentStr = new BigDecimal(getReceiverPayment()).divide(new BigDecimal(100)).toString(); @@ -134,10 +130,6 @@ public class WxMerchantSubsidy extends BaseEntity { return receiverPaymentStr; } - public void setReceiverPaymentStr(String receiverPaymentStr) { - this.receiverPaymentStr = receiverPaymentStr; - } - public String getSubsidyStr() { if(getSubsidy()!=null) { subsidyStr = new BigDecimal(getSubsidy()).divide(new BigDecimal(100)).toString(); @@ -145,10 +137,6 @@ public class WxMerchantSubsidy extends BaseEntity { return subsidyStr; } - public void setSubsidyStr(String subsidyStr) { - this.subsidyStr = subsidyStr; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 55c178ba1..3f209a30f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgCallback.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -7,6 +11,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_msg_callback") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMsgCallback extends BaseEntity{ @Id protected Long id; @@ -15,14 +22,6 @@ public class WxMsgCallback extends BaseEntity{ protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { @@ -30,134 +29,34 @@ public class WxMsgCallback extends BaseEntity{ return super.getSortColumns(); } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - @io.swagger.annotations.ApiModelProperty(value="回调ID",name="callbackId") private Long callbackId; - /*租户id**/ @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; - /*批次号**/ @io.swagger.annotations.ApiModelProperty(value="批次号",name="batchNo") private String batchNo; - /*手机号**/ @io.swagger.annotations.ApiModelProperty(value="手机号",name="phone") private String phone; - /*发送时间**/ @io.swagger.annotations.ApiModelProperty(value="发送时间",name="begintime") private Integer begintime; - /*结束时间**/ @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Integer endtime; - /*发送状态**/ @io.swagger.annotations.ApiModelProperty(value="发送状态",name="status") private Integer status; - /*发送状态信息**/ @io.swagger.annotations.ApiModelProperty(value="发送状态信息",name="statusMsg") private String statusMsg; - /*签名**/ @io.swagger.annotations.ApiModelProperty(value="签名",name="sign") private String sign; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - /*msgId**/ @io.swagger.annotations.ApiModelProperty(value="msgId",name="msgId") private Long msgId; - public Long getCallbackId() { - return callbackId; - } - - public void setCallbackId(Long callbackId) { - this.callbackId = callbackId; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getBatchNo() { - return batchNo; - } - public void setBatchNo(String _batchNo) { - batchNo = _batchNo; - } - public String getPhone() { - return phone; - } - public void setPhone(String _phone) { - phone = _phone; - } - public Integer getBegintime() { - return begintime; - } - public void setBegintime(Integer _begintime) { - begintime = _begintime; - } - public Integer getEndtime() { - return endtime; - } - public void setEndtime(Integer _endtime) { - endtime = _endtime; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public String getStatusMsg() { - return statusMsg; - } - public void setStatusMsg(String _statusMsg) { - statusMsg = _statusMsg; - } - public String getSign() { - return sign; - } - public void setSign(String _sign) { - sign = _sign; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - - - public Date getUpdatetime() { - return updatetime; - } - - public void setUpdatetime(Date updatetime) { - this.updatetime = updatetime; - } - - public Long getMsgId() { - return msgId; - } - - public void setMsgId(Long msgId) { - this.msgId = msgId; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 322ee9314..8b2069af8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; @@ -8,6 +12,9 @@ import java.util.Date; import java.util.List; @Table(name = "wx_msg_model") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMsgModel extends BaseEntity { @Id protected Long id; @@ -16,97 +23,29 @@ public class WxMsgModel extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*名称**/ @io.swagger.annotations.ApiModelProperty(value="名称",name="name") private String name; - /*签名**/ @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") private String signature; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="content") private String content; - /***/ @io.swagger.annotations.ApiModelProperty(value="",name="createtime") private Date createtime; - /*审核状态 0未通过 1 通过 2审核中**/ @io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId") private Integer modelId; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public String getSignature() { - return signature; - } - public void setSignature(String _signature) { - signature = _signature; - } - public String getContent() { - return content; - } - public void setContent(String _content) { - content = _content; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - - public Integer getModelId() { - return modelId; - } - - public void setModelId(Integer modelId) { - this.modelId = modelId; - } - public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 cca3f550d..6904dc2d2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgSignature.java @@ -1,5 +1,9 @@ package com.iformall.domain.po; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.*; import java.util.*; import javax.persistence.Transient; @@ -8,6 +12,9 @@ import javax.persistence.Id; import java.io.Serializable; @Table(name = "wx_msg_signature") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMsgSignature extends BaseEntity { @Id @@ -17,14 +24,6 @@ public class WxMsgSignature extends BaseEntity { protected List ids; @Transient protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { @@ -32,44 +31,12 @@ public class WxMsgSignature extends BaseEntity { return super.getSortColumns(); } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*签名**/ @io.swagger.annotations.ApiModelProperty(value="签名",name="name") private String name; - /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getName() { - return name; - } - public void setName(String _name) { - name = _name; - } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public static enum Field diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java index 34da19c2b..cf7ba937f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java @@ -8,54 +8,11 @@ import lombok.Data; * 场景营销数据VO */ +@Data public class MarkingSceneDataVo { private int triggerCount; //某日进车数量/某日核销数量/某日B端刷卡支付数量 private int sendCount; //场景营销发券数 private int verifiedCount; //场景营销券核销数 private String verifiedPercent; //场景营销核销比 private String xTime; //时间 - - public int getVerifiedCount() { - - return verifiedCount; - } - - public void setVerifiedCount(int verifiedCount) { - this.verifiedCount = verifiedCount; - } - - public String getVerifiedPercent() { - return verifiedPercent; - } - - public void setVerifiedPercent(String verifiedPercent) { - this.verifiedPercent = verifiedPercent; - } - - public int getTriggerCount() { - - return triggerCount; - } - - public void setTriggerCount(int triggerCount) { - this.triggerCount = triggerCount; - } - - public int getSendCount() { - return sendCount; - } - - public void setSendCount(int sendCount) { - this.sendCount = sendCount; - } - - - - public String getxTime() { - return xTime; - } - - public void setxTime(String xTime) { - this.xTime = xTime; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java index a67b87755..78559e7f7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java @@ -5,6 +5,7 @@ import lombok.Data; /** * Created by syf on 2018/8/30. */ +@Data public class TouchUsersReportVo { private String xTime; private int uv; @@ -15,62 +16,5 @@ public class TouchUsersReportVo { private int verifyUserCount; // 核销人数 private int verifyCount; //核销量 - public int getVerifyCount() { - return verifyCount; - } - - public void setVerifyCount(int verifyCount) { - this.verifyCount = verifyCount; - } - - - public String getxTime() { - return xTime; - } - - public void setxTime(String xTime) { - this.xTime = xTime; - } - - public int getUv() { - return uv; - } - - public void setUv(int uv) { - this.uv = uv; - } - - public int getPv() { - return pv; - } - - public void setPv(int pv) { - this.pv = pv; - } - - public int getUserCount() { - return userCount; - } - - public void setUserCount(int userCount) { - this.userCount = userCount; - } - - public int getCouponCount() { - return couponCount; - } - - public void setCouponCount(int couponCount) { - this.couponCount = couponCount; - } - - public int getVerifyUserCount() { - return verifyUserCount; - } - - public void setVerifyUserCount(int verifyUserCount) { - this.verifyUserCount = verifyUserCount; - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicInfoVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicInfoVo.java index d4aa75f03..b40efbe04 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicInfoVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserBasicInfoVo.java @@ -1,18 +1,15 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUserBasicInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCUserBasicInfoVo extends WxCUserBasicInfo { - /**用户tags*/ @io.swagger.annotations.ApiModelProperty(value="用户tags",name="tags") private String tags; - - public String getTags() { - return tags; - } - - public void setTags(String tags) { - this.tags = tags; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java index e32e41f2b..94c9735d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java @@ -2,12 +2,18 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUser; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.Date; /** * Created by syf on 2018/8/30. */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCUserVo extends WxCUser { // 等级名称 @@ -23,85 +29,4 @@ public class WxCUserVo extends WxCUser { private Integer upgradePercent; private Integer upgradeScore; - - public Date getBirthdate() { - return birthdate; - } - - public void setBirthdate(Date birthdate) { - this.birthdate = birthdate; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getLevelId() { - return levelId; - } - - public void setLevelId(Long levelId) { - this.levelId = levelId; - } - - public String getLevelName() { - return levelName; - } - - public void setLevelName(String levelName) { - this.levelName = levelName; - } - - - public Integer getDiscountRate() { - return discountRate; - } - - public void setDiscountRate(Integer discountRate) { - this.discountRate = discountRate; - } - - public Integer getAmount() { - return amount; - } - - public void setAmount(Integer amount) { - this.amount = amount; - } - - public Integer getUpgradePercent() { - return upgradePercent; - } - - public void setUpgradePercent(Integer upgradePercent) { - this.upgradePercent = upgradePercent; - } - - public Integer getUpgradeScore() { - return upgradeScore; - } - - public void setUpgradeScore(Integer upgradeScore) { - this.upgradeScore = upgradeScore; - } } 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 b88b2b49a..e1b30c1e4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -2,57 +2,51 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCardCVo extends WxCouponOrder { @Transient protected String sortColumns; - /* 券类型信息 */ - /**封面图**/ + /** 券类型信息 */ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ @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; - /*发券商户信息*/ - /**商户id**/ + /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") private Long merchantId; - /**使用商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; - /**卡信息*/ - /**卡面额总金额**/ @io.swagger.annotations.ApiModelProperty(value = "卡面额总金额", name = "amount") private Integer amount; - /**卡面额余额**/ @io.swagger.annotations.ApiModelProperty(value = "卡面额余额", name = "remainingAmount") private Integer remainingAmount; - /**卡消费信息*/ @io.swagger.annotations.ApiModelProperty(value="卡消费列表",name="cardSpendList") private List cardSpendList; @@ -68,121 +62,6 @@ public class WxCardCVo extends WxCouponOrder { @Transient protected String statusStr; - public List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public String getCoverImg() { - return coverImg; - } - public void setCoverImg(String _coverImg) { - coverImg = _coverImg; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public String getSubTitle() { - return subTitle; - } - public void setSubTitle(String _subTitle) { - subTitle = _subTitle; - } - public String getDetail() { - return detail; - } - public void setDetail(String _detail) { - detail = _detail; - } - public Integer getUnit() { - return unit; - } - public void setUnit(Integer unit) { - this.unit = unit; - } - - public String getRemark() { - return remark; - } - public void setRemark(String _remark) { - remark = _remark; - } - - public String getMerchantName() { - return merchantName; - } - public void setMerchantName(String _name) { - merchantName = _name; - } - - public Integer getAmount() { - return amount; - } - - public void setAmount(Integer amount) { - this.amount = amount; - } - - public Integer getRemainingAmount() { - return remainingAmount; - } - - public void setRemainingAmount(Integer remainingAmount) { - this.remainingAmount = remainingAmount; - } - - public List getCardSpendList() { - return cardSpendList; - } - - public void setCardSpendList(List cardSpendList) { - this.cardSpendList = cardSpendList; - } - - public List getStatusS() { - return statusS; - } - - public void setStatusS(List statusS) { - this.statusS = statusS; - } - - public String getStatusStr() { - return statusStr; - } - - public void setStatusStr(String statusStr) { - this.statusStr = statusStr; - } - - public Integer getSupportTransfer() { - return supportTransfer; - } - - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - - public Long getCouponChannelId() { - return couponChannelId; - } - - public void setCouponChannelId(Long couponChannelId) { - this.couponChannelId = couponChannelId; - } - 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"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index b354fa598..d7cbb770e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -15,34 +15,28 @@ import java.util.Date; public class WxCardSpendVo extends WxCardSpend { /**卡信息*/ - /**券名称**/ - @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + @io.swagger.annotations.ApiModelProperty(value="卡券名称",name="title") @Excel(name="卡名",width = 20,orderNum = "4") private String title; - /**使用商户名**/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") @Excel(name="商户",width = 20,orderNum = "5") private String merchantName; - /**补贴额(包含通道费)*/ @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidy") private Integer subsidy; - /**线上补贴额/实收补贴额(通道费扣除)*/ @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") private Integer realSubsidy; - /**补贴状态(0:未补贴, 1:已补贴)*/ @io.swagger.annotations.ApiModelProperty(value="补贴状态(0:未补贴, 1:已补贴)",name="status") private Integer status; - /**持有人昵称*/ - @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") @Excel(name="消费者",width = 20,orderNum = "2") + @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") private String onickName; - /**持有人绑定的手机号**/ - @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") + @Excel(name="手机号",width = 20,orderNum = "3") + @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index 2e628bc13..a0ac8af7b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -2,6 +2,9 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCoupon; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; @@ -9,22 +12,17 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; import java.util.List; + @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponCVo extends WxCoupon implements Serializable { private static final long serialVersionUID = 1L; - /*投放券频道id**/ @Id protected Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Transient private String salePriceStr; @@ -38,21 +36,13 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @Transient private Integer activityStatus; - public Integer getActivityStatus() { - return activityStatus; - } - - public void setActivityStatus(Integer activityStatus) { - this.activityStatus = activityStatus; - } - @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.列表, 2.限时抢购)",name="targetAd") private Integer targetAd; - /*发放相关参数*/ + /**发放相关参数*/ @io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime") private Date beginTime; @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endTime") @@ -67,43 +57,6 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "限制人数", name = "pressLimitNum") private Integer pressLimitNum; - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public Integer getTargetAd() { - return targetAd; - } - - public void setTargetAd(Integer targetAd) { - this.targetAd = targetAd; - } - - public List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - - public Date getBeginTime() { - return beginTime; - } - public void setBeginTime(Date _beginTime) { - beginTime = _beginTime; - } - public Date getEndTime() { - return endTime; - } - public void setEndTime(Date _endTime) { - endTime = _endTime; - } - public String getSalePriceStr() { if(getSalePrice()!=null) { salePriceStr = new BigDecimal(getSalePrice()).divide(new BigDecimal(100)).toString(); @@ -111,10 +64,6 @@ public class WxCouponCVo extends WxCoupon implements Serializable { return salePriceStr; } - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } - public String getUsePriceStr() { if(getUsePrice()!=null) { usePriceStr = new BigDecimal(getUsePrice()).divide(new BigDecimal(100)).toString(); @@ -122,38 +71,10 @@ public class WxCouponCVo extends WxCoupon implements Serializable { return usePriceStr; } - public void setUsePriceStr(String usePriceStr) { - this.usePriceStr = usePriceStr; - } - public String getPriceStr() { if(getPrice()!=null) { priceStr = new BigDecimal(getPrice()).divide(new BigDecimal(100)).toString(); } return priceStr; } - - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - - @Override - public Integer getSupportTransfer() { - return supportTransfer; - } - - @Override - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - - @Override - public Integer getPressLimitNum() { - return pressLimitNum; - } - - @Override - public void setPressLimitNum(Integer pressLimitNum) { - this.pressLimitNum = pressLimitNum; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java index 727ce8471..ebd3d62c2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCoupon; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; @@ -9,6 +12,9 @@ import java.text.DecimalFormat; import java.util.Date; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponCarVo extends WxCoupon implements Serializable { private static final long serialVersionUID = 1L; @@ -16,17 +22,4 @@ public class WxCouponCarVo extends WxCoupon implements Serializable { private String vendorType; @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") private String vendorParams; - - public String getVendorType() { - return vendorType; - } - public void setVendorType(String vendorType) { - this.vendorType = vendorType; - } - public String getVendorParams() { return vendorParams; } - public void setVendorParams(String vendorParams) { - this.vendorParams = vendorParams; - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java index 34a0cc8c3..e04e16bb8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelAddVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCoupon; +import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -9,6 +10,7 @@ import java.util.Date; * Created by syf on 2018/9/6. * 返回投放错误列表使用 */ +@Data public class WxCouponChannelAddVo implements Serializable { private static final long serialVersionUID = 1L; private Long couponId; @@ -17,14 +19,6 @@ public class WxCouponChannelAddVo implements Serializable { private Date validEndDate; private String errorMsg; - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - public WxCouponChannelAddVo toCouponChannnelVo(WxCoupon wxCoupon, Integer channelId){ if ( wxCoupon != null ) { this.couponId = wxCoupon.getId(); @@ -35,37 +29,4 @@ public class WxCouponChannelAddVo implements Serializable { this.channelId = channelId; return this; } - - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Integer getChannelId() { - return channelId; - } - - public void setChannelId(Integer channelId) { - this.channelId = channelId; - } - - public Date getValidEndDate() { - return validEndDate; - } - - public void setValidEndDate(Date validEndDate) { - this.validEndDate = validEndDate; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index 77eab7255..def8d2b2e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -2,6 +2,10 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponChannel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Transient; import java.io.Serializable; import java.math.BigDecimal; @@ -13,22 +17,15 @@ import java.util.List; * Created by syf on 2018/8/22. */ @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponChannelVo extends WxCouponChannel implements Serializable { private static final long serialVersionUID = 1L; @Transient private Integer activityStatus; - public Integer getActivityStatus() { - return activityStatus; - } - - public void setActivityStatus(Integer activityStatus) { - this.activityStatus = activityStatus; - } - - - @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") @@ -90,97 +87,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "砍价/拼团人数", name = "pressLimitNum") private Integer pressLimitNum; - - - - public Integer getGameWeight() { - return gameWeight; - } - - public void setGameWeight(Integer gameWeight) { - this.gameWeight = gameWeight; - } - - public Integer getInventory() { - return inventory; - } - - public void setInventory(Integer inventory) { - this.inventory = inventory; - } - - public Integer getRemainInventory() { - return remainInventory; - } - - public void setRemainInventory(Integer remainInventory) { - this.remainInventory = remainInventory; - } - - public String getCoverImg() { - return coverImg; - } - - public void setCoverImg(String coverImg) { - this.coverImg = coverImg; - } - - public String getSubTitle() { - return subTitle; - } - - public void setSubTitle(String subTitle) { - this.subTitle = subTitle; - } - - public Integer getSalePrice() { - return salePrice; - } - - public void setSalePrice(Integer salePrice) { - this.salePrice = salePrice; - } - - public Integer getUsePrice() { - return usePrice; - } - - public void setUsePrice(Integer usePrice) { - this.usePrice = usePrice; - } - - public void setPrice(Integer price) { - this.price = price; - } - - public Integer getPrice() { - return price; - } - - public Integer getUnit() { - return unit; - } - - public void setUnit(Integer unit) { - this.unit = unit; - } - - public Integer getUseLimitQuantity() { - return useLimitQuantity; - } - - public void setUseLimitQuantity(Integer useLimitQuantity) { - this.useLimitQuantity = useLimitQuantity; - } - - public Integer getSendType() { - return sendType; - } - - public void setSendType(Integer sendType) { - this.sendType = sendType; - } - @Override public String getSalePriceStr() { if(salePrice!=null) { @@ -188,10 +94,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { } return salePriceStr; } - - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } @Override public String getUsePriceStr() { if(usePrice!=null) { @@ -200,9 +102,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { return usePriceStr; } - public void setUsePriceStr(String usePriceStr) { - this.usePriceStr = usePriceStr; - } @Override public String getPriceStr() { if(price!=null) { @@ -211,26 +110,6 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { return priceStr; } - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - - public List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - - public Integer getSupportTransfer() { - return supportTransfer; - } - - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - @Override public String getTitle() { return title; @@ -240,60 +119,4 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setTitle(String title) { this.title = title; } - - public Integer getPressLimitNum() { - return pressLimitNum; - } - - public void setPressLimitNum(Integer pressLimitNum) { - this.pressLimitNum = pressLimitNum; - } - - public Integer getAutoRefund() { - return autoRefund; - } - - public void setAutoRefund(Integer autoRefund) { - this.autoRefund = autoRefund; - } - - public Integer getValidType() { - return validType; - } - - public void setValidType(Integer validType) { - this.validType = validType; - } - - public Date getValidStartDate() { - return validStartDate; - } - - public void setValidStartDate(Date validStartDate) { - this.validStartDate = validStartDate; - } - - public Date getValidEndDate() { - return validEndDate; - } - - public void setValidEndDate(Date validEndDate) { - this.validEndDate = validEndDate; - } - - public Integer getValidDays() { - return validDays; - } - - public void setValidDays(Integer validDays) { - this.validDays = validDays; - } - - public Integer getCreditPrice() { - return creditPrice; - } - - public void setCreditPrice(Integer creditPrice) { - this.creditPrice = creditPrice; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 6edc2eb4c..ed400f188 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -3,6 +3,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; @@ -10,6 +13,9 @@ import java.text.DecimalFormat; import java.util.Date; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponOrderBVo extends WxCouponOrder{ private static final long serialVersionUID = 6687954932922444531L; @@ -17,46 +23,33 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Excel(name="券码",width = 20) protected Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - /* 基础购买到的券信息 */ - /***/ + /** 基础购买到的券信息 */ @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") private String tenantId; - /*用户订单ID**/ + @Excel(name="订单号",width = 20) @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; - /*该订单对应券的实际过期时间**/ + @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - - - /*券名称**/ @Excel(name="券名称",width = 50) @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**c用户绑定的手机号**/ @Excel(name="用户手机号",width = 20) - @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") + @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") private String cUserPhone; - /***/ @Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss") - @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; @Transient @@ -67,51 +60,39 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Excel(name="交易价格",width = 20) private String salePriceStr; - /***/ - /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ @Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"}) @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") private Integer couponOrderStatus; - /***/ @Excel(name="核销/过期/退款时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") private Date updateDate; - /*单券实际购买价格**/ + @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") private Integer couponPrice; - - /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; - /*售价(适用于类型2,3,4,5)**/ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; - /*使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") private Integer usePrice; - /*面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /**b端用户姓名**/ @Excel(name="商户管理员(核销人)姓名",width = 50) @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") private String bUserName; - /**b端用户手机号**/ @Excel(name="商户管理员手机",width = 20) @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") private String bUserPhone; - /**使用券商户名**/ @Excel(name="使用券商户名",width = 50) @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") private String merchantName; - - /*发券商户信息*/ + /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; @@ -126,22 +107,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Transient private Integer couponType; - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - @Override public Long getCouponId() { return couponId; @@ -162,114 +127,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ this.couponType = couponType; } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getOrderId() { - return orderId; - } - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - public Date getExpiredTime() { - return expiredTime; - } - public void setExpiredTime(Date _expiredTime) { - expiredTime = _expiredTime; - } - public Integer getCouponOrderStatus() { - return couponOrderStatus; - } - public void setCouponOrderStatus(Integer _couponOrderStatus) { - couponOrderStatus = _couponOrderStatus; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Integer getCouponPrice() { - return couponPrice; - } - public void setCouponPrice(Integer _couponPrice) { - couponPrice = _couponPrice; - } - - - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public Integer getSalePrice() { - return salePrice; - } - public void setSalePrice(Integer _salePrice) { - salePrice = _salePrice; - } - public Integer getUsePrice() { - return usePrice; - } - public void setUsePrice(Integer _usePrice) { - usePrice = _usePrice; - } - public Integer getPrice() { - return price; - } - public void setPrice(Integer _price) { - price = _price; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public String getbUserName() { - return bUserName; - } - - public void setbUserName(String bUserName) { - this.bUserName = bUserName; - } - - public String getbUserPhone() { - return bUserPhone; - } - - public void setbUserPhone(String bUserPhone) { - this.bUserPhone = bUserPhone; - } - - public String getcUserPhone() { - return cUserPhone; - } - - public void setcUserPhone(String cUserPhone) { - this.cUserPhone = cUserPhone; - } - public String getSalePriceStr() { if(salePrice!=null) { DecimalFormat df=new DecimalFormat("0.00"); @@ -278,10 +135,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ return salePriceStr; } - public void setSalePriceStr(String salePriceStr) { - this.salePriceStr = salePriceStr; - } - public String getPriceStr() { if(price!=null) { DecimalFormat df=new DecimalFormat("0.00"); @@ -290,17 +143,4 @@ public class WxCouponOrderBVo extends WxCouponOrder{ return priceStr; } - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - - - public List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index fd708fd05..d1ce41a9a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -2,6 +2,9 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Transient; @@ -9,12 +12,11 @@ import java.util.Date; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponOrderCVo extends WxCouponOrder { - - /** - * - */ - private static final long serialVersionUID = 6687954932922444531L; + private static final long serialVersionUID = 6687954932922444531L; @Id @@ -25,263 +27,61 @@ public class WxCouponOrderCVo extends WxCouponOrder { @Transient protected String sortColumns; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - - public void setIds(List ids) { - this.ids = ids; - } - @Transient private Integer validStatus; - public Integer getValidStatus() { - return validStatus; - } - public void setValidStatus(Integer validStatus) { - this.validStatus = validStatus; - } - - - /* 基础购买到的券信息 */ - /***/ + /** 基础购买到的券信息 */ @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") private String tenantId; - /*单张券ID**/ @io.swagger.annotations.ApiModelProperty(value = "单张券ID", name = "couponId") private Long couponId; - /*用户订单ID**/ @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; - /*该订单对应券的实际过期时间**/ @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") private Integer couponOrderStatus; - /***/ @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") private Date createDate; - /***/ @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") private Date updateDate; - /*单券实际购买价格**/ @io.swagger.annotations.ApiModelProperty(value = "单券实际购买价格", name = "couponPrice") private Integer couponPrice; - /* 券类型信息 */ - /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + /** 券类型信息 */ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; - /*封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /*券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /*副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /*售价(适用于类型2,3,4,5)**/ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; - /*使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") private Integer usePrice; - /*面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /**单位**/ @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; - /**有效日期-开始**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; - /**有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /*发券商户信息*/ - /*使用商户名**/ + /**发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /*卡券来源**/ @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") private Integer sendChannelType; - /*发券商户信息*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") private List merchantVoList; - - public List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Long getOrderId() { - return orderId; - } - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - public Date getExpiredTime() { - return expiredTime; - } - public void setExpiredTime(Date _expiredTime) { - expiredTime = _expiredTime; - } - public Integer getCouponOrderStatus() { - return couponOrderStatus; - } - public void setCouponOrderStatus(Integer _couponOrderStatus) { - couponOrderStatus = _couponOrderStatus; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - public Integer getCouponPrice() { - return couponPrice; - } - public void setCouponPrice(Integer _couponPrice) { - couponPrice = _couponPrice; - } - - public Integer getType() { - return type; - } - public void setType(Integer _type) { - type = _type; - } - public String getCoverImg() { - return coverImg; - } - public void setCoverImg(String _coverImg) { - coverImg = _coverImg; - } - public String getTitle() { - return title; - } - public void setTitle(String _title) { - title = _title; - } - public String getSubTitle() { - return subTitle; - } - public void setSubTitle(String _subTitle) { - subTitle = _subTitle; - } - public Integer getSalePrice() { - return salePrice; - } - public void setSalePrice(Integer _salePrice) { - salePrice = _salePrice; - } - public Integer getUsePrice() { - return usePrice; - } - public void setUsePrice(Integer _usePrice) { - usePrice = _usePrice; - } - public String getDetail() { - return detail; - } - public void setDetail(String _detail) { - detail = _detail; - } - public Integer getPrice() { - return price; - } - public void setPrice(Integer _price) { - price = _price; - } - - public Integer getUnit() { - return unit; - } - public void setUnit(Integer unit) { - this.unit = unit; - } - - public String getRemark() { - return remark; - } - public void setRemark(String _remark) { - remark = _remark; - } - - public String getMerchantName() { - return merchantName; - } - public void setMerchantName(String _name) { - merchantName = _name; - } - - public Integer getSendChannelType() { - return sendChannelType; - } - - public void setSendChannelType(Integer sendChannelType) { - this.sendChannelType = sendChannelType; - } - - public Date getValidStartDate() { - return validStartDate; - } - - public void setValidStartDate(Date validStartDate) { - this.validStartDate = validStartDate; - } - - public Date getValidEndDate() { - return validEndDate; - } - - public void setValidEndDate(Date validEndDate) { - this.validEndDate = validEndDate; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java index 83b127674..f7d72e1d1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java @@ -1,26 +1,20 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCouponOrder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponOrderCarCVo extends WxCouponOrderCVo { - /** - * - */ private static final long serialVersionUID = 6687954932922444531L; - /*couponFreeId**/ @io.swagger.annotations.ApiModelProperty(value="couponFreeId",name="couponFreeId") private Integer couponFreeId; - public Integer getCouponFreeId() { - return couponFreeId; - } - - public void setCouponFreeId(Integer couponFreeId) { - this.couponFreeId = couponFreeId; - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java index ed760f3ba..dc1bf0020 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponSendVo.java @@ -4,80 +4,33 @@ import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxTags; import com.iformall.domain.po.WxTagsType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.io.Serializable; import java.util.Date; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponSendVo extends WxCouponSend implements Serializable{ - /*有效日期-开始**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") private Date validStartDate; - /*有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /*剩余库存**/ @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") private Integer remainInventory; - /**限领张数**/ @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") private Integer useLimitQuantity; - /*总库存**/ @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - /*发卷所属商户名**/ + /**发卷所属商户名**/ private String merchantName; - - public Date getValidStartDate() { - return validStartDate; - } - - public void setValidStartDate(Date validStartDate) { - this.validStartDate = validStartDate; - } - - public Date getValidEndDate() { - return validEndDate; - } - - public void setValidEndDate(Date validEndDate) { - this.validEndDate = validEndDate; - } - - public Integer getRemainInventory() { - return remainInventory; - } - - public void setRemainInventory(Integer remainInventory) { - this.remainInventory = remainInventory; - } - - public Integer getInventory() { - return inventory; - } - - public void setInventory(Integer inventory) { - this.inventory = inventory; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public Integer getUseLimitQuantity() { - return useLimitQuantity; - } - - public void setUseLimitQuantity(Integer useLimitQuantity) { - this.useLimitQuantity = useLimitQuantity; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java index 314a3806c..17fcea827 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponStatisVo.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCoupon; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.io.Serializable; @@ -10,6 +13,9 @@ import java.io.Serializable; * coupon 营销分析 * @date 2019/3/22 17:29 */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCouponStatisVo extends WxCoupon { @Transient @@ -19,11 +25,11 @@ public class WxCouponStatisVo extends WxCoupon { @Transient @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") - private Long saleCount; + private Integer saleCount; @Transient @io.swagger.annotations.ApiModelProperty(value="转增数量",name="transferCount") - private Long transferCount; + private Integer transferCount; @Transient @io.swagger.annotations.ApiModelProperty(value="售出金额",name="saleAmount") @@ -54,115 +60,10 @@ public class WxCouponStatisVo extends WxCoupon { private Integer sumSubsidy; @Transient - @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRate") - private String paymentRate; + @io.swagger.annotations.ApiModelProperty(value="核销比",name="paymentRateStr") + private String paymentRateStr; @Transient - @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRate") - private String changeRate; - - - public String getChangeRate() { - return changeRate; - } - - public void setChangeRate(String changeRate) { - this.changeRate = changeRate; - } - - public String getXtime() { - return xtime; - } - - public void setXtime(String xtime) { - this.xtime = xtime; - } - - public String getXcount() { - return xcount; - } - - public void setXcount(String xcount) { - this.xcount = xcount; - } - - public Long getSaleCount() { - return saleCount; - } - - public void setSaleCount(Long saleCount) { - this.saleCount = saleCount; - } - - public Long getTransferCount() { - return transferCount; - } - - public void setTransferCount(Long transferCount) { - this.transferCount = transferCount; - } - - public Integer getSaleAmount() { - return saleAmount; - } - - public void setSaleAmount(Integer saleAmount) { - this.saleAmount = saleAmount; - } - - public Integer getSumPayment() { - return sumPayment; - } - - public void setSumPayment(Integer sumPayment) { - this.sumPayment = sumPayment; - } - - public Integer getBackpayCount() { - return backpayCount; - } - - public void setBackpayCount(Integer backpayCount) { - this.backpayCount = backpayCount; - } - - public Integer getPressSendCount() { - return pressSendCount; - } - - public void setPressSendCount(Integer pressSendCount) { - this.pressSendCount = pressSendCount; - } - - public Integer getPressSuccCount() { - return pressSuccCount; - } - - public void setPressSuccCount(Integer pressSuccCount) { - this.pressSuccCount = pressSuccCount; - } - - public Integer getPressJoinCount() { - return pressJoinCount; - } - - public void setPressJoinCount(Integer pressJoinCount) { - this.pressJoinCount = pressJoinCount; - } - - public Integer getSumSubsidy() { - return sumSubsidy; - } - - public void setSumSubsidy(Integer sumSubsidy) { - this.sumSubsidy = sumSubsidy; - } - - public String getPaymentRate() { - return paymentRate; - } - - public void setPaymentRate(String paymentRate) { - this.paymentRate = paymentRate; - } + @io.swagger.annotations.ApiModelProperty(value="转化率",name="changeRateStr") + private String changeRateStr; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index 8b6056686..dd72774b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -3,173 +3,48 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxOrderPress; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.List; @JsonIgnoreProperties(value = {"handler"}) +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxOrderCouponPressVo extends WxOrder { - /** 券ID-产品ID将来的产品都会放在coupon表里**/ - @io.swagger.annotations.ApiModelProperty(value="券包中券ID",name="couponOrderId") + @io.swagger.annotations.ApiModelProperty(value="券ID-产品ID将来的产品都会放在coupon表里",name="couponOrderId") private Long couponOrderId; - /** 0: 未使用 1: 已核销 2:已过期 3:已退款**/ @io.swagger.annotations.ApiModelProperty(value="0: 未使用 1: 已核销 2:已过期 3:已退款",name="couponOrderStatus") private Integer couponOrderStatus; /**券类型信息 */ - /**商户id**/ - /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="couponType") private Integer couponType; - /**封面图**/ @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") private String coverImg; - /**券名称**/ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; - /**副标题**/ @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") private String subTitle; - /**售价(适用于类型2,3,4,5)**/ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; - /**使用条件金额(适用于类型1,2,3,4)**/ @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") private Integer usePrice; - /**面额**/ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /**单位**/ @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; - /**砍价/团购限制人数**/ @io.swagger.annotations.ApiModelProperty(value="砍价/团购限制人数",name="pressLimitNum") private Integer pressLimitNum; - /**砍价信息列表*/ @io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList") private List orderPressList; - - public Long getCouponOrderId() { - return couponOrderId; - } - - public void setCouponOrderId(Long couponOrderId) { - this.couponOrderId = couponOrderId; - } - - public Integer getCouponOrderStatus() { - return couponOrderStatus; - } - - public void setCouponOrderStatus(Integer couponOrderStatus) { - this.couponOrderStatus = couponOrderStatus; - } - - public Integer getCouponType() { - return couponType; - } - - public void setCouponType(Integer couponType) { - this.couponType = couponType; - } - - public String getCoverImg() { - return coverImg; - } - - public void setCoverImg(String coverImg) { - this.coverImg = coverImg; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getSubTitle() { - return subTitle; - } - - public void setSubTitle(String subTitle) { - this.subTitle = subTitle; - } - - public Integer getSalePrice() { - return salePrice; - } - - public void setSalePrice(Integer salePrice) { - this.salePrice = salePrice; - } - - public Integer getUsePrice() { - return usePrice; - } - - public void setUsePrice(Integer usePrice) { - this.usePrice = usePrice; - } - - public Integer getPrice() { - return price; - } - - public void setPrice(Integer price) { - this.price = price; - } - - public Integer getUnit() { - return unit; - } - - public void setUnit(Integer unit) { - this.unit = unit; - } - - @Override - public String getDetail() { - return detail; - } - - @Override - public void setDetail(String detail) { - this.detail = detail; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Integer getPressLimitNum() { - return pressLimitNum; - } - - public void setPressLimitNum(Integer pressLimitNum) { - this.pressLimitNum = pressLimitNum; - } - - public List getOrderPressList() { - return orderPressList; - } - - public void setOrderPressList(List orderPressList) { - this.orderPressList = orderPressList; - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index 012d981f5..129b92c9e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import javax.persistence.Transient; -import java.io.Serializable; import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java index e87ecfe17..58e295e6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java @@ -1,34 +1,13 @@ package com.iformall.domain.vo; +import lombok.Data; + import java.io.Serializable; +@Data public class WxOrderReportVo implements Serializable { private static final long serialVersionUID = 1L; private int count; private int amount; private String xTime; //时间 - - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } - - public int getAmount() { - return amount; - } - - public void setAmount(int amount) { - this.amount = amount; - } - - public String getxTime() { - return xTime; - } - - public void setxTime(String xTime) { - this.xTime = xTime; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java index 1f5c0ef26..9a50ddb25 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import java.beans.Transient; import java.util.Date; /** diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java index 12ee42c5e..77ebff914 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopRentRateVo.java @@ -1,26 +1,14 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; - +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxShopRentRateVo extends BaseEntity { private String xTime; private String rate; - - - public String getxTime() { - return xTime; - } - - public void setxTime(String xTime) { - this.xTime = xTime; - } - - public String getRate() { - return rate; - } - - public void setRate(String rate) { - this.rate = rate; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java index 50648cdac..61ff98b0a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxShopVo.java @@ -2,21 +2,23 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.domain.po.WxShop; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; - +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxShopVo extends WxShop { private static final long serialVersionUID = 6687964942922444531L; - - @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") @Excel(name="楼座",width = 20,orderNum = "3") + @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") private String buildingName; - /**楼层号**/ @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") @Excel(name="楼层",width = 20,orderNum = "4") private String floorName; - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; @@ -24,7 +26,6 @@ public class WxShopVo extends WxShop { @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; - /*联系方式**/ @io.swagger.annotations.ApiModelProperty(value="联系方式",name="linkPhone") @Excel(name="负责人电话",width = 20,orderNum = "12") private String linkPhone; @@ -40,72 +41,4 @@ public class WxShopVo extends WxShop { @io.swagger.annotations.ApiModelProperty(value="经营业态",name="business") @Excel(name="经营业态",width = 20,orderNum = "9") private String business; - - public String getBuildingName() { - return buildingName; - } - - public void setBuildingName(String buildingName) { - this.buildingName = buildingName; - } - - public String getFloorName() { - return floorName; - } - - public void setFloorName(String floorName) { - this.floorName = floorName; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - @Override - public String getLinkPhone() { - return linkPhone; - } - - @Override - public void setLinkPhone(String linkPhone) { - this.linkPhone = linkPhone; - } - - @Override - public String getLinkPerson() { - return linkPerson; - } - - @Override - public void setLinkPerson(String linkPerson) { - this.linkPerson = linkPerson; - } - - public String getBrandName() { - return brandName; - } - - public void setBrandName(String brandName) { - this.brandName = brandName; - } - - public String getBusiness() { - return business; - } - - public void setBusiness(String business) { - this.business = business; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java index 2a8610513..f807dbc20 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsGroupVo.java @@ -1,22 +1,20 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxTagsGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxTagsGroupVo extends WxTagsGroup implements Serializable{ private static final long serialVersionUID = 1786459967532225067L; private List types; - - public List getTypes() { - return types; - } - - public void setTypes(List types) { - this.types = types; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java index 86505d201..932339b65 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxTagsTypeVo.java @@ -2,20 +2,18 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxTags; import com.iformall.domain.po.WxTagsType; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.io.Serializable; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxTagsTypeVo extends WxTagsType implements Serializable{ private List tags; - public List getTags() { - return tags; - } - - public void setTags(List tags) { - this.tags = tags; - } - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 338eac98b..ebfd8f66c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -382,7 +382,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); List markingSceneDataVos = wxCarCmdLogMapper.queryForSceneRepotyHistoryCar(params); - triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getTriggerCount())); + triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); } else if(markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.B_MICROPAY.getCode())){ // B端刷卡支付发券 //获取B端刷卡数 params.clear(); @@ -393,7 +393,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); params.put("type", EnumOrderType.MICROPAY.getCode()); List markingSceneDataVos = wxOrderMapper.queryForSceneRepotyHistory(params); - triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getTriggerCount())); + triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); } else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.COUPON_VERIFY.getCode())) { //获取核销数 params.clear(); @@ -403,7 +403,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (markingCouponDataReportDto.getEndTime() != null) params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); List markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryVerified(params); - triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getTriggerCount())); + triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.C_ORDER.getCode())) { //购买发券数 params.clear(); @@ -413,13 +413,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (markingCouponDataReportDto.getEndTime() != null) params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); List markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyHistoryOrdered(params); - triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getTriggerCount())); + triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getTriggerCount())); } NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); for (MarkingSceneDataVo vo : list) { - vo.setVerifiedCount(countMap.get(vo.getxTime()) == null ? 0 : countMap.get(vo.getxTime())); - vo.setTriggerCount(triggerCountMap.get(vo.getxTime()) == null ? 0 : triggerCountMap.get(vo.getxTime())); + vo.setVerifiedCount(countMap.get(vo.getXTime()) == null ? 0 : countMap.get(vo.getXTime())); + vo.setTriggerCount(triggerCountMap.get(vo.getXTime()) == null ? 0 : triggerCountMap.get(vo.getXTime())); if(vo.getSendCount()==0){ vo.setVerifiedPercent("--"); }else { @@ -449,7 +449,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { // params.put("channelType", EnumCouponSendSendType.CAR_STOP.getCode()); // markingCouponDataReportDto.setCouponType(); List carStopList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); - Map countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); + Map countMap = carStopList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); for (String date:days) { historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); } @@ -462,7 +462,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //核销发券 // params.put("channelType", EnumCouponSendSendType.COUPON_VERIFY.getCode()); List couponVerifyList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); - countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); + countMap = couponVerifyList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); @@ -476,7 +476,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //交易发券 //params.put("channelType", EnumCouponSendSendType.C_ORDER.getCode()); List orderList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); - countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); + countMap = orderList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); @@ -490,7 +490,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { //收银台发券 // params.put("channelType", EnumCouponSendSendType.B_MICROPAY.getCode()); List micropayList = wxCouponActionLogMapper.sceneDataList(markingCouponDataReportDto); - countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getxTime, p -> p.getSendCount())); + countMap = micropayList.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXTime, p -> p.getSendCount())); historyMap = new TreeMap<>(); for (String date:days) { historyMap.put(date.substring(5,date.length()).replace("-","/"),"0"); @@ -536,14 +536,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { int lastWeekAmount = 0; for(String tj:tjTimeList){ - Optional first = list.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + Optional first = list.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); if(!first.isPresent()){ WxOrderReportVo orderReportVo = new WxOrderReportVo(); orderReportVo.setAmount(0); orderReportVo.setCount(0); first = Optional.of(orderReportVo); } - first.get().setxTime(tj.substring(5).replace("-", "/")); + first.get().setXTime(tj.substring(5).replace("-", "/")); wxOrderReportVoList.add(first.get()); if (LocalDate.now().equals(tj)){ todayCount = first.get().getCount(); @@ -615,14 +615,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { List wxOrderReportVoList = new ArrayList(); for(String tj:tjTimeList){ - Optional first = list.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + Optional first = list.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); if(!first.isPresent()){ WxOrderReportVo orderReportVo = new WxOrderReportVo(); orderReportVo.setAmount(0); orderReportVo.setCount(0); first = Optional.of(orderReportVo); } - first.get().setxTime(tj.substring(5).replace("-", "/")); + first.get().setXTime(tj.substring(5).replace("-", "/")); wxOrderReportVoList.add(first.get()); } return wxOrderReportVoList; @@ -670,13 +670,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { params2.put("endTime", markingCouponDataReportDto.getEndTime()); List couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2); - Map visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getxTime, p -> p)); + Map visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getXTime, p -> p)); for (TouchUsersReportVo temp:wxUserVisitList) { - if(visitMap.get(temp.getxTime())!=null){ - temp.setCouponCount(visitMap.get(temp.getxTime()).getCouponCount()); - temp.setUserCount(visitMap.get(temp.getxTime()).getUserCount()); - temp.setVerifyCount(visitMap.get(temp.getxTime()).getVerifyCount()); - temp.setVerifyUserCount(visitMap.get(temp.getxTime()).getVerifyUserCount()); + if(visitMap.get(temp.getXTime())!=null){ + temp.setCouponCount(visitMap.get(temp.getXTime()).getCouponCount()); + temp.setUserCount(visitMap.get(temp.getXTime()).getUserCount()); + temp.setVerifyCount(visitMap.get(temp.getXTime()).getVerifyCount()); + temp.setVerifyUserCount(visitMap.get(temp.getXTime()).getVerifyUserCount()); } } return new PageInfo<>(wxUserVisitList); @@ -698,7 +698,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { List tempDatalist =new LinkedList<>(); for(String tj:tjList){ - Optional first = wxUserVisitList.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + Optional first = wxUserVisitList.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); if(!first.isPresent()){ TouchUsersReportVo touchUsersReportVo = new TouchUsersReportVo(); touchUsersReportVo.setPv(0); @@ -707,7 +707,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { touchUsersReportVo.setUserCount(0); touchUsersReportVo.setVerifyCount(0); touchUsersReportVo.setVerifyUserCount(0); - touchUsersReportVo.setxTime(tj); + touchUsersReportVo.setXTime(tj); tempDatalist.add(touchUsersReportVo); continue; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 0ab290223..24cbe3139 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -355,7 +355,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { startC.setTime(new Date()); startC.add(Calendar.DAY_OF_YEAR, -30); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(param.getId()); + wxCouponOrder.setCUserId(param.getId()); wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(endC.getTime()); @@ -403,7 +403,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { startC.setTime(new Date()); startC.add(Calendar.DAY_OF_YEAR, -30); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(param.getId()); + wxCouponOrder.setCUserId(param.getId()); wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(endC.getTime()); @@ -465,7 +465,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { startC.add(Calendar.DAY_OF_YEAR, -30); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(param.getId()); + wxCouponOrder.setCUserId(param.getId()); wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(endC.getTime()); @@ -521,7 +521,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { startC.add(Calendar.DAY_OF_YEAR, -30); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(param.getId()); + wxCouponOrder.setCUserId(param.getId()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(new Date()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index a6ff095d1..6495c5ae6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -736,7 +736,7 @@ public class WxChartServiceImpl implements WxChartDataService { touchUsersReportVo.setUserCount(0); touchUsersReportVo.setVerifyCount(0); touchUsersReportVo.setVerifyUserCount(0); - touchUsersReportVo.setxTime(DateUtils.getSystemTime("MM/dd")); + touchUsersReportVo.setXTime(DateUtils.getSystemTime("MM/dd")); } datamap.put("yesterday", touchUsersReportVo); return new ResultData(datamap); @@ -823,7 +823,7 @@ public class WxChartServiceImpl implements WxChartDataService { List tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); List tempDatalist = new LinkedList<>(); for (String tj : tjList) { - Optional first = wxUserVisitList.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + Optional first = wxUserVisitList.stream().filter(c -> c.getXTime().equals(tj)).findFirst(); if (!first.isPresent()) { TouchUsersReportVo touchUsersReportVo = new TouchUsersReportVo(); touchUsersReportVo.setPv(0); @@ -832,7 +832,7 @@ public class WxChartServiceImpl implements WxChartDataService { touchUsersReportVo.setUserCount(0); touchUsersReportVo.setVerifyCount(0); touchUsersReportVo.setVerifyUserCount(0); - touchUsersReportVo.setxTime(tj); + touchUsersReportVo.setXTime(tj); tempDatalist.add(touchUsersReportVo); continue; } @@ -985,7 +985,7 @@ public class WxChartServiceImpl implements WxChartDataService { markingCouponDataReportDto.setEndTime(endTime); List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); String yesterday = DateUtils.getTimeBefore(1, new Date()); - List collect = list.parallelStream().filter(x -> x.getxTime().equals(yesterday)).collect(Collectors.toList()); + List collect = list.parallelStream().filter(x -> x.getXTime().equals(yesterday)).collect(Collectors.toList()); int yesterdayCount = 0; if (!collect.isEmpty()) { yesterdayCount = collect.get(0).getUv(); @@ -1092,7 +1092,7 @@ public class WxChartServiceImpl implements WxChartDataService { List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { - dateMap.put(vo.getxTime(), vo); + dateMap.put(vo.getXTime(), vo); } List weekVos = new ArrayList<>();//每周uv for (int i = 7, sortNum = 0; i >= 0; i--) { @@ -1220,7 +1220,7 @@ public class WxChartServiceImpl implements WxChartDataService { List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { - dateMap.put(vo.getxTime(), vo); + dateMap.put(vo.getXTime(), vo); } List monthVos = new ArrayList<>();//每月uv for (int i = 29, sortNum = 0; i >= 0; i--) { @@ -1275,7 +1275,7 @@ public class WxChartServiceImpl implements WxChartDataService { List list = wxUserVisitMapper.touchUsersReportList(markingCouponDataReportDto); Map dateMap = new HashMap<>(); for (TouchUsersReportVo vo : list) { - dateMap.put(vo.getxTime(), vo); + dateMap.put(vo.getXTime(), vo); } List monthVos = new ArrayList<>();//每月uv for (int i = 29, sortNum = 0; i >= 0; i--) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 031399c40..62c71a198 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -309,7 +309,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { int num = 0; try { couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - couponOrder.setbUserId(bUser.getId()); + couponOrder.setBUserId(bUser.getId()); couponOrder.setUpdateDate(new Date()); num = wxCouponOrderMapper.updateVerifyCouponOrder(couponOrder); } catch (Exception e) { @@ -793,7 +793,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } //转赠人是否存在 - Long cUserId = record.getcUserId(); + Long cUserId = record.getCUserId(); WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); @@ -827,7 +827,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //更新卡拥有者 try { - record.setcUserId(null); + record.setCUserId(null); record.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(record); } catch (Exception e) { @@ -846,7 +846,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } //转赠人是否存在 - Long cUserId = record.getcUserId(); + Long cUserId = record.getCUserId(); WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); @@ -880,7 +880,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxCardTransferInfo.setId(idWorker.nextId()); wxCardTransferInfo.setTenantId(cardCVo.getTenantId()); wxCardTransferInfo.setCouponOrderId(couponOrder.getId()); - wxCardTransferInfo.setFromUser(couponOrder.getcUserId()); + wxCardTransferInfo.setFromUser(couponOrder.getCUserId()); wxCardTransferInfo.setToUser(couponOrder.getOwnerId()); wxCardTransferInfo.setAmount(cardCVo.getAmount()); wxCardTransferInfo.setRemainAmount(cardCVo.getRemainingAmount()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index ec1d9c54d..e9f25f0a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -104,7 +104,7 @@ public class WxGameServiceImpl implements WxGameService { public ResultData addActionLog(Long userId, Long gameId, Long orderId) { WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(userId); + wxCouponOrder.setCUserId(userId); wxCouponOrder.setOrderId(orderId); if (orderId != 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 286db4adb..6413de64e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -221,7 +221,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxCouponOrder couponOrderQ = new WxCouponOrder(); couponOrderQ.setTenantId(user.getTenantId()); couponOrderQ.setCouponId(counpon.getId()); - couponOrderQ.setcUserId(user.getId()); + couponOrderQ.setCUserId(user.getId()); if (counpon.getSendType().equals(EnumCouponSendType.PASSIVE)) { couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); } @@ -489,7 +489,7 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setTenantId(user.getTenantId()); couponOrder.setCouponId(order.getProductId()); couponOrder.setCouponType(coupon.getType()); - couponOrder.setcUserId(user.getId()); + couponOrder.setCUserId(user.getId()); couponOrder.setOwnerId(user.getId()); couponOrder.setAutoRefund(coupon.getAutoRefund()); couponOrder.setOrderId(order.getOrderNumber()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 4a6dec16e..fcb615f4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -348,9 +348,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()); //3退款,券作废 } if (payType == EnumPayType.PAY_B_REFUND) { - wxCouponOrder.setbUserId(bUserId); + wxCouponOrder.setBUserId(bUserId); } else { - wxCouponOrder.setbUserId(payType.getCode().longValue());//其他退款模式将退款方式存入BUSERID + wxCouponOrder.setBUserId(payType.getCode().longValue());//其他退款模式将退款方式存入BUSERID } wxCouponOrder.setUpdateDate(currentDate); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java index 5d79dabe8..83af99b28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java @@ -39,7 +39,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { List wxUserCoupons = new ArrayList<>(); //查询订单表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setcUserId(userId); + wxCouponOrder.setCUserId(userId); wxCouponOrder.setCouponOrderStatus(status);//状态:0,待使用 1,已核销 2,已过期 3,已退款 List wxCouponOrders = wxCouponOrderMapper.findList(wxCouponOrder); if(wxCouponOrders.isEmpty()){ @@ -58,7 +58,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { public WxUserCouponDto getWxUserCoupon(WxCouponOrder wxCouponOrder, WxCoupon wxCoupon){ WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); wxUserCoupon.setOrderId(wxCouponOrder.getId()); - wxUserCoupon.setCUserId(wxCouponOrder.getcUserId()); + wxUserCoupon.setCUserId(wxCouponOrder.getCUserId()); wxUserCoupon.setCouponStatus(wxCouponOrder.getCouponOrderStatus()); wxUserCoupon.setCouponId(wxCouponOrder.getCouponId()); wxUserCoupon.setValidDate(wxCouponOrder.getExpiredTime());