|
|
@@ -1284,6 +1284,16 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); |
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// B端刷卡支付发券 |
|
|
|
|
|
logger.info("订单刷卡发券 开始"); |
|
|
|
|
|
try { |
|
|
|
|
|
wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getcUserId()); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); |
|
|
|
|
|
logger.error("订单刷卡发券失败: " +e.getMessage()); |
|
|
|
|
|
} |
|
|
|
|
|
logger.info("订单刷卡发券 结束"); |
|
|
|
|
|
|
|
|
// 延迟3秒后分账 |
|
|
// 延迟3秒后分账 |
|
|
new Thread(() -> { |
|
|
new Thread(() -> { |
|
|
String tenantId = record.getTenantId(); |
|
|
String tenantId = record.getTenantId(); |
|
|
@@ -1296,23 +1306,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 支付分账 |
|
|
// 支付分账 |
|
|
|
|
|
logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); |
|
|
try { |
|
|
try { |
|
|
wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); |
|
|
wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); |
|
|
logger.info("订单分账: orderId: {}, payOrderId: {}", orderId, payOrderId); |
|
|
|
|
|
} catch (Exception e) { |
|
|
} catch (Exception e) { |
|
|
logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); |
|
|
logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); |
|
|
logger.error("订单分账失败: " +e.getMessage()); |
|
|
logger.error("订单分账失败: " +e.getMessage()); |
|
|
} |
|
|
} |
|
|
|
|
|
logger.info("订单分账结束: orderId: {}, payOrderId: {}", orderId, payOrderId); |
|
|
}).start(); |
|
|
}).start(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// B端刷卡支付发券 |
|
|
|
|
|
try { |
|
|
|
|
|
wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getcUserId()); |
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
logger.error("订单刷卡失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); |
|
|
|
|
|
logger.error("订单刷卡失败: " +e.getMessage()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
|