|
|
|
@@ -140,14 +140,26 @@ public class OrderExpiringSchedule { |
|
|
|
|
|
|
|
// 拼团取消 |
|
|
|
WxOrder order = new WxOrder(); |
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); |
|
|
|
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { |
|
|
|
// order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); |
|
|
|
// wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { |
|
|
|
// try { |
|
|
|
// proxy.orderGroupExpired((WxOrder) o,true,true,payWay); |
|
|
|
// } catch (Exception e) { |
|
|
|
// logger.error("拼团取消失败" + e.getMessage()); |
|
|
|
// } |
|
|
|
// }); |
|
|
|
Date groupExpireDate = new Date(curDate.getTime() - NORMAL_TIME_OUT ); |
|
|
|
dateMap.put("type", EnumOrderType.COUPON.getCode()); |
|
|
|
dateMap.put("endDate", groupExpireDate); |
|
|
|
List<WxOrder> orderGroups = wxOrderMapper.findListOfUnpaidGroupOrderByDate(dateMap); |
|
|
|
orderGroups.stream().forEach( o -> { |
|
|
|
try { |
|
|
|
proxy.orderGroupExpired((WxOrder) o,true,true,payWay); |
|
|
|
proxy.orderGroupExpired(o,true,true,payWay); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("拼团取消失败" + e.getMessage()); |
|
|
|
logger.error("砍价券支付过期失败" + e.getMessage()); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
//更新拼团过期状态 |
|
|
|
wxOrderMapper.updateOrderStatusForGroup(); |
|
|
|
@@ -192,8 +204,28 @@ public class OrderExpiringSchedule { |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
//此处是拼团完成后,会将其他失效的订单置成该状态。需要查询是否已经付款,如果已经付款,则退款,退款回回滚库存。如果没付款,则主动回滚库存 |
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode()); |
|
|
|
wxOrderMapper.selectList(new QueryWrapper(order)).stream().forEach(o -> { |
|
|
|
try { |
|
|
|
proxy.expiredCheckAndReturnMoney((WxOrder) o,payWay); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("参团失败退款失败" + e.getMessage()); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void expiredCheckAndReturnMoney(WxOrder wxOrder,EnumPayWay payWay) throws MallinkException, Exception { |
|
|
|
if (wxPaySuccess(wxOrder, false, payWay)) { |
|
|
|
orderGroupExpired(wxOrder,false,false,payWay); |
|
|
|
returnMoney(wxOrder,payWay); |
|
|
|
}else { |
|
|
|
orderGroupExpired(wxOrder,false,true,payWay); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void expiredAndReturnMoney(WxOrder wxOrder,boolean checkRealPay,EnumPayWay payWay) throws MallinkException, Exception { |
|
|
|
orderGroupExpired(wxOrder,checkRealPay,false,payWay); |
|
|
|
@@ -341,7 +373,7 @@ public class OrderExpiringSchedule { |
|
|
|
payOrderQ.updateTenantInfo(order); |
|
|
|
payOrderQ.setCUserId(order.getCUserId()); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
//payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
|
|
|
|
WxPayOrder payOrder = null; |
|
|
|
List<WxPayOrder> list = wxPayOrderMapper.findList(payOrderQ); |
|
|
|
|