diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java index 5da4f77b2..3d70f850a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java @@ -36,10 +36,10 @@ public class WxUserCouponController extends BaseController { public ResultData findByStatus(@RequestBody WxUserCouponDto wxUserCoupon) { logger.debug("[" + getIpAddr() + "] WxUserCouponController::findByStatus"); //根据用户id,用户卡券状态查找 - if(wxUserCoupon==null||wxUserCoupon.getcUserId()==null||wxUserCoupon.getCouponStatus()==null){ + if(wxUserCoupon==null||wxUserCoupon.getCUserId()==null||wxUserCoupon.getCouponStatus()==null){ return new ResultData(Result.ERROR,"查询失败"); } - return new ResultData(Result.SUCCESS,"查询成功",wxUserCouponService.findList(wxUserCoupon.getcUserId(),wxUserCoupon.getCouponStatus())); + return new ResultData(Result.SUCCESS,"查询成功",wxUserCouponService.findList(wxUserCoupon.getCUserId(),wxUserCoupon.getCouponStatus())); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 4a6c271f9..d82145cc3 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -75,11 +75,11 @@ public class WxCUserController extends BaseController { if (StringUtils.isEmpty(wxCUserFromBDto.getAppId())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端appId不能为空"); } - if (wxCUserFromBDto.getbUserId() == null) { + if (wxCUserFromBDto.getBUserId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "bUserId不能为空"); } //根据bUserId查询B端用户是否存在 - WxMerchantBUser bUser = wxMerchantBUserService.getById(wxCUserFromBDto.getbUserId()); + WxMerchantBUser bUser = wxMerchantBUserService.getById(wxCUserFromBDto.getBUserId()); if (bUser == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "B端用户不存在"); } @@ -121,7 +121,7 @@ public class WxCUserController extends BaseController { wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); //新增来自B端的会员关联数据 wxCUserFromB = new WxCUserFromB(); - wxCUserFromB.setbUserId(wxCUserFromBDto.getbUserId()); + wxCUserFromB.setbUserId(wxCUserFromBDto.getBUserId()); wxCUserFromB.setcUserId(wxCUserBasicInfo.getId()); wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); wxCUserFromB.setMerchantId(bUser.getMerchantId()); @@ -151,7 +151,7 @@ public class WxCUserController extends BaseController { wxCUserBasicInfoService.save(wxCUserBasicInfo); //新增来自B端的会员关联数据 wxCUserFromB = new WxCUserFromB(); - wxCUserFromB.setbUserId(wxCUserFromBDto.getbUserId()); + wxCUserFromB.setbUserId(wxCUserFromBDto.getBUserId()); wxCUserFromB.setcUserId(cUserId); wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); wxCUserFromB.setMerchantId(bUser.getMerchantId()); @@ -217,7 +217,7 @@ public class WxCUserController extends BaseController { if (StringUtils.isEmpty(wxCUserFromBDto.getAppId())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端appid不能为空"); } - if (wxCUserFromBDto.getbUserId() == null) { + if (wxCUserFromBDto.getBUserId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "bUserId不能为空"); } WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 0db8c4760..104919694 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -136,7 +136,7 @@ public class CouponOrderExpiringSchedule { wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); - wxSharingOrderDto.setcUserId(wxPayOrder.getcUserId()); + wxSharingOrderDto.setCUserId(wxPayOrder.getcUserId()); wxSharingOrderDto.setMerchantId(0L); wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 746b00649..d28184976 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -2,6 +2,9 @@ package com.iformall.domain.dto; import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.util.Date; @@ -9,7 +12,10 @@ import java.util.Date; /** * Created by syf on 2018/8/30. */ -public class MarkingCouponDataReportDto extends BaseEntity{ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class MarkingCouponDataReportDto extends BaseEntity { private Date startTime; private Date endTime; @@ -36,58 +42,4 @@ public class MarkingCouponDataReportDto extends BaseEntity{ super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - - public Integer getChannelType() { - return channelType; - } - - public void setChannelType(Integer channelType) { - this.channelType = channelType; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - 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 getCouponType() { return couponType; } - - public void setCouponType(Integer couponType) { - this.couponType = couponType; - } - - public String getCouponTitle() { - return couponTitle; - } - - public void setCouponTitle(String couponTitle) { - this.couponTitle = couponTitle; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingSceneDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingSceneDataReportDto.java index 80557a18e..8b2b55840 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingSceneDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingSceneDataReportDto.java @@ -1,36 +1,15 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.util.Date; /** * Created by syf on 2018/8/30. */ +@Data public class MarkingSceneDataReportDto { private Date startTime; private Date endTime; private Integer type; - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - 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; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java index d2df1c5fd..1e0f5e21c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoDto.java @@ -1,5 +1,7 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; import java.util.List; @@ -11,6 +13,7 @@ import javax.persistence.Transient; * @author jinguo * */ +@Data public class WxCUserBasicInfoDto implements Serializable{ /** @@ -33,9 +36,8 @@ public class WxCUserBasicInfoDto implements Serializable{ @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; - /*租户id**/ -// @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") @Transient + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; @Transient @@ -76,172 +78,10 @@ public class WxCUserBasicInfoDto implements Serializable{ @Transient protected String sortColumns; - //1 查询导入的数据 @Transient + @io.swagger.annotations.ApiModelProperty(value="1查询导入的数据",name="queryImport") protected Integer queryImport; @Transient protected List filterList; - - public Integer getQueryImport() { - return queryImport; - } - - public void setQueryImport(Integer queryImport) { - this.queryImport = queryImport; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Date getBirthStartTime() { - return birthStartTime; - } - - public void setBirthStartTime(Date birthStartTime) { - this.birthStartTime = birthStartTime; - } - - public Date getBirthEndTime() { - return birthEndTime; - } - - public void setBirthEndTime(Date birthEndTime) { - this.birthEndTime = birthEndTime; - } - - public Date getLoginStartTime() { - return loginStartTime; - } - - public void setLoginStartTime(Date loginStartTime) { - this.loginStartTime = loginStartTime; - } - - public Date getLoginEndTime() { - return loginEndTime; - } - - public void setLoginEndTime(Date loginEndTime) { - this.loginEndTime = loginEndTime; - } - - public Date getVerifiedStartTime() { - return verifiedStartTime; - } - - public void setVerifiedStartTime(Date verifiedStartTime) { - this.verifiedStartTime = verifiedStartTime; - } - - public Date getVerifiedEndTime() { - return verifiedEndTime; - } - - public void setVerifiedEndTime(Date verifiedEndTime) { - this.verifiedEndTime = verifiedEndTime; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - 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 getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - - public Integer getLevelEndScore() { - return levelEndScore; - } - - public void setLevelEndScore(Integer levelEndScore) { - this.levelEndScore = levelEndScore; - } - - public Integer getLevelStartScore() { - - return levelStartScore; - } - - public void setLevelStartScore(Integer levelStartScore) { - this.levelStartScore = levelStartScore; - } - - public List getTagIds() { - return tagIds; - } - - public void setTagIds(List tagIds) { - this.tagIds = tagIds; - } - - public String getPhones() { - return phones; - } - - public void setPhones(String phones) { - this.phones = phones; - } - - public String getSortColumns() { - return sortColumns; - } - - public void setSortColumns(String sortColumns) { - this.sortColumns = sortColumns; - } - - public List getFilterList() { - return filterList; - } - - public void setFilterList(List filterList) { - this.filterList = filterList; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java index 3e37e6048..2f5a31278 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterDto.java @@ -1,5 +1,7 @@ package com.iformall.domain.dto; +import lombok.Data; + import javax.persistence.Id; import javax.persistence.Transient; import java.io.Serializable; @@ -11,38 +13,12 @@ import java.util.List; * @author jinguo * */ +@Data public class WxCUserBasicInfoFilterDto implements Serializable{ - /** - * - */ private static final long serialVersionUID = -1116465873573690766L; Long typeId; Long id; String param; - - public Long getTypeId() { - return typeId; - } - - public void setTypeId(Long typeId) { - this.typeId = typeId; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getParam() { - return param; - } - - public void setParam(String param) { - this.param = param; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterListDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterListDto.java index db89ff99d..c4800e5d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterListDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserBasicInfoFilterListDto.java @@ -1,5 +1,7 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.List; @@ -8,29 +10,11 @@ import java.util.List; * @author jinguo * */ +@Data public class WxCUserBasicInfoFilterListDto implements Serializable{ - /** - * - */ private static final long serialVersionUID = -1116465873573690766L; String name; List tagList; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getTagList() { - return tagList; - } - - public void setTagList(List tagList) { - this.tagList = tagList; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java index 99b3a5274..df47816c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java @@ -1,9 +1,12 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; +@Data public class WxCUserFromBDto implements Serializable { private static final long serialVersionUID = 1L; @@ -25,76 +28,4 @@ public class WxCUserFromBDto implements Serializable { private String phone; @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") private Long merchantId; - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - - public String getOpenid() { - return openid; - } - - public void setOpenid(String openid) { - this.openid = openid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public Date getBirthdate() { - return birthdate; - } - - public void setBirthdate(Date birthdate) { - this.birthdate = birthdate; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java index 88f9dc216..e99a5a518 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponChannelDto.java @@ -1,9 +1,12 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; +@Data public class WxCouponChannelDto implements Serializable { private static final long serialVersionUID = 1L; private Long couponId; @@ -11,43 +14,4 @@ public class WxCouponChannelDto implements Serializable { private String channelId; private Date beginTime; private Date endTime; - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - public String getChannelId() { - return channelId; - } - - public void setChannelId(String channelId) { - this.channelId = channelId; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public String getCouponIds() { - return couponIds; - } - - public void setCouponIds(String couponIds) { - this.couponIds = couponIds; - } - public Date getBeginTime() { - return beginTime; - } - - public void setBeginTime(Date beginTime) { - this.beginTime = beginTime; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java index 7c86cd9f2..f9de82d0d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCouponMerchantDto.java @@ -1,45 +1,15 @@ package com.iformall.domain.dto; -import java.io.Serializable; +import lombok.Data; +import java.io.Serializable; +@Data public class WxCouponMerchantDto implements Serializable { private static final long serialVersionUID = 1L; Long merchantId; String parameter; Integer business; Integer subBusiness; - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public String getParameter() { - return parameter; - } - - public void setParameter(String parameter) { - this.parameter = parameter; - } - - public Integer getBusiness() { - return business; - } - - public void setBusiness(Integer business) { - this.business = business; - } - - public Integer getSubBusiness() { - return subBusiness; - } - - public void setSubBusiness(Integer subBusiness) { - this.subBusiness = subBusiness; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCreditHistoryDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCreditHistoryDto.java deleted file mode 100644 index 9a2c7746a..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCreditHistoryDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.iformall.domain.dto; - -public class WxCreditHistoryDto { -} diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index ab2375be6..826ca0be7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -13,7 +13,7 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class WxOrderReportDto extends BaseEntity{ +public class WxOrderReportDto extends BaseEntity { private String tenantId; private Long merchantId; private String merchantName; diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java index 26ea06b84..1d4e14624 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxSharingOrderDto.java @@ -1,112 +1,33 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; - +@Data public class WxSharingOrderDto implements Serializable { private static final long serialVersionUID = 1L; - /**租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /**订单ID**/ @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; - /**用户ID**/ - @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") + @io.swagger.annotations.ApiModelProperty(value="c用户ID",name="cUserId") private Long cUserId; - /**微信生成的订单号**/ @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") private String transactionId; - /**支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") private Integer payAmount; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") private Long merchantId; - /**分账金额(总金额扣除手续费后的金额)**/ - @io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount") + @io.swagger.annotations.ApiModelProperty(value="分账金额(总金额扣除手续费后的金额)",name="shareAmount") private Integer shareAmount; - /**支付发起时间**/ @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") private Date payTimeStart; - /**支付结束时间**/ @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") private Date payTimeEnd; - /**分账订单类型**/ @io.swagger.annotations.ApiModelProperty(value="分账订单类型",name="type") private Integer type; - - - public String getTenantId() { - return tenantId; - } - public Long getOrderId() { - return orderId; - } - public void setOrderId(Long _orderId) { - orderId = _orderId; - } - - public Long getcUserId() { - return cUserId; - } - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Integer getPayAmount() { - return payAmount; - } - public void setPayAmount(Integer _payAmount) { - payAmount = _payAmount; - } - public Date getPayTimeStart() { - return payTimeStart; - } - public void setPayTimeStart(Date _payTimeStart) { - payTimeStart = _payTimeStart; - } - public Date getPayTimeEnd() { - return payTimeEnd; - } - public void setPayTimeEnd(Date _payTimeEnd) { - payTimeEnd = _payTimeEnd; - } - - public String getTransactionId() { - return transactionId; - } - public void setTransactionId(String _transactionId) { - transactionId = _transactionId; - } - - public Integer getShareAmount() { - return shareAmount; - } - public void setShareAmount(Integer shareAmount) { - this.shareAmount = shareAmount; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxUserCouponDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxUserCouponDto.java index 47e11b7ca..576bdc856 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxUserCouponDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxUserCouponDto.java @@ -1,5 +1,7 @@ package com.iformall.domain.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; @@ -7,6 +9,7 @@ import java.util.Date; * Created by syf on 2018/8/10. * 用户卡券 */ +@Data public class WxUserCouponDto implements Serializable { private static final long serialVersionUID = 1L; @@ -16,54 +19,4 @@ public class WxUserCouponDto implements Serializable { private Long couponId; private String couponTitle; private Date validDate; - - public WxUserCouponDto(){ - } - - public Integer getCouponStatus() { - return couponStatus; - } - - public void setCouponStatus(Integer couponStatus) { - this.couponStatus = couponStatus; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Long getCouponId() { - return couponId; - } - - public void setCouponId(Long couponId) { - this.couponId = couponId; - } - - public String getCouponTitle() { - return couponTitle; - } - - public void setCouponTitle(String couponTitle) { - this.couponTitle = couponTitle; - } - public Date getValidDate() { - return validDate; - } - - public void setValidDate(Date validDate) { - this.validDate = validDate; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java index 72265a901..e664a3d44 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/AmountRecordVo.java @@ -2,18 +2,18 @@ package com.iformall.domain.vo; import java.io.Serializable; import java.text.DecimalFormat; +import com.iformall.domain.po.WxDateAmountRecord; +import lombok.Data; + /** * 交易记录核销记录Vo * @author jinguo * */ -import com.iformall.domain.po.WxDateAmountRecord; +@Data public class AmountRecordVo implements Serializable{ - /** - * - */ private static final long serialVersionUID = 4494858079134918638L; //核销金额记录 private WxDateAmountRecord amountDetail; @@ -32,31 +32,4 @@ public class AmountRecordVo implements Serializable{ return amountStr; } - public void setMouthAndDate(String mouthAndDate) { - this.mouthAndDate = mouthAndDate; - } - - public String getMouthAndDate() {return mouthAndDate;} - - public void setAmountStr(String amountStr) { - this.amountStr = amountStr; - } - - - public Integer getAmount() { - return amount; - } - - public void setAmount(Integer amount) {this.amount = amount;} - - public WxDateAmountRecord getAmountDetail() { - return amountDetail; - } - - public void setAmountDetail(WxDateAmountRecord amountDetail) { - this.amountDetail = amountDetail; - } - - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java index 17257a9fb..dae49e3aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseInfoT.java @@ -1,54 +1,47 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; import javax.persistence.Transient; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; import java.io.Serializable; +@Data public class CUserBaseInfoT implements Serializable { - /**用户姓名**/ + @Excel(name="姓名",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") private String name; - /**性别:0:保密 1.男 2女**/ @Excel(name="性别",width = 20,replace = { "保密_0", "男_1","女_2"},orderNum = "2") @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 @Pattern(regexp = "1[0123456789]\\d{9}", message = "手机号不正确") 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") @io.swagger.annotations.ApiModelProperty(value="学历",name="education") private String education; - /**出生日期**/ @Excel(name="生日",width = 20,orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") private String birthdate; - /**积分**/ @Excel(name="积分",width = 20,orderNum = "7") @io.swagger.annotations.ApiModelProperty(value="积分",name="credit") private String credit; - /**地址**/ @Excel(name="地址",width = 20,orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="地址",name="address") private String address; - /**更新时间**/ @Excel(name="上次活跃时间",width = 20, orderNum = "9") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private String updateDate; - /**创建时间**/ @Excel(name="注册时间",width = 20, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private String createDate; @@ -60,100 +53,4 @@ public class CUserBaseInfoT implements Serializable { @Transient @Excel(name="成长值",width = 20,orderNum = "12") private String poins; - - public String getName() { - return name; - } - - public void setName(@NotNull String name) { - this.name = name; - } - - public Integer getSex() { - return sex; - } - - public void setSex(@NotNull Integer sex) { - this.sex = sex; - } - - public String getPhone() { - return phone; - } - - public void setPhone(@NotNull String phone) { - this.phone = phone; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getEducation() { - return education; - } - - public void setEducation(@NotNull String education) { - this.education = education; - } - - public String getBirthdate() { - return birthdate; - } - - public void setBirthdate(@NotNull String birthdate) { - this.birthdate = birthdate; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getUpdateDate() { - return updateDate; - } - - public void setUpdateDate(String updateDate) { - this.updateDate = updateDate; - } - - public String getCreateDate() { - return createDate; - } - - public void setCreateDate(String createDate) { - this.createDate = createDate; - } - - public String getTagNames() { - return tagNames; - } - - public void setTagNames(String tagNames) { - this.tagNames = tagNames; - } - - public String getPoins() { - return poins; - } - - public void setPoins(String poins) { - this.poins = poins; - } - - public String getCredit() { - return credit; - } - - public void setCredit(String credit) { - this.credit = credit; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseVo.java index 9b4e56638..57d09b5ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserBaseVo.java @@ -2,19 +2,17 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUserBasicInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; /** * Created by syf on 2018/8/30. */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class CUserBaseVo extends WxCUserBasicInfo { private Long newId; - - public Long getNewId() { - return newId; - } - - public void setNewId(Long newId) { - this.newId = newId; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java index 08fbc0dfc..0fce01079 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/CUserTagVo.java @@ -1,19 +1,17 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUserTags; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; /** * Created by syf on 2018/8/30. */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class CUserTagVo extends WxCUserTags { private Long newUserId; - - public Long getNewUserId() { - return newUserId; - } - - public void setNewUserId(Long newUserId) { - this.newUserId = newUserId; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java index 07661dece..31f2adaf1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserInfoVo.java @@ -1,7 +1,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.MallUserInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class MallUserInfoVo extends MallUserInfo { @io.swagger.annotations.ApiModelProperty(value="商场名",name="mallName") private String mallName; @@ -11,36 +17,4 @@ public class MallUserInfoVo extends MallUserInfo { private String imgUrl; @io.swagger.annotations.ApiModelProperty(value="商场图标",name="imgUrlH") private String imgUrlH; - - public String getMallName() { - return mallName; - } - - public void setMallName(String mallName) { - this.mallName = mallName; - } - - public String getMallGroup() { - return mallGroup; - } - - public void setMallGroup(String mallGroup) { - this.mallGroup = mallGroup; - } - - public String getImgUrl() { - return imgUrl; - } - - public void setImgUrl(String _imgUrl) { - this.imgUrl = _imgUrl; - } - - public String getImgUrlH() { - return imgUrlH; - } - - public void setImgUrlH(String imgUrlH) { - this.imgUrlH = imgUrlH; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingCouponDataReportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingCouponDataReportVo.java index 2e83115d4..ec18130cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingCouponDataReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingCouponDataReportVo.java @@ -1,92 +1,30 @@ package com.iformall.domain.vo; +import lombok.Data; + /** * Created by syf on 2018/8/28. */ +@Data public class MarkingCouponDataReportVo { - - //券领取张数 couponCount - //券领取人数 couponUserCount - //券核销张数 verifyCount - //券核销人数 verifyUserCount private String createTime; - 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 String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - private Long couponId; //券id private String title; //券名称 private String type; //券类型 - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public int getCouponCount() { - return couponCount; - } - - public void setCouponCount(int couponCount) { - this.couponCount = couponCount; - } - - public int getCouponUserCount() { - return couponUserCount; - } - - public void setCouponUserCount(int couponUserCount) { - this.couponUserCount = couponUserCount; - } - - public int getVerifyCount() { - return verifyCount; - } - - public void setVerifyCount(int verifyCount) { - this.verifyCount = verifyCount; - } - - public int getVerifyUserCount() { - return verifyUserCount; - } - - public void setVerifyUserCount(int verifyUserCount) { - this.verifyUserCount = verifyUserCount; - } - + // 券领取张数 couponCount private int couponCount; + // 券领取人数 couponUserCount private int couponUserCount; + // 券核销张数 verifyCount private int verifyCount; + // 券核销人数 verifyUserCount private int verifyUserCount; } 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 3a0c8cba9..34da19c2b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MarkingSceneDataVo.java @@ -1,16 +1,19 @@ package com.iformall.domain.vo; +import lombok.Data; + /** * Created by syf on 2018/8/30. * * 场景营销数据VO */ + public class MarkingSceneDataVo { private int triggerCount; //某日进车数量/某日核销数量/某日B端刷卡支付数量 private int sendCount; //场景营销发券数 private int verifiedCount; //场景营销券核销数 private String verifiedPercent; //场景营销核销比 - private String xTime; //时间 + private String xTime; //时间 public int getVerifiedCount() { 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 9da1c4156..a67b87755 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/TouchUsersReportVo.java @@ -1,5 +1,7 @@ package com.iformall.domain.vo; +import lombok.Data; + /** * Created by syf on 2018/8/30. */ @@ -8,9 +10,10 @@ public class TouchUsersReportVo { private int uv; private int pv; - private int userCount; //领取人数 - private int couponCount; //领取券数 - private int verifyUserCount; //核销人数 + private int userCount; // 领取人数 + private int couponCount; // 领取券数 + private int verifyUserCount; // 核销人数 + private int verifyCount; //核销量 public int getVerifyCount() { return verifyCount; @@ -20,7 +23,6 @@ public class TouchUsersReportVo { this.verifyCount = verifyCount; } - private int verifyCount; //核销量 public String getxTime() { return xTime; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserStructureVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserStructureVo.java index 7d344dec8..64bd34efc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/UserStructureVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserStructureVo.java @@ -1,5 +1,7 @@ package com.iformall.domain.vo; +import lombok.Data; + import java.io.Serializable; import java.text.DecimalFormat; /** @@ -7,11 +9,10 @@ import java.text.DecimalFormat; * @author jinguo * */ -public class UserStructureVo implements Serializable{ - /** - * - */ +@Data +public class UserStructureVo implements Serializable { + private static final long serialVersionUID = 6780570955120276660L; //名称 private String name; @@ -26,12 +27,6 @@ public class UserStructureVo implements Serializable{ private String priceStr; - public Integer getPrice() { - return price; - } - public void setPrice(Integer price) { - this.price = price; - } public String getPriceStr() { if(price!=null) { DecimalFormat df=new DecimalFormat("0.00"); @@ -39,34 +34,5 @@ public class UserStructureVo implements Serializable{ } return priceStr; } - public void setPriceStr(String priceStr) { - this.priceStr = priceStr; - } - public Integer getSortNum() { - return sortNum; - } - public void setSortNum(Integer sortNum) { - this.sortNum = sortNum; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public long getCount() { - return count; - } - public void setCount(long count) { - this.count = count; - } - public String getPercentage() { - return percentage; - } - public void setPercentage(String percentage) { - this.percentage = percentage; - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index 9d8ee5209..c98104372 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -2,6 +2,9 @@ package com.iformall.domain.vo; import com.iformall.common.SortColumn; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.util.List; @@ -9,6 +12,9 @@ import java.util.List; /** * @author gongbiao */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillAll extends BaseEntity { @Override public String getSortColumns() { @@ -99,184 +105,7 @@ public class WxBillAll extends BaseEntity { @SortColumn(column = "shopNumber") private String shopNumber; - - @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") @Transient + @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") private Integer filterHasPay; - - public Integer getFilterHasPay() { - return filterHasPay; - } - - public void setFilterHasPay(Integer filterHasPay) { - this.filterHasPay = filterHasPay; - } - - public List getBillTypeList() { - return billTypeList; - } - - public void setBillTypeList(List billTypeList) { - this.billTypeList = billTypeList; - } - - public Integer getRentOwe() { - return rentOwe; - } - - public void setRentOwe(Integer rentOwe) { - this.rentOwe = rentOwe; - } - - public Integer getPropertyOwe() { - return propertyOwe; - } - - public void setPropertyOwe(Integer propertyOwe) { - this.propertyOwe = propertyOwe; - } - - public Integer getDepositOwe() { - return depositOwe; - } - - public void setDepositOwe(Integer depositOwe) { - this.depositOwe = depositOwe; - } - - public Integer getOtherOwe() { - return otherOwe; - } - - public void setOtherOwe(Integer otherOwe) { - this.otherOwe = otherOwe; - } - - public Integer getTotalOwe() { - return totalOwe; - } - - public void setTotalOwe(Integer totalOwe) { - this.totalOwe = totalOwe; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public Integer getPageIndex() { - return pageIndex; - } - - public void setPageIndex(Integer pageIndex) { - this.pageIndex = pageIndex; - } - - public Integer getPageSize() { - return pageSize; - } - - public void setPageSize(Integer pageSize) { - this.pageSize = pageSize; - } - - public List getStatusList() { - return statusList; - } - - public void setStatusList(List statusList) { - this.statusList = statusList; - } - - public List getTypeList() { - return typeList; - } - - public void setTypeList(List typeList) { - this.typeList = typeList; - } - - public String getStarttime() { - return starttime; - } - - public void setStarttime(String starttime) { - this.starttime = starttime; - } - - public String getEndtime() { - return endtime; - } - - public void setEndtime(String endtime) { - this.endtime = endtime; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public Integer getBillTypeValue() { - return billTypeValue; - } - - public void setBillTypeValue(Integer billTypeValue) { - this.billTypeValue = billTypeValue; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getMonth() { - return month; - } - - public void setMonth(String month) { - this.month = month; - } - - public Integer getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index 073b57599..37bd3c4b2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; import java.math.BigDecimal; import java.util.Date; @@ -8,6 +9,7 @@ import java.util.Date; /** * @author gongbiao */ +@Data public class WxBillAllVo { private Long id; @@ -61,183 +63,6 @@ public class WxBillAllVo { private String shopInfo; - public String getShopInfo() { - return shopInfo; - } - - public void setShopInfo(String shopInfo) { - this.shopInfo = shopInfo; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long merchantId) { - this.merchantId = merchantId; - } - - public Long getShopId() { - return shopId; - } - - public void setShopId(Long shopId) { - this.shopId = shopId; - } - - public Integer getBillTypeValue() { - return billTypeValue; - } - - public void setBillTypeValue(Integer billTypeValue) { - this.billTypeValue = billTypeValue; - } - - public String getBillType() { - return billType; - } - - public void setBillType(String billType) { - this.billType = billType; - } - - public Long getNeedPay() { - return needPay; - } - - public void setNeedPay(Long needPay) { - this.needPay = needPay; - } - - public Long getReceivePay() { - return receivePay; - } - - public void setReceivePay(Long receivePay) { - this.receivePay = receivePay; - } - - public Long getPay() { - return pay; - } - - public void setPay(Long pay) { - this.pay = pay; - } - - public Long getOwe() { - return owe; - } - - public void setOwe(Long owe) { - this.owe = owe; - } - - public Date getReceiveDate() { - return receiveDate; - } - - public void setReceiveDate(Date receiveDate) { - this.receiveDate = receiveDate; - } - - public Date getPayDate() { - return payDate; - } - - public void setPayDate(Date payDate) { - this.payDate = payDate; - } - - public Integer getExpiredDay() { - return expiredDay; - } - - public void setExpiredDay(Integer expiredDay) { - this.expiredDay = expiredDay; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - 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 getRentShopType() { - return rentShopType; - } - - public void setRentShopType(Integer rentShopType) { - this.rentShopType = rentShopType; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public String getManager() { - return manager; - } - - public void setManager(String manager) { - this.manager = manager; - } - - public String getManagerPhone() { - return managerPhone; - } - - public void setManagerPhone(String managerPhone) { - this.managerPhone = managerPhone; - } - public String getReceivePayStr() { if(getReceivePay()!=null) { @@ -257,18 +82,10 @@ public class WxBillAllVo { return payStr; } - public void setPayStr(String payStr) { - this.payStr = payStr; - } - public String getOweStr() { if(getOwe()!=null) { oweStr = new BigDecimal(getOwe()).divide(new BigDecimal(100)).toString(); } return oweStr; } - - public void setOweStr(String oweStr) { - this.oweStr = oweStr; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java index ea1453373..af664e82a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java @@ -3,12 +3,18 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.domain.po.WxBillDaily; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.validation.constraints.NotNull; /** * @author gongbiao */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxBillDailyVo extends WxBillDaily { @Excel(name = "商铺号", width = 20, orderNum = "1") @@ -26,28 +32,4 @@ public class WxBillDailyVo extends WxBillDaily { @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr") private String payStr; - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public String getReceivePayStr() { - return receivePayStr; - } - - public void setReceivePayStr(String receivePayStr) { - this.receivePayStr = receivePayStr; - } - - public String getPayStr() { - return payStr; - } - - public void setPayStr(String payStr) { - this.payStr = payStr; - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java index a238bf606..1282cef75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCreditHistoryVo.java @@ -24,19 +24,19 @@ public class WxCreditHistoryVo { @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") private Long cUserId; - /**总积分*/ + @io.swagger.annotations.ApiModelProperty(value="总积分",name="creditAmount") private Integer creditAmount; - /**每笔积分明细*/ + @io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum") private Integer creditNum; - /**积分类型*/ + @io.swagger.annotations.ApiModelProperty(value="积分类型",name="creditType") private Integer creditType; - /**创建日期*/ + @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") private Date createDate; - /**小票URL*/ + @io.swagger.annotations.ApiModelProperty(value="小票URL",name="receiptUrl") private String receiptUrl; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java index e13621261..03f9f7af1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxLevelMerchantCVo.java @@ -1,73 +1,30 @@ package com.iformall.domain.vo; +import lombok.Data; + import javax.persistence.Id; +import java.io.Serializable; -public class WxLevelMerchantCVo { +@Data +public class WxLevelMerchantCVo implements Serializable { private static final long serialVersionUID = 6687964942922444531L; @Id protected Long id; - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - /**商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /**联系方式**/ @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") private String merchantLinkPhone; @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") private String shopNumber; - /**楼座号**/ @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") private String buildingName; - /**楼层号**/ @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; - /**折扣**/ @io.swagger.annotations.ApiModelProperty(value="折扣",name="discount") private Integer discount; - public String getBuildingName() {return buildingName; } - public void setBuildingName(String _building) { - buildingName = _building; - } - public String getFloorName() { - return floorName; - } - public void setFloorName(String _floor) { - floorName = _floor; - } - public String getShopNumber() { - return shopNumber; - } - public void setShopNumber(String _shopNumber) { - shopNumber = _shopNumber; - } - - public String getMerchantName() { - return merchantName; - } - public void setMerchantName(String _name) { - merchantName = _name; - } - public String getMerchantLinkPhone() { - return merchantLinkPhone; - } - public void setMerchantLinkPhone(String _linkPhone) { - merchantLinkPhone = _linkPhone; - } - - public Integer getDiscount() { - return discount; - } - - public void setDiscount(Integer discount) { - this.discount = discount; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java index 294fca55d..39a2b0960 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantMicroPayVo.java @@ -1,77 +1,24 @@ package com.iformall.domain.vo; -import javax.persistence.Id; -import java.io.Serializable; +import lombok.Data; +import java.io.Serializable; +@Data public class WxMerchantMicroPayVo implements Serializable { private static final long serialVersionUID = 1L; - /*商户id**/ protected Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - /*交易额**/ @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") private Integer tradeAmt; - /*日期**/ @io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") private String reportDate; - /*商户电话**/ - @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") + @io.swagger.annotations.ApiModelProperty(value = "商户电话", name = "merchantPhone") private String merchantPhone; - /*商户名**/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Integer getTradeAmt() { - return tradeAmt; - } - - public void setTradeAmt(Integer _tradeAmt) { - tradeAmt = _tradeAmt; - } - - public String getMerchantPhone() { - return merchantPhone; - } - - public void setMerchantPhone(String merchantPhone) { - this.merchantPhone = merchantPhone; - } - - public String getReportDate() { - return reportDate; - } - - public void setReportDate(String _reportDate) { - reportDate = _reportDate; - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java index ab8c80314..6177bb153 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSimpleVo.java @@ -6,11 +6,9 @@ import lombok.Data; @Data public class WxMerchantSimpleVo { - /**id**/ @ApiModelProperty(value="id",name="id") private Long id; - /**商户名**/ @ApiModelProperty(value="商户名",name="merchantName") private String merchantName; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java index 4ae3769d6..c4ca7d28d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java @@ -1,11 +1,18 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.Id; import javax.persistence.Transient; import java.util.Date; import java.util.List; +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMerchantTradeDailyVo extends BaseEntity { @Id protected Long id; @@ -19,173 +26,40 @@ public class WxMerchantTradeDailyVo 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; - } - - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; - /*商户id**/ @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; - /*b用户id**/ @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") private Long bUserId; - /*交易额**/ @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") private Integer tradeAmt; - /*提交日期**/ @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 = "reportDate") private String reportDate; - /*商户名**/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") private String merchantName; - /*b端用户姓名**/ @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "bUserName") private String bUserName; - /*B端用户手机号**/ @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "bUserPhone") private String bUserPhone; - /*交易笔数**/ @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") private Integer tradeCount; - /*凭证**/ @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") private String proof; @Transient private Integer isToday; - public Integer getIsToday() { - return isToday; - } - - public void setIsToday(Integer isToday) { - this.isToday = isToday; - } - - public Integer getTradeCount() { - return tradeCount; - } - - public void setTradeCount(Integer tradeCount) { - this.tradeCount = tradeCount; - } - - public String getProof() { - return proof; - } - - public void setProof(String proof) { - this.proof = proof; - } - - 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 getTenantId() { - return tenantId; - } - - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - - public Long getMerchantId() { - return merchantId; - } - - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - - - public Long getbUserId() { - return bUserId; - } - - public void setbUserId(Long bUserId) { - this.bUserId = bUserId; - } - public Integer getTradeAmt() { - return tradeAmt; - } - - public void setTradeAmt(Integer _tradeAmt) { - tradeAmt = _tradeAmt; - } - - 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 getReportDate() { - return reportDate; - } - - public void setReportDate(String _reportDate) { - reportDate = _reportDate; - } - - 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/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 828019d7d..76154bff7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -1,59 +1,43 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; import javax.persistence.Id; import java.util.List; + @JsonIgnoreProperties(value = {"handler"}) +@Data public class WxMerchantVo { private static final long serialVersionUID = 6687964942922444531L; @Id protected Long id; - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - /*发券商户信息*/ - /**商户图片**/ + /** 发券商户信息 */ @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") private String merchantImgUrl; - /**商户名**/ @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; - /**联系方式**/ @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") private String merchantLinkPhone; - /**商户状态**/ @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") private Integer merchantStatus; - /**商户业态**/ @io.swagger.annotations.ApiModelProperty(value="商户业态",name="businessId") private Integer businessId; - /**商户子业态**/ @io.swagger.annotations.ApiModelProperty(value="商户子业态",name="subBusinessId") private Integer subBusinessId; - /**商户业态**/ @io.swagger.annotations.ApiModelProperty(value="商户业态",name="parameter") private String parameter; - /**地址**/ @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") private String addr; - /**百度poi(省市区县street等)**/ @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") private String baiduPoi; - /**商铺编号**/ @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") private String shopNumber; - /**楼座号**/ @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") private String buildingName; - /**楼层号**/ @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") private String floorName; @@ -91,164 +75,4 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value = "品牌简介", name = "summary") private String summary; - public String getSummary() { - return summary; - } - - public void setSummary(String summary) { - this.summary = summary; - } - - 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 Integer getShopType() { - return shopType; - } - - public void setShopType(Integer shopType) { - this.shopType = shopType; - } - - public String getBusinessName() { - return businessName; - } - - public void setBusinessName(String businessName) { - this.businessName = businessName; - } - - public String getBrandName() { - return brandName; - } - - public void setBrandName(String brandName) { - this.brandName = brandName; - } - - public String getBrandImg() { - return brandImg; - } - - public void setBrandImg(String brandImg) { - this.brandImg = brandImg; - } - - public List getShopVoList() { - return shopVoList; - } - - public void setShopVoList(List shopVoList) { - this.shopVoList = shopVoList; - } - - public Integer getIsPublic() { - return isPublic; - } - - public void setIsPublic(Integer isPublic) { - this.isPublic = isPublic; - } - - public String getBuildingName() {return buildingName; } - public void setBuildingName(String _building) { - buildingName = _building; - } - public String getFloorName() { - return floorName; - } - public void setFloorName(String _floor) { - floorName = _floor; - } - public String getShopNumber() { - return shopNumber; - } - public void setShopNumber(String _shopNumber) { - shopNumber = _shopNumber; - } - public String getBaiduPoi() { - return baiduPoi; - } - public void setBaiduPoi(String _baiduPoi) { - baiduPoi = _baiduPoi; - } - public String getAddr() { - return addr; - } - public void setAddr(String _addr) { - addr = _addr; - } - - 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 String getMerchantImgUrl() { - return merchantImgUrl; - } - public void setMerchantImgUrl(String _imgUrl) { - merchantImgUrl = _imgUrl; - } - - public String getMerchantName() { - return merchantName; - } - public void setMerchantName(String _name) { - merchantName = _name; - } - public String getMerchantLinkPhone() { - return merchantLinkPhone; - } - public void setMerchantLinkPhone(String _linkPhone) { - merchantLinkPhone = _linkPhone; - } - public Integer getMerchantStatus() { - return merchantStatus; - } - public void setMerchantStatus(Integer status) { - this.merchantStatus = status; - } - - public String getParameter() { - return parameter; - } - - public void setParameter(String parameter) { - this.parameter = parameter; - } - - } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxNotRentShopVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxNotRentShopVo.java index 5a4191355..69000203c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxNotRentShopVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxNotRentShopVo.java @@ -1,7 +1,9 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +@Data public class WxNotRentShopVo { @Excel(name="商铺类型",width = 20,orderNum = "1", @@ -19,60 +21,4 @@ public class WxNotRentShopVo { private String operationArea; @Excel(name="闲置时间(天)",width = 20,orderNum = "7") private Long freeDay; - - public String getPointType() { - return pointType; - } - - public void setPointType(String pointType) { - this.pointType = pointType; - } - - public String getShopNumber() { - return shopNumber; - } - - public void setShopNumber(String shopNumber) { - this.shopNumber = shopNumber; - } - - public String getBuilding() { - return building; - } - - public void setBuilding(String building) { - this.building = building; - } - - public String getFloor() { - return floor; - } - - public void setFloor(String floor) { - this.floor = floor; - } - - public String getBuildArea() { - return buildArea; - } - - public void setBuildArea(String buildArea) { - this.buildArea = buildArea; - } - - public String getOperationArea() { - return operationArea; - } - - public void setOperationArea(String operationArea) { - this.operationArea = operationArea; - } - - public Long getFreeDay() { - return freeDay; - } - - public void setFreeDay(Long freeDay) { - this.freeDay = freeDay; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index b0ef7660a..105c1f4cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -1,6 +1,7 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; import javax.persistence.Transient; import java.util.Date; @@ -8,324 +9,82 @@ import java.util.List; @JsonIgnoreProperties(value = {"handler"}) +@Data public class WxOrderCouponVo { - /** - * - */ private static final long serialVersionUID = 6687964932922444531L; protected Long id; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - @Transient private Integer validStatus; - public Integer getValidStatus() { - return validStatus; - } - - public void setValidStatus(Integer validStatus) { - this.validStatus = validStatus; - } - - - - /* 基础购买到的券信息 */ - - /*订单码;正反向交易保持一致。**/ + /** 基础购买到的券信息 */ @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") private Long orderNumber; - /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; - /*商户ID**/ - /**渠道ID**/ @io.swagger.annotations.ApiModelProperty(value="渠道ID",name="couponChannelId") private Long couponChannelId; - /*产品ID**/ @io.swagger.annotations.ApiModelProperty(value="产品ID",name="productId") private Long productId; - /*0: 付款 1: 退款**/ @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") private Integer paymentType; - /*支付金额(分):允许有负数,退款时为负值。**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") private Integer payment; - /*支付时间**/ @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") private Date paymentTime; - /*订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败**/ @io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败",name="orderStatus") private Integer orderStatus; - /*创建时间**/ @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="validStartDate") private Date validStartDate; - /**有效日期-结束**/ @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; - /*券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="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="merchantVoList") private List merchantVoList; - /*卡券来源**/ + /** 卡券来源 */ @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") private Integer sendChannelType; @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") private Integer supportTransfer; - - public Long getOrderNumber() { - return orderNumber; - } - public void setOrderNumber(Long _orderNumber) { - orderNumber = _orderNumber; - } - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCUserId() { - return cUserId; - } - public void setCUserId(Long _cUserId) { - cUserId = _cUserId; - } - - public Long getCouponChannelId() { - return couponChannelId; - } - - public void setCouponChannelId(Long couponChannelId) { - this.couponChannelId = couponChannelId; - } - - public Long getProductId() { - return productId; - } - public void setProductId(Long _productId) { - this.productId = _productId; - } - - public Integer getPaymentType() { - return paymentType; - } - public void setPaymentType(Integer _paymentType) { - paymentType = _paymentType; - } - public Integer getPayment() { - return payment; - } - public void setPayment(Integer _payment) { - payment = _payment; - } - public Date getPaymentTime() { - return paymentTime; - } - public void setPaymentTime(Date _paymentTime) { - paymentTime = _paymentTime; - } - public Integer getOrderStatus() { - return orderStatus; - } - public void setOrderStatus(Integer _orderStatus) { - orderStatus = _orderStatus; - } - 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 getCouponOrderId() { - return couponOrderId; - } - public void setCouponOrderId(Long _couponOrderId) { - this.couponOrderId = _couponOrderId; - } - public Integer getCouponOrderStatus() { - return couponOrderStatus; - } - public void setCouponOrderStatus(Integer _couponOrderStatus) { - couponOrderStatus = _couponOrderStatus; - } - - 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 List getMerchantVoList() { - return merchantVoList; - } - - public void setMerchantVoList(List merchantVoList) { - this.merchantVoList = merchantVoList; - } - - public String getRemark() { - return remark; - } - public void setRemark(String _remark) { - remark = _remark; - } - - public Integer getSendChannelType() { - return sendChannelType; - } - - public void setSendChannelType(Integer sendChannelType) { - this.sendChannelType = sendChannelType; - } - - public Long getcUserId() { - return cUserId; - } - - public void setcUserId(Long cUserId) { - this.cUserId = cUserId; - } - - public Integer getSupportTransfer() { - return supportTransfer; - } - - public void setSupportTransfer(Integer supportTransfer) { - this.supportTransfer = supportTransfer; - } - - 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/WxOrderPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java index 1db93c881..806f5c3e7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java @@ -3,15 +3,15 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxOrderPress; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxOrderPressVo extends WxOrderPress { - /**用户昵称**/ @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName") private String nickName; - /**用户头像地址**/ @io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl") private String avatarUrl; 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 60c14baeb..012d981f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; import java.io.Serializable; @@ -9,6 +12,9 @@ import java.util.Date; /** * @author gongbiao */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") @@ -28,56 +34,9 @@ public class WxOrderQueryVo extends BaseEntity { @Transient private Integer orderStatus; - public Integer getOrderStatus() { - return orderStatus; - } - - public void setOrderStatus(Integer orderStatus) { - this.orderStatus = orderStatus; - } - @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - 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 getPayment() { - return payment; - } - - public void setPayment(Integer payment) { - this.payment = payment; - } } 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 7e640de02..e87ecfe17 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderReportVo.java @@ -1,10 +1,6 @@ package com.iformall.domain.vo; -import javax.persistence.Id; -import javax.persistence.Transient; import java.io.Serializable; -import java.util.Date; -import java.util.List; public class WxOrderReportVo implements Serializable { private static final long serialVersionUID = 1L; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java index dbe705cdd..eecd53496 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java @@ -1,11 +1,14 @@ package com.iformall.domain.vo; +import lombok.Data; + import java.io.Serializable; import java.util.Date; /** * @author gongbiao */ +@Data public class WxProfitSharingOrderDetailsVo implements Serializable { private static final long serialVersionUID = 1L; @@ -22,109 +25,4 @@ public class WxProfitSharingOrderDetailsVo implements Serializable { private String receiverComments; private Integer sharingType; private Integer status; - - - public Long getId() { - return Id; - } - - public void setId(Long id) { - Id = id; - } - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - public Integer getPayAmount() { - return payAmount; - } - - public void setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Integer getSharingStatus() { - return sharingStatus; - } - - public void setSharingStatus(Integer sharingStatus) { - this.sharingStatus = sharingStatus; - } - - public String getFinishTime() { - return finishTime; - } - - public void setFinishTime(String finishTime) { - this.finishTime = finishTime; - } - - public String getFailedReason() { - return failedReason; - } - - public void setFailedReason(String failedReason) { - this.failedReason = failedReason; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getReceiverType() { - return receiverType; - } - - public void setReceiverType(Integer receiverType) { - this.receiverType = receiverType; - } - - public String getReceiverAccount() { - return receiverAccount; - } - - public void setReceiverAccount(String receiverAccount) { - this.receiverAccount = receiverAccount; - } - - public String getReceiverComments() { - return receiverComments; - } - - public void setReceiverComments(String receiverComments) { - this.receiverComments = receiverComments; - } - - public Integer getSharingType() { - return sharingType; - } - - public void setSharingType(Integer sharingType) { - this.sharingType = sharingType; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } } 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 fa1ecdd20..1f5c0ef26 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderQueryVo.java @@ -1,6 +1,9 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.beans.Transient; import java.util.Date; @@ -8,6 +11,9 @@ import java.util.Date; /** * @author gongbiao */ +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxProfitSharingOrderQueryVo extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="tenantId",name="tenantId") @@ -36,60 +42,4 @@ public class WxProfitSharingOrderQueryVo extends BaseEntity { super.setSortColumns(this.sortColumns); return super.getSortColumns(); } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getSharingStatus() { - return sharingStatus; - } - - public void setSharingStatus(Integer sharingStatus) { - this.sharingStatus = sharingStatus; - } - - 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 String getMerchantName() { - return merchantName; - } - - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; - } - - 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; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index 8e29ed635..0b142e0dd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -1,11 +1,14 @@ package com.iformall.domain.vo; +import lombok.Data; + import java.io.Serializable; import java.util.Date; /** * @author gongbiao */ +@Data public class WxProfitSharingOrderVo implements Serializable { private static final long serialVersionUID = 1L; @@ -25,132 +28,4 @@ public class WxProfitSharingOrderVo implements Serializable { private Integer sharingStatus; private Date updateTime; private Date createTime; - - 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 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; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } - - public Integer getPayAmount() { - return payAmount; - } - - public void setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - } - - public Date getPayTimeEnd() { - return payTimeEnd; - } - - public void setPayTimeEnd(Date payTimeEnd) { - this.payTimeEnd = payTimeEnd; - } - - public Date getPayTimeStart() { - return payTimeStart; - } - - public void setPayTimeStart(Date payTimeStart) { - this.payTimeStart = payTimeStart; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - public String getSharingOrderNo() { - return sharingOrderNo; - } - - public void setSharingOrderNo(String sharingOrderNo) { - this.sharingOrderNo = sharingOrderNo; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getReceivers() { - return receivers; - } - - public void setReceivers(String receivers) { - this.receivers = receivers; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public Integer getSharingStatus() { - return sharingStatus; - } - - public void setSharingStatus(Integer sharingStatus) { - this.sharingStatus = sharingStatus; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java index ed9cad7dc..1969c5cbd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappAuditStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappAuditStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappAuditStatusVo extends WxWeappAuditStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java index c91d1df16..3baf43af2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappCodeStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappCodeStatusVo extends WxWeappCodeStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java index 1be27ae9f..ef0b2306f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java @@ -3,11 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxAuthorizerInfo; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.ArrayList; import java.util.List; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappInfo extends WxAuthorizerInfo { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java index 6601de595..94f111898 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappReleaseStatusVo.java @@ -3,12 +3,13 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxWeappReleaseStatus; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class WxWeappReleaseStatusVo extends WxWeappReleaseStatus { - - /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java index 02228798c..17035e1a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java @@ -60,7 +60,7 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Override public WxCUserFromB getByOpenidAndAppId(WxCUserFromBDto wxCUserFromBDto) { - WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxCUserFromBDto.getbUserId()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxCUserFromBDto.getBUserId()); if (wxMerchantBUser == null) { return null; } @@ -71,7 +71,7 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Override public PageInfo listCUser(WxCUserFromBDto wxCUserFromBDto, Integer pageIndex, Integer pageSize) { WxCUserFromB record = new WxCUserFromB(); - record.setbUserId(wxCUserFromBDto.getbUserId()); + record.setbUserId(wxCUserFromBDto.getBUserId()); return PageHelper.startPage(pageIndex, pageSize) .doSelectPageInfo(() -> wxCUserFromBMapper.findList(record)); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 2dbd977b7..8e7313644 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -338,7 +338,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 分账完结 WxSharingOrderDto shareOrder = new WxSharingOrderDto(); - shareOrder.setcUserId(couponOrder.getOwnerId()); + shareOrder.setCUserId(couponOrder.getOwnerId()); shareOrder.setTenantId(tenantId); shareOrder.setMerchantId(0L); // 卡完结,默认给0 shareOrder.setTransactionId(cardInfo.getTransactionId()); @@ -399,7 +399,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if (cardSpend != null && cardInfo != null && merchant != null) { // 分账 WxSharingOrderDto shareOrder = new WxSharingOrderDto(); - shareOrder.setcUserId(cardSpend.getOwnerId()); + shareOrder.setCUserId(cardSpend.getOwnerId()); shareOrder.setMerchantId(cardSpend.getMerchantId()); shareOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()); shareOrder.setPayAmount(cardSpend.getPayment()); 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 77cfed67c..d0b02a240 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -378,7 +378,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); - wxSharingOrderDto.setcUserId(wxPayOrder.getcUserId()); + wxSharingOrderDto.setCUserId(wxPayOrder.getcUserId()); wxSharingOrderDto.setMerchantId(merchantId); wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); 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 271af949e..26abb27a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1002,7 +1002,7 @@ public class WxOrderServiceImpl implements WxOrderService { if (wxPayOrder != null && wxMerchantBUser != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { WxSharingOrderDto sharingOrder = new WxSharingOrderDto(); - sharingOrder.setcUserId(wxPayOrder.getcUserId()); + sharingOrder.setCUserId(wxPayOrder.getcUserId()); sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index f0e867280..79dcb4418 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -244,7 +244,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxAppinfo appInfo = getAppinfo(sharingOrderDto.getcUserId()); + WxAppinfo appInfo = getAppinfo(sharingOrderDto.getCUserId()); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); //准备分账列表 @@ -565,7 +565,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxAppinfo appInfo = getAppinfo(sharingOrderDto.getcUserId()); + WxAppinfo appInfo = getAppinfo(sharingOrderDto.getCUserId()); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); 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 46d33524c..5d79dabe8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java @@ -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());