From 2833829c40dd71f154be5e9a78f1b5c93a81f027 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 22 Jan 2019 16:22:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7=E5=88=B8][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E7=A0=8D=E4=BB=B7=E5=8F=82=E4=B8=8E=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxPressOrderController.java | 16 ++++++++++++++++ .../main/java/com/iformall/common/ErrorCode.java | 1 + 2 files changed, 17 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index 67c37fd77..3180cdf7a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -6,6 +6,7 @@ import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxOrder; import com.iformall.enums.EnumOrderPressStatus; +import com.iformall.enums.EnumOrderStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderPressService; @@ -77,6 +78,21 @@ public class WxPressOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_PRESS_IS_OVERTIME); } + if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode())) { + logger.error("砍价已支付:" + orderId); + return new ResultData(ErrorCode.ORDER_HAD_PAY); + } + + if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode())) { + logger.error("砍价已完成:" + orderId); + return new ResultData(ErrorCode.ORDER_PRESS_IS_COMPLETE); + } + + if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode())) { + logger.error("砍价已取消:" + orderId); + return new ResultData(ErrorCode.ORDER_HAD_CANCEL); + } + if(order.getPressCurrentNum() + 1 > coupon.getPressLimitNum()) { logger.error("砍价已结束:" + orderId); return new ResultData(ErrorCode.COUPON_PRESS_HAD_FINISHED); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 536600212..4b45caff3 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -136,6 +136,7 @@ public enum ErrorCode{ ORDER_HAD_PAY(3008, "订单已支付"), ORDER_HAD_CANCEL(3009, "订单已取消"), ORDER_PRESS_IS_OVERTIME(3010, "砍价已过期"), + ORDER_PRESS_IS_COMPLETE(3011, "砍价已完成"), /** * 卡券