Merge branch 'jng' into dev

2025-07-16 19:01:27 +08:00 · 2025-07-16 19:01:27 +08:00 · 567f70c610
commit 567f70c610
parent 567503bcd6 2edf4b82ae
1 changed files with 4 additions and 0 deletions
--- a/internal/dao/orderRecordsDao.go
+++ b/internal/dao/orderRecordsDao.go
@ -507,6 +507,10 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 			amount := float32(sub.Amount)
 			if existing, ok := addMap[orderAddNo]; ok {
 				existing.Amount += amount
+				// 仅当 VideoNum 尚未设置且当前是 ServiceType == 1 时赋值
+				if existing.VideoNum == 0 && sub.ServiceType == 1 {
+					existing.VideoNum = sub.Num
+				}
 			} else {
 				var videoNum int32
 				if sub.ServiceType == 1 {