From 5fabce02a12a30e07bbb94c3b82ef50ac2b15411 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 14 Mar 2019 14:22:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=8C=85][=E4=BF=AE=E6=94=B9]:setCUs?= =?UTF-8?q?erId->setcUserId,setBUserId->setbUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxCUserBasicInfoController.java | 2 +- .../iformall/controller/WxCarController.java | 4 +-- .../controller/WxCouponOrderController.java | 8 ++--- .../iformall/controller/WxGameController.java | 2 +- .../com/iformall/domain/po/WxCouponOrder.java | 32 +++++-------------- .../iformall/domain/vo/WxCouponOrderBVo.java | 29 +---------------- .../iformall/domain/vo/WxCouponOrderCVo.java | 20 +----------- .../impl/WxCouponOrderServiceImpl.java | 10 +++--- .../service/impl/WxOrderServiceImpl.java | 4 +-- .../impl/WxRefundOrderServiceImpl.java | 4 +-- .../service/impl/WxUserCouponServiceImpl.java | 4 +-- 11 files changed, 29 insertions(+), 90 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index a1afc0446..d9b5be5de 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -218,7 +218,7 @@ public class WxCUserBasicInfoController extends BaseController { public ResultData findOrderCouponByUserId(Long userId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findOrderCouponByUserId"); WxCouponOrder corder = new WxCouponOrder(); - corder.setCUserId(userId); + corder.setcUserId(userId); corder.setTenantId(getTenantId()); corder.setSortColumns(CreateDate_DESC); PageInfo page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 57fafc1ca..6baef18b3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -645,7 +645,7 @@ public class WxCarController extends BaseController { WxCouponOrderCarCVo userCar = null; WxCouponOrder userCarQ = new WxCouponOrder(); userCarQ.setTenantId(user.getTenantId()); - userCarQ.setCUserId(user.getId()); + userCarQ.setcUserId(user.getId()); userCarQ.setId(couponOrderId); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); List list = wxCouponOrderService.carListCUserVo(userCarQ); @@ -712,7 +712,7 @@ public class WxCarController extends BaseController { if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); WxCUser user = getUser(); wxCouponOrder.setTenantId(user.getTenantId()); - wxCouponOrder.setCUserId(user.getId()); + wxCouponOrder.setcUserId(user.getId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 6b788dd03..72e01beb5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -49,7 +49,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); - wxCouponOrder.setCUserId(getUser().getId()); + wxCouponOrder.setcUserId(getUser().getId()); if (wxCouponOrder.getCouponOrderStatus() == null) wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) @@ -91,7 +91,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } - if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { + if (!wxCouponOrderCVo.getcUserId().equals(getUserId())) { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } Date now = new Date(); @@ -188,7 +188,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - Long cUserId = wxCouponOrder.getCUserId(); + Long cUserId = wxCouponOrder.getcUserId(); if (cUserId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } @@ -218,7 +218,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - Long cUserId = wxCouponOrder.getCUserId(); + Long cUserId = wxCouponOrder.getcUserId(); if (cUserId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index f7aa591f4..74e7f6754 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -65,7 +65,7 @@ public class WxGameController extends BaseController { if (orderId != null) { orderIdL = Long.valueOf(orderId); WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setCUserId(getUserId()); + wxCouponOrder.setcUserId(getUserId()); wxCouponOrder.setOrderId(orderIdL); PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder,1,1); if (page.getList().size()>0) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java index aeb9928c9..b1f93eaed 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java @@ -82,14 +82,6 @@ public class WxCouponOrder implements Serializable { @io.swagger.annotations.ApiModelProperty(value="过期退款(0:正常,1不退)",name="autoRefund") private Integer autoRefund; - public Integer getAutoRefund() { - return autoRefund; - } - - public void setAutoRefund(Integer autoRefund) { - this.autoRefund = autoRefund; - } - @Transient private String couponName; @Transient @@ -164,14 +156,6 @@ public class WxCouponOrder implements Serializable { this.couponType = couponType; } - public Long getCUserId() { - return cUserId; - } - - public void setCUserId(Long _cUserId) { - cUserId = _cUserId; - } - public Long getOwnerId() { return ownerId; } @@ -180,14 +164,6 @@ public class WxCouponOrder implements Serializable { this.ownerId = ownerId; } - public Long getBUserId() { - return bUserId; - } - - public void setBUserId(Long _bUserId) { - bUserId = _bUserId; - } - public Long getOrderId() { return orderId; } @@ -252,6 +228,14 @@ public class WxCouponOrder implements Serializable { this.bUserId = bUserId; } + public Integer getAutoRefund() { + return autoRefund; + } + + public void setAutoRefund(Integer autoRefund) { + this.autoRefund = autoRefund; + } + 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/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 949f2a5c7..98501cca5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -30,15 +30,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ /***/ @io.swagger.annotations.ApiModelProperty(value = "", name = "tenantId") private String tenantId; - /*单张券ID**/ - @io.swagger.annotations.ApiModelProperty(value = "单张券ID", name = "couponId") - private Long couponId; - /*c端用户id**/ - @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") - private Long cUserId; - /*操作券B端小程序用户ID**/ - @io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId") - private Long bUserId; /*用户订单ID**/ @Excel(name="订单号",width = 20) @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") @@ -150,25 +141,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Long getCUserId() { - return cUserId; - } - public void setCUserId(Long _cUserId) { - cUserId = _cUserId; - } - public Long getBUserId() { - return bUserId; - } - public void setBUserId(Long _bUserId) { - bUserId = _bUserId; - } - public Long getOrderId() { + public Long getOrderId() { return orderId; } public void setOrderId(Long _orderId) { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 1b9db6027..fd708fd05 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -64,12 +64,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { /*单张券ID**/ @io.swagger.annotations.ApiModelProperty(value = "单张券ID", name = "couponId") private Long couponId; - /*c端用户id**/ - @io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId") - private Long cUserId; - /*操作券B端小程序用户ID**/ - @io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId") - private Long bUserId; /*用户订单ID**/ @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; @@ -160,19 +154,7 @@ public class WxCouponOrderCVo extends WxCouponOrder { public void setCouponId(Long _couponId) { couponId = _couponId; } - public Long getCUserId() { - return cUserId; - } - public void setCUserId(Long _cUserId) { - cUserId = _cUserId; - } - public Long getBUserId() { - return bUserId; - } - public void setBUserId(Long _bUserId) { - bUserId = _bUserId; - } - public Long getOrderId() { + public Long getOrderId() { return orderId; } public void setOrderId(Long _orderId) { 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 c321329bf..3f1aa8c6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -367,7 +367,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } try { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - wxCouponOrder.setBUserId(wxMerchantBUser.getId()); + wxCouponOrder.setbUserId(wxMerchantBUser.getId()); wxCouponOrder.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); } catch (Exception e) { @@ -672,7 +672,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } //转赠人是否存在 - Long cUserId = record.getCUserId(); + Long cUserId = record.getcUserId(); WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); @@ -706,7 +706,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //更新卡拥有者 try { - record.setCUserId(null); + record.setcUserId(null); record.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(record); } catch (Exception e) { @@ -725,7 +725,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } //转赠人是否存在 - Long cUserId = record.getCUserId(); + Long cUserId = record.getcUserId(); WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); if (wxCuser == null) { logger.info("转赠人不存在:" + cUserId); @@ -759,7 +759,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxCardTransferInfo.setId(idWorker.nextId()); wxCardTransferInfo.setTenantId(cardCVo.getTenantId()); wxCardTransferInfo.setCouponOrderId(couponOrder.getId()); - wxCardTransferInfo.setFromUser(couponOrder.getCUserId()); + wxCardTransferInfo.setFromUser(couponOrder.getcUserId()); wxCardTransferInfo.setToUser(couponOrder.getOwnerId()); wxCardTransferInfo.setAmount(cardCVo.getAmount()); wxCardTransferInfo.setRemainAmount(cardCVo.getRemainingAmount()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index b2d6985d0..72e3a180e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -214,7 +214,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxCouponOrder couponOrderQ = new WxCouponOrder(); couponOrderQ.setTenantId(user.getTenantId()); couponOrderQ.setCouponId(counpon.getId()); - couponOrderQ.setCUserId(user.getId()); + couponOrderQ.setcUserId(user.getId()); if (counpon.getSendType().equals(EnumCouponSendType.PASSIVE)) couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); countCouponOrder = wxCouponOrderMapper.countList(couponOrderQ); @@ -606,7 +606,7 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setTenantId(user.getTenantId()); couponOrder.setCouponId(order.getProductId()); couponOrder.setCouponType(coupon.getType()); - couponOrder.setCUserId(user.getId()); + couponOrder.setcUserId(user.getId()); couponOrder.setOwnerId(user.getId()); couponOrder.setAutoRefund(coupon.getAutoRefund()); couponOrder.setOrderId(order.getOrderNumber()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index d82116136..e01156523 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -348,9 +348,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()); //3退款,券作废 } if (payType == EnumPayType.PAY_B_REFUND) { - wxCouponOrder.setBUserId(bUserId); + wxCouponOrder.setbUserId(bUserId); } else{ - wxCouponOrder.setBUserId(payType.getCode().longValue());//其他退款模式将退款方式存入BUSERID + wxCouponOrder.setbUserId(payType.getCode().longValue());//其他退款模式将退款方式存入BUSERID } wxCouponOrder.setUpdateDate(currentDate); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java index b3f623816..46d33524c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java @@ -39,7 +39,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { List wxUserCoupons = new ArrayList<>(); //查询订单表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setCUserId(userId); + wxCouponOrder.setcUserId(userId); wxCouponOrder.setCouponOrderStatus(status);//状态:0,待使用 1,已核销 2,已过期 3,已退款 List wxCouponOrders = wxCouponOrderMapper.findList(wxCouponOrder); if(wxCouponOrders.isEmpty()){ @@ -58,7 +58,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { public WxUserCouponDto getWxUserCoupon(WxCouponOrder wxCouponOrder, WxCoupon wxCoupon){ WxUserCouponDto wxUserCoupon = new WxUserCouponDto(); wxUserCoupon.setOrderId(wxCouponOrder.getId()); - wxUserCoupon.setcUserId(wxCouponOrder.getCUserId()); + wxUserCoupon.setcUserId(wxCouponOrder.getcUserId()); wxUserCoupon.setCouponStatus(wxCouponOrder.getCouponOrderStatus()); wxUserCoupon.setCouponId(wxCouponOrder.getCouponId()); wxUserCoupon.setValidDate(wxCouponOrder.getExpiredTime());