|
|
|
@@ -60,7 +60,7 @@ public class CouponOrderExpiringSchedule { |
|
|
|
list.stream().forEach(co -> { |
|
|
|
// 券过期,更改状态及库存退回 |
|
|
|
try { |
|
|
|
couponOrderExpire(co); |
|
|
|
couponOrderExpire(co, true); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
} |
|
|
|
@@ -78,14 +78,14 @@ public class CouponOrderExpiringSchedule { |
|
|
|
list.stream().forEach(co -> { |
|
|
|
// 券过期,更改状态及库存退回 |
|
|
|
try { |
|
|
|
couponOrderExpire(co); |
|
|
|
couponOrderExpire(co, false); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
// 退款 |
|
|
|
try { |
|
|
|
couponOrderExpireRefund(co, false); |
|
|
|
couponOrderExpireRefund(co, true); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
} |
|
|
|
@@ -96,7 +96,7 @@ public class CouponOrderExpiringSchedule { |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void couponOrderExpire(WxCouponOrder co) { |
|
|
|
public void couponOrderExpire(WxCouponOrder co, boolean bStockBack) { |
|
|
|
// 标记 couponOrder过期 |
|
|
|
WxCouponOrder updateRecord = new WxCouponOrder(); |
|
|
|
updateRecord.setId(co.getId()); |
|
|
|
@@ -109,9 +109,11 @@ public class CouponOrderExpiringSchedule { |
|
|
|
wxCouponOrderMapper.updateByPrimaryKeySelective(updateRecord); |
|
|
|
|
|
|
|
// 库存退回 |
|
|
|
WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId()); |
|
|
|
if(order != null) { |
|
|
|
wxOrderService.stockBack(order); |
|
|
|
if(bStockBack) { |
|
|
|
WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId()); |
|
|
|
if(order != null) { |
|
|
|
wxOrderService.stockBack(order); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -125,7 +127,7 @@ public class CouponOrderExpiringSchedule { |
|
|
|
appinfo = wxAppinfoMapper.findList(appinfo).get(0); |
|
|
|
|
|
|
|
try { |
|
|
|
wxRefundOrderService.createRefundOrder(payProperty.isReal(), appinfo, co.getId(), EnumPayType.PAY_AUTO_REFUND, null, bStockBack); |
|
|
|
wxRefundOrderService.createRefundOrder(payProperty.isReal(), appinfo, co.getId(), EnumPayType.PAY_AUTO_REFUND, null); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("退款失败:"+e.getMessage()+"couponOrderId="+co.getId()); |
|
|
|
throw new MallinkException(e.getErrorCode(), e.getMessage()); |
|
|
|
@@ -160,6 +162,13 @@ public class CouponOrderExpiringSchedule { |
|
|
|
throw new MallinkException(e.getErrorCode(), e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
if(bStockBack) { |
|
|
|
// 库存退回 |
|
|
|
WxOrder order = wxOrderMapper.selectByPrimaryKey(co.getOrderId()); |
|
|
|
if(order != null) { |
|
|
|
wxOrderService.stockBack(order); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |