From 36c2cc8331dd4b487c7e7b72254a3fc1f2d8af0e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 18 Feb 2019 13:52:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E8=BD=AC=E8=B5=A0][=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0][=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 595fde03a..136034680 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -137,21 +137,26 @@ public class WxCouponOrderController extends BaseController { @ApiOperation(value = "卡转赠领取") @PostMapping("cardAccept") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "coupon_order_id", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), + }) public ResultData cardAccept(@ModelAttribute WxCouponOrder wxCouponOrder) { //coupon_order_id判断 Long id = wxCouponOrder.getId(); if (id == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - if (wxCouponOrder.getCUserId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + Long cUserId = wxCouponOrder.getCUserId(); + if (cUserId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } //当前领取人 wxCouponOrder.setOwnerId(getUserId()); //转赠者与当前领取人是否为同一个 - if (wxCouponOrder.getCUserId().equals(wxCouponOrder.getOwnerId())) { + if (cUserId.equals(wxCouponOrder.getOwnerId())) { logger.info("转赠人与卡所有者相同"); return new ResultData(ErrorCode.CARD_TRANSFER_INVALID.getCode(), "转赠人与卡所有者相同"); } @@ -162,21 +167,26 @@ public class WxCouponOrderController extends BaseController { @ApiOperation(value = "查询转赠卡状态") @PostMapping("queryCardStatus") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "coupon_order_id", dataType = "Long", paramType = "query", required = true), + @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), + }) public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { //coupon_order_id判断 Long id = wxCouponOrder.getId(); if (id == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); } //转赠人判断 - if (wxCouponOrder.getCUserId() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + Long cUserId = wxCouponOrder.getCUserId(); + if (cUserId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } //当前领取人 wxCouponOrder.setOwnerId(getUserId()); //转赠者与当前领取人是否为同一个 - if (wxCouponOrder.getCUserId().equals(wxCouponOrder.getOwnerId())) { + if (cUserId.equals(wxCouponOrder.getOwnerId())) { logger.info("转赠人与卡所有者相同"); return new ResultData(ErrorCode.CARD_TRANSFER_INVALID.getCode(), "转赠人与卡所有者相同"); }