From 2ef79ab2d432292d9046825d61d935aa7b0a8c62 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 18 Mar 2019 15:30:38 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][ID1001133][C=E7=AB=AF=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=8B=BC=E5=9B=A2=E5=90=8E=EF=BC=8C=E5=9B=A2=E6=BB=A1?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=89=8D=E5=BE=85=E4=BB=98=E6=AC=BE=E7=9A=84?= =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E8=AE=A9=E8=BF=9B=E8=A1=8C=E6=94=AF=E4=BB=98?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=9B=A2=E6=BB=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 5fced5c4d..e7b3ff0e6 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -374,7 +374,7 @@ public enum ErrorCode{ * 拼团 */ ORDER_GROUP_COOPERATING_FAILD(28001, "参团失败"), - + ORDER_GROUP_COOPERATING_FINISHED(28002, "拼团人数已满"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 03d557205..301ad821e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -121,6 +121,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } + if (!order.getOrderGroupId().equals(0L) && + order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { + throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); + } if(order.getPressEndDate() == null) { // 非砍价券 if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()) {