| @@ -1162,9 +1162,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| // B端刷卡支付发券 | // B端刷卡支付发券 | ||||
| logger.info("订单刷卡发券 开始"); | logger.info("订单刷卡发券 开始"); | ||||
| try { | try { | ||||
| wxCouponOrderService.sendCouponAfterMicroPay(record, record.getOrderId(), record.getCUserId()); | |||||
| wxCouponOrderService.sendCouponAfterMicroPay(record, composeOrder.getSingleOrder().getId(), record.getCUserId()); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); | |||||
| logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", composeOrder.getSingleOrder().getId(), record.getId()); | |||||
| logger.error("订单刷卡发券失败: " + e.getMessage()); | logger.error("订单刷卡发券失败: " + e.getMessage()); | ||||
| } | } | ||||
| logger.info("订单刷卡发券 结束"); | logger.info("订单刷卡发券 结束"); | ||||
| @@ -1182,7 +1182,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| TenantEntity tenantEntity = record; | TenantEntity tenantEntity = record; | ||||
| Long orderId = record.getOrderId(); | Long orderId = record.getOrderId(); | ||||
| Long payOrderId = record.getId(); | Long payOrderId = record.getId(); | ||||
| logger.info("收银台订单分账休眠10s: orderId: {}, payOrderId: {}, {}", orderId, payOrderId, tenantEntity); | |||||
| logger.info("收银台订单分账休眠10s: composeOrderId: {}, payOrderId: {}, {}", orderId, payOrderId, tenantEntity); | |||||
| try { | try { | ||||
| Thread.currentThread().sleep(10000); | Thread.currentThread().sleep(10000); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -1190,7 +1190,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| // 支付分账 | // 支付分账 | ||||
| logger.info("收银台订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| logger.info("收银台订单分账开始: composeOrderId: {}, payOrderId: {}", orderId, payOrderId); | |||||
| try { | try { | ||||
| wxOrderService.shareForMicroPay(tenantEntity, orderId, payOrderId,payWay); | wxOrderService.shareForMicroPay(tenantEntity, orderId, payOrderId,payWay); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||