解决冲突

internal/logic/orderRecordsLogic.go

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

internal/model/bundle_order_records.go

@@ -42,6 +42,7 @@ type BundleOrderRecords struct {
 	Language              string                `gorm:"column:language;comment:语言" json:"language"`
 	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           []uint32              `gorm:"column:platform_ids;type:json;NOT NULL;comment:发布平台ID集合 TIKTOK= 1, YOUTUBE = 2, INS = 3 , DM = 4, BL = 5;" json:"platformIDs"`
 }
 type BundleOrderValueAdd struct {
 	gorm.Model

pb/bundle.proto

@@ -218,6 +218,7 @@ message OrderCreateRecord{
   int32 payType = 19 [json_name = "payType"];
   repeated OrderCreateAddRecord addRecords = 20 [json_name = "addRecords"]; //增值服务
   string orderNo = 21 [json_name = "orderNo"];
+  repeated uint32 platformIds = 22;    // 发布平台ID集合 (json 格式字符串)
 }
 message OrderCreateAddRecord{
   int32 serviceType = 1 [json_name = "serviceType"];

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.8
-// - protoc             v3.21.1
+// - protoc-gen-go-triple v1.0.5
+// - protoc             v6.32.0
 // source: pb/bundle.proto
 
 package bundle

pkg/db/mysql.go

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