From b88dc8de405904d9fdc7a71f8ce88ab51564a5ee Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 18 Feb 2019 15:41:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E8=BD=AC=E8=B5=A0][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponOrderController.java | 7 ------- .../src/main/java/com/iformall/common/ErrorCode.java | 4 ++-- .../iformall/service/impl/WxCouponOrderServiceImpl.java | 6 ++++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 54eac18cd..bc562a4a2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -183,13 +183,6 @@ public class WxCouponOrderController extends BaseController { if (cUserId == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); } - //当前领取人 - wxCouponOrder.setOwnerId(getUserId()); - //转赠者与当前领取人是否为同一个 - if (cUserId.equals(wxCouponOrder.getOwnerId())) { - logger.info("转赠人与卡所有者相同"); - return new ResultData(ErrorCode.CARD_TRANSFER_INVALID.getCode(), "转赠人与卡所有者相同"); - } return wxCouponOrderService.queryCardStatus(wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 34b246ef0..6abbd47dd 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -166,8 +166,8 @@ public enum ErrorCode{ CARD_IS_NOT_FOUND(9001, "优惠卡不存在"), CARD_REMAIN_AMOUNT_IS_NOT_ENOUGH(9002, "优惠卡余额不足"), CARD_IS_NOT_COST(9003, "优惠卡未消费,退款请用卡券退款,钱直接退回购买人手里"), - CARD_TRANSFERED(9004, "消费卡已被领取"), - CARD_TRANSFER_INVALID(9005, "消费卡已失效"), + CARD_TRANSFERED(9004, "卡已被领取"), + CARD_TRANSFER_INVALID(9005, "卡转赠已失效"), /** * 卡消费 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 8180b8247..5f4fcc895 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -772,6 +772,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.info("转赠人与目前卡所有者不相同," + "转赠人:" + cUserId + ",当前所有者:" + ownerId); return new ResultData(ErrorCode.CARD_TRANSFERED); } + //判断卡是否已消费 + //面额与余额是否相同 + if (!cardCVo.getAmount().equals(cardCVo.getRemainingAmount())) { + logger.info("面额与余额不相同"); + return new ResultData(ErrorCode.CARD_TRANSFER_INVALID); + } return new ResultData(Result.SUCCESS, "查询成功"); }