From 85d54954e9773a5808a4a76d643ce13b2f7fb21c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 28 Mar 2019 16:13:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/common/ErrorCode.java | 1 + .../service/impl/WxPayOrderServiceImpl.java | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 0bd8f22df..197b17b6a 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -376,6 +376,7 @@ public enum ErrorCode{ */ ORDER_GROUP_COOPERATING_FAILD(28001, "参团失败"), ORDER_GROUP_COOPERATING_FINISHED(28002, "拼团人数已满"), + ORDER_GROUP_COOPERATING_ATTEND(28003, "您已发起拼团"), ; 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 dfe347646..58de3d533 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -121,10 +121,20 @@ 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())) { - logger.error("支付时拼团已满>>" + order.getOrderGroupId()); - throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); + if (!order.getOrderGroupId().equals(0L)) { + if (order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { + logger.error("支付时拼团已满>>" + order.getOrderGroupId()); + throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); + } + WxOrder orderParams = new WxOrder(); + orderParams.setOrderGroupId(order.getOrderGroupId()); + orderParams.setCUserId(user.getId()); + orderParams.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); + int count = wxOrderMapper.selectCount(order); + if (count > 0) { + logger.error("重复的拼团>>>" + order); + throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_ATTEND); + } } WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(order.getProductId());