解决冲突

internal/dao/orderRecordsDao.go

@@ -663,6 +663,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 +694,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/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;