| @@ -299,14 +299,14 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { | |||||
| if (temp.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) | if (temp.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) | ||||
| || temp.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode())) { | || temp.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode())) { | ||||
| //去库存 | //去库存 | ||||
| wxOrderService.stockBack(order); | |||||
| wxOrderService.stockBack(temp); | |||||
| ResultData resultData = WxRefundOrderService.returnMoney(appinfo, temp.getId()); | ResultData resultData = WxRefundOrderService.returnMoney(appinfo, temp.getId()); | ||||
| logger.info("拼团不成功时的退款返回信息:" + resultData + "resultData.code == ResultData.SUCCESS" + (resultData.code == ResultData.SUCCESS)); | logger.info("拼团不成功时的退款返回信息:" + resultData + "resultData.code == ResultData.SUCCESS" + (resultData.code == ResultData.SUCCESS)); | ||||
| if (resultData.code == ResultData.SUCCESS) { | |||||
| logger.info("修改订单的状态为已退款"); | |||||
| temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| wxOrderMapper.updateByPrimaryKeySelective(order); | |||||
| } | |||||
| // if (resultData.code == ResultData.SUCCESS) { | |||||
| // logger.info("修改订单的状态为已退款"); | |||||
| // temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); | |||||
| // wxOrderMapper.updateByPrimaryKeySelective(temp); | |||||
| // } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||