internal/dao/orderRecordsDao.go

@@ -467,7 +467,6 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 	}
 	for _, record := range records {
 		customerID, _ := strconv.ParseInt(record.CustomerID, 10, 64)
-
 		orderItem := &bundle.OrderBundleRecordInfo{
 			OrderNo:        record.OrderNo,
 			BundleName:     record.BundleName,
@@ -479,12 +478,13 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 			CustomerId:     customerID,
 		}
 
-		// 聚合子订单
+		// 构建子订单 map，按 orderAddNo 聚合
 		addMap := make(map[string]*bundle.OrderAddBundleRecordInfo)
-
+		subAmountMap := make(map[string]float32)
 		for _, sub := range record.BundleOrderValueAdd {
 			orderAddNo := sub.OrderNo
 			amount := float32(sub.Amount)
+			subAmountMap[orderAddNo] += amount
 
 			if existing, ok := addMap[orderAddNo]; ok {
 				existing.Amount += amount
@@ -492,7 +492,10 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 				addMap[orderAddNo] = &bundle.OrderAddBundleRecordInfo{
 					OrderAddNo: orderAddNo,
 					Amount:     amount,
+					//SettlementAmount: settlementAmount,
 					CurrencyType: int32(sub.CurrencyType),
+					//HandlingFee:      float32(sub.HandlingFee),
+					//ExchangeRate:     float32(sub.ExchangeRate),
 					OrderAddCreateAt:  sub.CreatedAt.Format("2006-01-02 15:04:05"),
 					AddPayStatus:      int32(sub.PaymentStatus),
 					Contract:          sub.SignContract,
@@ -502,17 +505,15 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 				}
 			}
 		}
-
+		// 第二步：设置 SettlementAmount
-		// 设置 SettlementAmount 并追加到主订单中
 		for orderAddNo, addInfo := range addMap {
+			settlementAmount := subAmountMap[orderAddNo]
 			if orderAddNo == record.OrderNo {
-				addInfo.SettlementAmount = record.TotalAmount
+				settlementAmount += record.TotalAmount
-			} else {
-				addInfo.SettlementAmount = addInfo.Amount
 			}
+			addInfo.SettlementAmount = settlementAmount
 			orderItem.AddBundleInfo = append(orderItem.AddBundleInfo, addInfo)
 		}
-
 		res.BundleInfo = append(res.BundleInfo, orderItem)
 	}
 	res.Total = int32(count)