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()) {