Merge branch 'develop' into feature/websocket

constants/orders.go

@@ -109,10 +109,10 @@ func init() {
 
 	// 订单状态名称
 	OrderStatusMessage = make(map[OrderStatusCode]string)
-	OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid"
-	OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed"
-	OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed"
-	OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted"
+	OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" // 首款未支付
+	OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed"                         // 已关闭
+	OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed"                   // 已完成
+	OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted"                       // 已删除
 
 	OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order"                          // 直邮单--已下单
 	OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid"      // 直邮单--已下单--尾款

model/gmodel/var.go

@@ -44,7 +44,7 @@ type SubscriptionStatus struct {
 	} `json:"notification_email"`
 
 	NotificationPhone struct {
-		// OrderUpdate bool `json:"order_update"`
+		OrderUpdate bool `json:"order_update"`
 		Newseleter  bool `json:"newseleter"`
 	} `json:"notification_phone"`
 }

server/resource/internal/logic/logocombinelogic.go

@@ -127,5 +127,7 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
 		"resource_id":            res.ResourceId,
 		"resource_url":           res.ResourceUrl,
 		"resource_metadata":      "",
+		"diff_time_logo_combine": res.DiffTimeLogoCombine,
+		"diff_time_upload_file":  res.DiffTimeUploadFile,
 	})
 }

service/repositories/image_handle.go

@@ -11,6 +11,7 @@ import (
 	"fusenapi/utils/file"
 	"fusenapi/utils/hash"
 	"fusenapi/utils/s3url_to_s3id"
+	"strconv"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -367,6 +368,10 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
 	}
 
 	var fileBase = resultData["result"].(string)
+	var spendTime = resultData["spend_time"].(string)
+	spendTimeInt, _ := strconv.Atoi(spendTime)
+	diffTimeLogoCombine = int64(spendTimeInt)
+	logc.Infof(ctx, "合图--算法请求--合图--业务耗时（自身）：%d", diffTimeLogoCombine)
 
 	// 上传文件
 	var upload = file.Upload{