From b0317a2b3b55a0a5d3b3cd42f16e0810130a737d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 12 Oct 2020 11:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxPayOrderController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 56b77485b..6247710fc 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -193,8 +193,10 @@ public class WxPayOrderController extends BaseController { //拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息 if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) { - if ((!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode())) - &&(!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode()))) { + if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode())) { + return new ResultData(ErrorCode.PAY_ORDER_ERROR, "拼团失败:人员已满,将稍后退款。"); + } + if (!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode())) { return new ResultData(Result.SUCCESS, "支付状态更新成功", order); } }else {