fix:算法请求调整

initalize/service.go

@@ -17,17 +17,16 @@ type Repositories struct {
 
 type NewAllRepositorieData struct {
 	GormDB         *gorm.DB
-	BLMServiceUrl   *string
+	BLMServiceUrls []string
-	BLMServicePorts []string
 	AwsSession     *session.Session
 	DelayQueue     *queue.DelayMessage
 }
 
 func NewAllRepositories(newData *NewAllRepositorieData) *Repositories {
 	return &Repositories{
-		ImageHandle:     repositories.NewImageHandle(newData.GormDB, newData.BLMServiceUrl, newData.BLMServicePorts, newData.AwsSession),
+		ImageHandle:     repositories.NewImageHandle(newData.GormDB, newData.BLMServiceUrls, newData.AwsSession),
-		NewShoppingCart: repositories.NewShoppingCart(newData.GormDB, newData.BLMServiceUrl, newData.AwsSession),
+		NewShoppingCart: repositories.NewShoppingCart(newData.GormDB, newData.BLMServiceUrls, newData.AwsSession),
-		NewResource:     repositories.NewResource(newData.GormDB, newData.BLMServiceUrl, newData.AwsSession),
+		NewResource:     repositories.NewResource(newData.GormDB, newData.BLMServiceUrls, newData.AwsSession),
-		NewOrder:        repositories.NewOrder(newData.GormDB, newData.BLMServiceUrl, newData.AwsSession, newData.DelayQueue),
+		NewOrder:        repositories.NewOrder(newData.GormDB, newData.AwsSession, newData.DelayQueue),
 	}
 }

model/gmodel/fs_order_logic.go

@@ -156,7 +156,10 @@ type OrderProductInter struct {
 	FittingInfo          *OrderProductFittingInfo `json:"fitting_info"`
 	IsHighlyCustomized   int64                    `json:"is_highly_customized"`
 	RenderImage          string                   `json:"render_image"`
+	ExpectedDeliveryTime ExpectedDelivery         `json:"expected_delivery_time"` // 预计到货时间
+	ActualDeliveryTime   ExpectedDelivery         `json:"actual_delivery_time"`   // 实际到货时间
 }
 type OrderMetadata struct {
 	ExpectedDeliveryTime ExpectedDelivery `json:"expected_delivery_time"` // 预计到货时间
+	ActualDeliveryTime   ExpectedDelivery `json:"actual_delivery_time"`   // 实际到货时间
 }

server/home-user-auth/internal/config/config.go

@@ -36,9 +36,7 @@ type Config struct {
 		}
 	}
 	BLMService struct {
-		Url         string
+		Version string
-		LogoCombine struct {
+		Urls    []string
-			Url string
-		}
 	}
 }

server/home-user-auth/internal/svc/servicecontext.go

@@ -39,7 +39,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AllModels:   gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         initalize.InitMysql(c.SourceMysql),
-			BLMServiceUrl: &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

server/product-template-tag/internal/config/config.go

@@ -21,9 +21,7 @@ type Config struct {
 		}
 	}
 	BLMService struct {
-		Url         string
+		Version string
-		LogoCombine struct {
+		Urls    []string
-			Url string
-		}
 	}
 }

server/product-template-tag/internal/svc/servicecontext.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"fusenapi/server/product-template-tag/internal/config"
 	"fusenapi/shared"
+	"net/http"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"net/http"
 
 	"fusenapi/initalize"
 	"fusenapi/model/gmodel"
@@ -39,7 +40,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AllModels:   gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         conn,
-			BLMServiceUrl: &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

server/product/internal/config/config.go

@@ -21,10 +21,8 @@ type Config struct {
 		}
 	}
 	BLMService struct {
-		Url         string
+		Version string
-		LogoCombine struct {
+		Urls    []string
-			Url string
-		}
 	}
 	Unity struct {
 		Host string

server/product/internal/svc/servicecontext.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"fusenapi/server/product/internal/config"
 	"fusenapi/shared"
+	"net/http"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"net/http"
 
 	"fusenapi/initalize"
 	"fusenapi/model/gmodel"
@@ -40,7 +41,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AwsSession: session.Must(session.NewSession(&config)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         conn,
-			BLMServiceUrl: &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

server/resource/internal/config/config.go

@@ -22,7 +22,6 @@ type Config struct {
 	}
 	BLMService struct {
 		Version string
-		Url     string
+		Urls    []string
-		Ports   []string
 	}
 }

server/resource/internal/svc/servicecontext.go

@@ -43,8 +43,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AwsSession: session.Must(session.NewSession(&config)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         initalize.InitMysql(c.SourceMysql),
-			BLMServiceUrl:   &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
-			BLMServicePorts: c.BLMService.Ports,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 		Tracing: middleware.NewTracingMiddleware().Handle,

server/shopping-cart/internal/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fusenapi/server/shopping-cart/internal/types"
+
 	"github.com/zeromicro/go-zero/rest"
 )
 
@@ -20,10 +21,8 @@ type Config struct {
 		}
 	}
 	BLMService struct {
-		Url         string
+		Version string
-		LogoCombine struct {
+		Urls    []string
-			Url string
-		}
 	}
 	Unity struct {
 		Host string

server/shopping-cart/internal/svc/servicecontext.go

@@ -4,6 +4,7 @@ import (
 	"fusenapi/initalize"
 	"fusenapi/model/gmodel"
 	"fusenapi/server/shopping-cart/internal/config"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -32,7 +33,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AwsSession: session.Must(session.NewSession(&config)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         conn,
-			BLMServiceUrl: &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

server/upload/internal/config/config.go

@@ -23,7 +23,6 @@ type Config struct {
 	}
 	BLMService struct {
 		Version string
-		Url     string
+		Urls    []string
-		Ports   []string
 	}
 }

server/upload/internal/svc/servicecontext.go

@@ -42,8 +42,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AwsSession: session.Must(session.NewSession(&config)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         initalize.InitMysql(c.SourceMysql),
-			BLMServiceUrl:   &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
-			BLMServicePorts: c.BLMService.Ports,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

server/websocket/internal/config/config.go

@@ -22,10 +22,8 @@ type Config struct {
 		}
 	}
 	BLMService struct {
-		Url         string
+		Version string
-		LogoCombine struct {
+		Urls    []string
-			Url string
-		}
 	}
 	Unity struct {
 		Host string

server/websocket/internal/svc/servicecontext.go

@@ -42,7 +42,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		AwsSession: session.Must(session.NewSession(&config)),
 		Repositories: initalize.NewAllRepositories(&initalize.NewAllRepositorieData{
 			GormDB:         conn,
-			BLMServiceUrl: &c.BLMService.Url,
+			BLMServiceUrls: c.BLMService.Urls,
 			AwsSession:     session.Must(session.NewSession(&config)),
 		}),
 	}

service/repositories/image_handle.go

@@ -21,11 +21,10 @@ import (
 
 var globalBLMServiceIndex int
 
-func NewImageHandle(gormDB *gorm.DB, bLMServiceUrl *string, bLMServicePorts []string, awsSession *session.Session) ImageHandle {
+func NewImageHandle(gormDB *gorm.DB, bLMServiceUrls []string, awsSession *session.Session) ImageHandle {
 	return &defaultImageHandle{
 		MysqlConn:      gormDB,
-		BLMServiceUrl:   bLMServiceUrl,
+		BLMServiceUrls: bLMServiceUrls,
-		BLMServicePorts: bLMServicePorts,
 		AwsSession:     awsSession,
 	}
 }
@@ -33,8 +32,7 @@ func NewImageHandle(gormDB *gorm.DB, bLMServiceUrl *string, bLMServicePorts []st
 type (
 	defaultImageHandle struct {
 		MysqlConn      *gorm.DB
-		BLMServiceUrl   *string
+		BLMServiceUrls []string
-		BLMServicePorts []string
 		AwsSession     *session.Session
 	}
 
@@ -174,8 +172,8 @@ type (
 
 func (l *defaultImageHandle) LogoInfoSet(ctx context.Context, in *LogoInfoSetReq) (*LogoInfoSetRes, error) {
 	fmt.Println("算法请求轮训下标：", globalBLMServiceIndex)
-	var bLMServicePort = l.BLMServicePorts[globalBLMServiceIndex]
+	var bLMServicePort = l.BLMServiceUrls[globalBLMServiceIndex]
-	if len(l.BLMServicePorts) == (globalBLMServiceIndex + 1) {
+	if len(l.BLMServiceUrls) == (globalBLMServiceIndex + 1) {
 		globalBLMServiceIndex = 0
 	} else {
 		globalBLMServiceIndex = globalBLMServiceIndex + 1
@@ -328,8 +326,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	postMap["param_data"] = combineParam
 
 	fmt.Println("算法请求轮训下标：", globalBLMServiceIndex)
-	var bLMServicePort = l.BLMServicePorts[globalBLMServiceIndex]
+	var bLMServicePort = l.BLMServiceUrls[globalBLMServiceIndex]
-	if len(l.BLMServicePorts) == (globalBLMServiceIndex + 1) {
+	if len(l.BLMServiceUrls) == (globalBLMServiceIndex + 1) {
 		globalBLMServiceIndex = 0
 	} else {
 		globalBLMServiceIndex = globalBLMServiceIndex + 1
@@ -473,8 +471,8 @@ func (l *defaultImageHandle) LogoStandard(ctx context.Context, in *LogoStandardR
 	postMap["proportion"] = in.Proportion
 
 	fmt.Println("算法请求轮训下标：", globalBLMServiceIndex)
-	var bLMServicePort = l.BLMServicePorts[globalBLMServiceIndex]
+	var bLMServicePort = l.BLMServiceUrls[globalBLMServiceIndex]
-	if len(l.BLMServicePorts) == (globalBLMServiceIndex + 1) {
+	if len(l.BLMServiceUrls) == (globalBLMServiceIndex + 1) {
 		globalBLMServiceIndex = 0
 	} else {
 		globalBLMServiceIndex = globalBLMServiceIndex + 1

service/repositories/order.go

@@ -21,7 +21,7 @@ import (
 	"gorm.io/gorm"
 )
 
-func NewOrder(gormDB *gorm.DB, bLMServiceUrl *string, awsSession *session.Session, delayQueue *queue.DelayMessage) Order {
+func NewOrder(gormDB *gorm.DB, awsSession *session.Session, delayQueue *queue.DelayMessage) Order {
 	return &defaultOrder{
 		MysqlConn:  gormDB,
 		DelayQueue: delayQueue,
@@ -1099,6 +1099,14 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 				Name:   in.DeliveryAddress.Name,
 			}
 		}
+		// 预计交付时间
+		var expectedDeliveryTime = gmodel.ExpectedDelivery{
+			Current:  in.ExpectedDeliveryTime,
+			Initiate: in.ExpectedDeliveryTime,
+		}
+
+		// 实际交付时间
+		var actualDeliveryTime gmodel.ExpectedDelivery
 
 		for _, shoppingCart := range shoppingCartList {
 			// 购物车快照
@@ -1189,6 +1197,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 				IsHighlyCustomized:   *shoppingCart.IsHighlyCustomized,
 				RenderImage:          shoppingCartSnapshot.RenderImage,
 				CartId:               shoppingCart.Id,
+				ExpectedDeliveryTime: expectedDeliveryTime,
+				ActualDeliveryTime:   actualDeliveryTime,
 			}
 			orderProductList = append(orderProductList, &productInter)
 			shoppingProductSnapshotList = append(shoppingProductSnapshotList, shoppingCart.ShoppingCartProduct)
@@ -1268,10 +1278,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 		byteShoppingProductSnapshot, _ := json.Marshal(shoppingProductSnapshotList)
 		byteStatusLink, _ := json.Marshal(statusLink)
 		byteOrderMetadata, _ := json.Marshal(gmodel.OrderMetadata{
-			ExpectedDeliveryTime: gmodel.ExpectedDelivery{
+			ExpectedDeliveryTime: expectedDeliveryTime,
-				Current:  in.ExpectedDeliveryTime,
+			ActualDeliveryTime:   actualDeliveryTime,
-				Initiate: in.ExpectedDeliveryTime,
-			},
 		})
 
 		// 创建订单
@@ -1527,14 +1535,15 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
 			orderProductItem := gmodel.OrderProduct{
 				TotalPrice: order.GetAmountInfoFormat(&productValue.TotalPrice),
 				ItemPrice:  order.GetAmountInfoFormat(&productValue.ItemPrice),
-				ExpectedDeliveryTime: &expectedTime,
+
-				PurchaseQuantity:     *productValue.PurchaseQuantity,
 				ProductId:            productValue.ProductId,
 				ProductSn:            productValue.ProductSn,
 				ProductName:          productValue.ProductName,
 				ProductCover:         productValue.ProductCover,
 				ProductCoverMetadata: productValue.ProductCoverMetadata,
 				ShoppingCartSnapshot: &shoppingCartSnapshotData,
+				ExpectedDeliveryTime: &productValue.ExpectedDeliveryTime.Current,
+				PurchaseQuantity:     *productValue.PurchaseQuantity,
 
 				DiyInformation:     productValue.DiyInformation,
 				SizeInfo:           productValue.SizeInfo,

service/repositories/resource.go

@@ -10,10 +10,10 @@ import (
 	"gorm.io/gorm"
 )
 
-func NewResource(gormDB *gorm.DB, bLMServiceUrl *string, awsSession *session.Session) Resource {
+func NewResource(gormDB *gorm.DB, bLMServiceUrls []string, awsSession *session.Session) Resource {
 	return &defaultResource{
 		MysqlConn:      gormDB,
-		BLMServiceUrl: bLMServiceUrl,
+		BLMServiceUrls: bLMServiceUrls,
 		AwsSession:     awsSession,
 	}
 }
@@ -21,7 +21,7 @@ func NewResource(gormDB *gorm.DB, bLMServiceUrl *string, awsSession *session.Ses
 type (
 	defaultResource struct {
 		MysqlConn      *gorm.DB
-		BLMServiceUrl *string
+		BLMServiceUrls []string
 		AwsSession     *session.Session
 	}
 	Resource interface {

service/repositories/shopping_cart.go

@@ -11,10 +11,10 @@ import (
 	"gorm.io/gorm"
 )
 
-func NewShoppingCart(gormDB *gorm.DB, bLMServiceUrl *string, awsSession *session.Session) ShoppingCart {
+func NewShoppingCart(gormDB *gorm.DB, bLMServiceUrls []string, awsSession *session.Session) ShoppingCart {
 	return &defaultShoppingCart{
 		MysqlConn:      gormDB,
-		BLMServiceUrl: bLMServiceUrl,
+		BLMServiceUrls: bLMServiceUrls,
 		AwsSession:     awsSession,
 	}
 }
@@ -22,7 +22,7 @@ func NewShoppingCart(gormDB *gorm.DB, bLMServiceUrl *string, awsSession *session
 type (
 	defaultShoppingCart struct {
 		MysqlConn      *gorm.DB
-		BLMServiceUrl *string
+		BLMServiceUrls []string
 		AwsSession     *session.Session
 	}
 	ShoppingCart interface {