From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index cdc97da..3f0e17f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -825,7 +825,7 @@
log.error("褰撳墠璁㈠崟璁㈠崟鍙蜂负:{}涓嶅瓨鍦ㄤ腑鐨勪紭鎯犲嵎涓嶅瓨鍦�----------------------->{}",order.getId(),orderItem.getOrderSn());
}else {
Integer num = orderItem.getNum();
- //褰撹喘涔版暟閲忛儴浣嶇┖鐨勬椂鍊欒繘琛�
+ //褰撹喘涔版暟閲忎笉涓虹┖鐨勬椂鍊欒繘琛�
if (num != null) {
for (int i = 1; i <= num; i++) {
CouponVirtual couponVirtual = getCouponVirtual(orderItem);
@@ -854,7 +854,7 @@
private static CouponVirtual getCouponVirtual(OrderItem orderItem) {
CouponVirtual couponVirtual = new CouponVirtual();
- couponVirtual.setOrderId(orderItem.getSn());
+ couponVirtual.setOrderId(orderItem.getOrderSn());
couponVirtual.setCouponId(orderItem.getCouponId());
couponVirtual.setCouponName(orderItem.getCouponName());
couponVirtual.setGoodsId(orderItem.getGoodsId());
--
Gitblit v1.8.0