From 59a5c29e7cd9ec6382a74af672ab4bca1f24a3e3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 18:10:43 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=B8=E6=89=BE=E4=B8=8D=E5=88=B0=E5=90=8E=E6=B2=A1?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/simple/controller/WxCouponOrderController.java | 5 +---- .../java/com/simple/controller/WxCouponOrderController.java | 2 +- .../com/simple/service/impl/WxCouponOrderServiceImpl.java | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 80ab73d71..3b0ea89ee 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -98,10 +98,7 @@ public class WxCouponOrderController extends BaseController { if(couponOrderId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - - - - return new ResultData(wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId)); + return wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId); } @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 7ba6678f0..b2aa9231c 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -83,6 +83,6 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - return new ResultData(wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId)); + return wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId); } } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index d119ce191..b96a18597 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -179,7 +179,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { paramMap.put("tenantId", wxCuser.getTenantId()); paramMap.put("couponOrderId", couponOrderId); - return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); + if (wxCouponOrderCVo == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + return new ResultData(wxCouponOrderCVo); } @Override