diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index eab5697b0..b7eee36c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -74,8 +74,9 @@ public interface WxCouponOrderService { /** * B端刷卡支付发券 - * @param order - * @param bUser + * @param tenantId + * @param orderId + * @param cUserId */ boolean sendCouponAfterMicroPay(String tenantId, Long orderId, Long cUserId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 7a2b8b236..e46570d21 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -104,6 +104,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { if (page.getSize() > 0) { WxMallConfig config = page.getList().get(0); if (config.getValue() == EnumEnableType.Disable.getCode()) { + logger.info(configKey + ": disabled "); return false; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index e7d4c3cc0..4eb397948 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1284,6 +1284,16 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { 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秒后分账 new Thread(() -> { String tenantId = record.getTenantId(); @@ -1296,23 +1306,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } // 支付分账 + logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); try { wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); - logger.info("订单分账: orderId: {}, payOrderId: {}", orderId, payOrderId); } catch (Exception e) { logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); logger.error("订单分账失败: " +e.getMessage()); } + logger.info("订单分账结束: orderId: {}, payOrderId: {}", orderId, payOrderId); }).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