| @@ -193,8 +193,7 @@ public class WxPayOrderController extends BaseController { | |||||
| //拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息 | //拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息 | ||||
| if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) { | 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); | return new ResultData(Result.SUCCESS, "支付状态更新成功", order); | ||||
| } | } | ||||
| }else { | }else { | ||||
| @@ -373,7 +373,7 @@ public class OrderExpiringSchedule { | |||||
| payOrderQ.updateTenantInfo(order); | payOrderQ.updateTenantInfo(order); | ||||
| payOrderQ.setCUserId(order.getCUserId()); | payOrderQ.setCUserId(order.getCUserId()); | ||||
| payOrderQ.setOrderId(order.getId()); | payOrderQ.setOrderId(order.getId()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| //payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| WxPayOrder payOrder = null; | WxPayOrder payOrder = null; | ||||
| List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); | List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); | ||||
| @@ -599,7 +599,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| payOrderQ.updateTenantInfo(wxOrder); | payOrderQ.updateTenantInfo(wxOrder); | ||||
| payOrderQ.setCUserId(wxOrder.getCUserId()); | payOrderQ.setCUserId(wxOrder.getCUserId()); | ||||
| payOrderQ.setOrderId(wxOrder.getId()); | payOrderQ.setOrderId(wxOrder.getId()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| //payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | |||||
| WxPayOrder payOrder = null; | WxPayOrder payOrder = null; | ||||
| List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); | List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); | ||||