|
|
|
@@ -193,8 +193,7 @@ public class WxPayOrderController extends BaseController { |
|
|
|
|
|
|
|
//拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息 |
|
|
|
if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) { |
|
|
|
if (order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()) || |
|
|
|
order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode())) { |
|
|
|
if (!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode())) { |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); |
|
|
|
} |
|
|
|
}else { |
|
|
|
|