| @@ -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<WxCouponOrder> page = wxCouponOrderService.listAsPage(corder, pageNum, pageSize); | |||
| @@ -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<WxCouponOrderCarCVo> 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()) | |||
| @@ -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不能为空"); | |||
| } | |||
| @@ -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<WxCouponOrder> page = wxCouponOrderService.listAsPage(wxCouponOrder,1,1); | |||
| if (page.getList().size()>0) { | |||
| @@ -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"), | |||
| @@ -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) { | |||
| @@ -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) { | |||
| @@ -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()); | |||
| @@ -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()); | |||
| @@ -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 { | |||
| @@ -39,7 +39,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { | |||
| List<WxUserCouponDto> wxUserCoupons = new ArrayList<>(); | |||
| //查询订单表 | |||
| WxCouponOrder wxCouponOrder = new WxCouponOrder(); | |||
| wxCouponOrder.setCUserId(userId); | |||
| wxCouponOrder.setcUserId(userId); | |||
| wxCouponOrder.setCouponOrderStatus(status);//状态:0,待使用 1,已核销 2,已过期 3,已退款 | |||
| List<WxCouponOrder> 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()); | |||