解决冲突

internal/dao/orderRecordsDao.go

@@ -539,6 +539,7 @@ func OrderRecordsListV2(req *bundle.OrderRecordsRequestV2) (res *bundle.OrderRec
 			Amount:         record.Amount,
 			CustomerId:     customerID,
 			PayTime:        record.PayTime,
+			InviterId:      record.InviterID,
 		}
 
 		// 聚合子订单

internal/logic/orderRecordsLogic.go

@@ -69,6 +69,7 @@ func CreateOrderRecord(req *bundle.OrderCreateRecord) (res *bundle.CommonRespons
 		Language:              req.Language,
 		BundleOrderValueAdd:   addRecords,
 		PlatformIds:           req.PlatformIds,
+		InviterID:             req.InviterId,
 	}
 	res, err = dao.CreateOrderRecord(orderRecord)
 	return

internal/model/bundle_order_records.go

@@ -45,6 +45,7 @@ type BundleOrderRecords struct {
 	BundleOrderValueAdd   []BundleOrderValueAdd `gorm:"foreignKey:OrderUUID;references:UUID" json:"bundleOrderValueAdd"`
 	ReSignature           int                   `json:"reSignature" gorm:"column:re_signature;default:2;type:int;comment:是否重新签 1:是 2:否"`
 	PlatformIds           PlatformIDs           `gorm:"column:platform_ids;type:json;NOT NULL;comment:发布平台ID集合 TIKTOK= 1, YOUTUBE = 2, INS = 3 , DM = 4, BL = 5;" json:"platformIDs"`
+	InviterID             uint64                `gorm:"column:inviter_id;type:bigint;comment:邀请人ID" json:"inviterID"`
 }
 type BundleOrderValueAdd struct {
 	gorm.Model

pb/bundle.proto

@@ -216,6 +216,7 @@ message OrderCreateRecord{
   repeated OrderCreateAddRecord addRecords = 20 [json_name = "addRecords"]; //增值服务
   string orderNo = 21 [json_name = "orderNo"];
   repeated uint32 platformIds = 22;    // 发布平台ID集合 (json 格式字符串)
+  uint64 inviterId = 23;                 // 邀请人ID
 }
 message OrderCreateAddRecord{
   int32 serviceType = 1 [json_name = "serviceType"];
@@ -268,6 +269,9 @@ message OrderBundleRecordInfo{
   int64 customerId = 9;
   string payTime = 10;
   string subNum = 11;
+  uint64 inviterId = 12;
+  string inviterCode = 13;
+  string inviterName = 14;
 }
 message OrderAddBundleRecordInfo{
   string orderAddNo = 1;

pb/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.5
-// - protoc             v5.26.0
+// - protoc             v6.32.0
 // source: pb/bundle.proto
 
 package bundle

pkg/db/mysql.go

@@ -68,6 +68,11 @@ func loadMysqlConn(conn string) *gorm.DB {
 			fmt.Println(err)
 		}
 	}
+	if db.Migrator().HasColumn(&model.BundleOrderRecords{}, "inviter_id") == false {
+		if err := db.Migrator().AddColumn(&model.BundleOrderRecords{}, "inviter_id"); err != nil {
+			fmt.Println(err)
+		}
+	}
 	if err != nil {
 		// return nil
 		panic(err)