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