fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/websocket

Browse Source
This commit is contained in:
laodaming 2023-10-11 15:22:48 +08:00
commit 8e11157c92
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
constants/orders.go
View File

@ -109,23 +109,23 @@ func init() {
// 订单状态名称 // 订单状态名称
OrderStatusMessage = make(map[OrderStatusCode]string) OrderStatusMessage = make(map[OrderStatusCode]string)
OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "Deposit Payment Unpaid" // 首款未支付
OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed" OrderStatusMessage[ORDER_STATUS_CLOSE] = "Closed" // 已关闭
OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed" OrderStatusMessage[ORDER_STATUS_COMPLETE] = "Completed" // 已完成
OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted" OrderStatusMessage[ORDER_STATUS_DELETE] = "Deleted" // 已删除
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order" //直邮单--已下单 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order" // 直邮单--已下单
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" //直邮单--已下单--尾款 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" // 直邮单--已下单--尾款
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" //直邮单--开始生产 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" // 直邮单--开始生产
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" //直邮单--生产完成 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" // 直邮单--生产完成
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" //直邮单--已发货 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" // 直邮单--已发货
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" //直邮单--已到达 OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" // 直邮单--已到达
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "Order" //云仓单--已下单 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "Order" // 云仓单--已下单
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "Final Payment Paid" // 云仓单--已下单-尾款 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING] = "Final Payment Paid" // 云仓单--已下单-尾款
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" //云仓单--开始生产 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" // 云仓单--开始生产
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" //云仓单--直达仓库 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" // 云仓单--直达仓库
// 订单状态--用户可见--直邮 // 订单状态--用户可见--直邮
OrderStatusUserDIRECTMAIL = []OrderStatusCode{ OrderStatusUserDIRECTMAIL = []OrderStatusCode{

4
model/gmodel/var.go
View File

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

8
server/resource/internal/logic/logocombinelogic.go
View File

@ -124,8 +124,10 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth
// 返回成功的响应和上传URL // 返回成功的响应和上传URL
return resp.SetStatus(basic.CodeOK, map[string]interface{}{ return resp.SetStatus(basic.CodeOK, map[string]interface{}{
"resource_id": res.ResourceId, "resource_id": res.ResourceId,
"resource_url": res.ResourceUrl, "resource_url": res.ResourceUrl,
"resource_metadata": "", "resource_metadata": "",
"diff_time_logo_combine": res.DiffTimeLogoCombine,
"diff_time_upload_file": res.DiffTimeUploadFile,
}) })
} }

5
service/repositories/image_handle.go
View File

@ -11,6 +11,7 @@ import (
"fusenapi/utils/file" "fusenapi/utils/file"
"fusenapi/utils/hash" "fusenapi/utils/hash"
"fusenapi/utils/s3url_to_s3id" "fusenapi/utils/s3url_to_s3id"
"strconv"
"time" "time"
"github.com/aws/aws-sdk-go/aws/session" "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 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{ var upload = file.Upload{