From f36e3313435a8bffed393f4154bcfa2d37b8c7c1 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 14 Mar 2019 12:08:06 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E5=A4=8D]:c=E7=AB=AF=E5=8D=A1?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCouponOrderController.java | 2 +- .../iformall/controller/WxCouponOrderController.java | 11 ++++++++++- .../com/iformall/service/WxCouponOrderService.java | 3 +-- .../service/impl/WxCouponOrderServiceImpl.java | 9 +-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index e9dc83799..d048f0eb2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -118,7 +118,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(null, couponOrderIdStr); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr); if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 05955d933..6b788dd03 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -10,6 +10,7 @@ import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumCouponOrderValidStatus; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -84,7 +85,15 @@ public class WxCouponOrderController extends BaseController { if (couponOrderId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderId); + + if (wxCouponOrderCVo == null) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + + if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } Date now = new Date(); if (wxCouponOrderCVo.getValidStartDate() != null && wxCouponOrderCVo.getValidEndDate() != null ) { if (wxCouponOrderCVo.getValidStartDate().getTime() > now.getTime()) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 7741c0918..ec4401ec8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -105,9 +105,8 @@ public interface WxCouponOrderService { /** * C用户查券详情 * - * @param cUserId C端用户 */ - WxCouponOrderCVo detailCUserVo(Long cUserId, String couponOrderId); + WxCouponOrderCVo detailCUserVo(String couponOrderId); /** * C用户查券carlist 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 8c420e6fc..c321329bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -203,14 +203,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public WxCouponOrderCVo detailCUserVo(Long cUserId, String couponOrderId) { - if(cUserId != null) { - WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); - if (wxCuser == null) { - logger.error("用户不存在:" + cUserId); - throw new MallinkException(ErrorCode.USER_IS_EMPTY); - } - } + public WxCouponOrderCVo detailCUserVo(String couponOrderId) { WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId)); if (wxCouponOrderCVo == null)