拼团bug

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 {