解决冲突

api/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 

pkg/service/bundle/reconciliation.go

@@ -195,7 +195,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 		f64, err := strconv.ParseFloat(unfinishInfo.OrderPayAmount, 32)
 		TotalPrice = float32(f64)
 		addRecords = append(addRecords,
-			&bundle.OrderCreateAddRecord{ //视频
+			&bundle.OrderCreateAddRecord{
 				ServiceType:   1,
 				ValueUid:      videoUuid,
 				CurrencyType:  2,             //美元
@@ -204,6 +204,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 				Unit:          "个",
 				Source:        1,
 				PaymentStatus: 1,
+				HandlingFee:   unfinishInfo.OrderFeeAmount,
 			}, &bundle.OrderCreateAddRecord{ //图文
 				ServiceType:   2,
 				ValueUid:      textAndImagesUuid,
@@ -213,6 +214,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 				Unit:          "个",
 				Source:        1,
 				PaymentStatus: 1,
+				HandlingFee:   unfinishInfo.OrderFeeAmount,
 			}, &bundle.OrderCreateAddRecord{ //数据报表
 				ServiceType:   3,
 				ValueUid:      reportUuid,
@@ -222,6 +224,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 				Unit:          "个",
 				Source:        1,
 				PaymentStatus: 1,
+				HandlingFee:   unfinishInfo.OrderFeeAmount,
 			}, &bundle.OrderCreateAddRecord{ //账号数
 				ServiceType:   4,
 				ValueUid:      accountUuid,
@@ -231,6 +234,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 				Unit:          "个",
 				Source:        1,
 				PaymentStatus: 1,
+				HandlingFee:   unfinishInfo.OrderFeeAmount,
 			}, &bundle.OrderCreateAddRecord{ //可用时长
 				ServiceType:   5,
 				ValueUid:      durationUuid,
@@ -240,6 +244,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 				Unit:          "年",
 				Source:        1,
 				PaymentStatus: 1,
+				HandlingFee:   unfinishInfo.OrderFeeAmount,
 			},
 		)
 		// 当前 未将 签名 写入合同中 todo 金额和有效时间待修改