修改

# Conflicts:
#	pb/bundle/bundle.pb.go

internal/dao/orderRecordsDao.go

@@ -505,10 +505,17 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 		for _, sub := range record.BundleOrderValueAdd {
 			orderAddNo := sub.OrderNo
 			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 {
+					videoNum = sub.Num
+				}
 				addMap[orderAddNo] = &bundle.OrderAddBundleRecordInfo{
 					OrderAddNo:        orderAddNo,
 					Amount:            amount,
@@ -520,6 +527,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 					Snapshot:          sub.Snapshot,
 					CheckoutSessionId: sub.CheckoutSessionId,
 					CustomerID:        sub.CustomerID,
+					VideoNum:          videoNum,
 				}
 			}
 		}
@@ -663,6 +671,7 @@ func CreateReconciliation(req *bundle.ReconciliationInfo) (res *bundle.CommonRes
 		PayStatus:        int(req.PayStatus),
 		SerialNumber:     req.SerialNumber,
 		CreationTime:     time.Now().Format("2006-01-02 15:04:05"),
+		HandlingFee:      req.HandlingFee,
 	}
 
 	// 创建记录
@@ -693,6 +702,7 @@ func UpdateReconciliation(req *bundle.ReconciliationInfo) (res *bundle.CommonRes
 		PayTime:          req.PayTime,
 		PayStatus:        int(req.PayStatus),
 		SerialNumber:     req.SerialNumber,
+		HandlingFee:      req.HandlingFee,
 	}
 	if err := app.ModuleClients.BundleDB.Model(&existing).Updates(updates).Error; err != nil {
 		return nil, fmt.Errorf("更新对账单失败: %v", err)

internal/model/bundle.go

@@ -116,6 +116,7 @@ type BundleExtendRecordItemPo struct {
 	OperatorName                string
 	OperatorPhoneNumber         string
 	AssociatedOrderNumber       string `gorm:"column:associated_order_number;type:varchar(256);comment:关联订单号" json:"associatedOrderNumber"`
+	TimeUnit                    uint   `gorm:"column:time_unit;type:int(11) unsigned;comment:时间单位" json:"timeUnit"`
 	OrderUUID                   string
 	CreatedAt                   time.Time
 }

internal/model/reconciliation.go

@@ -17,4 +17,5 @@ type Reconciliation struct {
 	PayStatus        int     `gorm:"column:pay_status;comment:支付状态" json:"payStatus"`
 	SerialNumber     string  `gorm:"column:serial_number;comment:流水号" json:"serialNumber"`
 	CreationTime     string  `gorm:"column:creation_time;comment:创建时间" json:"creationTime"`
+	HandlingFee      string  `gorm:"column:handling_fee;comment:手续费" json:"handlingFee"`
 }

pb/bundle.proto

@@ -120,6 +120,7 @@ message ReconciliationInfo{
   int32 payStatus = 12;
   string serialNumber = 13;
   uint64 userID = 14;
+  string handlingFee = 15;
 }
 message OrderInfoByOrderNoRequest{
   string orderNo = 1;
@@ -220,6 +221,7 @@ message OrderAddBundleRecordInfo{
   string snapshot = 10;
   string CheckoutSessionId = 11;
   string CustomerID = 12;
+  int32 videoNum = 13;
 }
 message PackagePriceAndTimeResponse{
   float price = 1 [json_name = "price"];
@@ -609,8 +611,9 @@ message BundleExtendRecordItem{
   uint64 createdAt = 9; 
   string remark = 10; 
   string associatedOrderNumber = 11;
-  string operatorName = 12; 
-  string operatorPhoneNumber = 13; 
+  uint32 timeUnit = 12;
+  string operatorName = 13; 
+  string operatorPhoneNumber = 14; 
 }
 
 message GetBundleBalanceListReq{