From 68c332f20ee26509c81e6150ccb4ba191f0965ab Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Wed, 11 Oct 2023 14:10:44 +0800 Subject: [PATCH 1/3] contact us --- model/gmodel/var.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/gmodel/var.go b/model/gmodel/var.go index fca355d3..71fd02ff 100644 --- a/model/gmodel/var.go +++ b/model/gmodel/var.go @@ -44,8 +44,8 @@ type SubscriptionStatus struct { } `json:"notification_email"` NotificationPhone struct { - // OrderUpdate bool `json:"order_update"` - Newseleter bool `json:"newseleter"` + OrderUpdate bool `json:"order_update"` + Newseleter bool `json:"newseleter"` } `json:"notification_phone"` } From c67a7664ec5decbb1b429afe485f904a4c9c689f Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Wed, 11 Oct 2023 15:10:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=AE=97=E6=B3=95=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/orders.go | 26 +++++++++++++------------- service/repositories/image_handle.go | 5 +++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/constants/orders.go b/constants/orders.go index 516f10ae..1474574f 100644 --- a/constants/orders.go +++ b/constants/orders.go @@ -109,23 +109,23 @@ 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" //直邮单--已下单--尾款 - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" //直邮单--开始生产 - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" //直邮单--生产完成 - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" //直邮单--已发货 - OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "Delivered" //直邮单--已到达 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "Order" // 直邮单--已下单 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING] = "Final Payment Paid" // 直邮单--已下单--尾款 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "Start Production" // 直邮单--开始生产 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "Production Complete" // 直邮单--生产完成 + OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "Shipped" // 直邮单--已发货 + 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_STARTPRODUCTION] = "Start Production" //云仓单--开始生产 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "Start Production" // 云仓单--开始生产 OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "Production Complete" // 云仓单--生产完成 - OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" //云仓单--直达仓库 + OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "Arrived Inventory" // 云仓单--直达仓库 // 订单状态--用户可见--直邮 OrderStatusUserDIRECTMAIL = []OrderStatusCode{ diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go index 3fc52b9a..a5dc2c71 100644 --- a/service/repositories/image_handle.go +++ b/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{ From 9b09a33f47f87fbabc7bc7695fe73a9c9cce4e53 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Wed, 11 Oct 2023 15:13:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E7=AE=97=E6=B3=95=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/internal/logic/logocombinelogic.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/resource/internal/logic/logocombinelogic.go b/server/resource/internal/logic/logocombinelogic.go index a507f3f0..de3367cc 100644 --- a/server/resource/internal/logic/logocombinelogic.go +++ b/server/resource/internal/logic/logocombinelogic.go @@ -124,8 +124,10 @@ func (l *LogoCombineLogic) LogoCombine(req *types.LogoCombineReq, userinfo *auth // 返回成功的响应和上传URL return resp.SetStatus(basic.CodeOK, map[string]interface{}{ - "resource_id": res.ResourceId, - "resource_url": res.ResourceUrl, - "resource_metadata": "", + "resource_id": res.ResourceId, + "resource_url": res.ResourceUrl, + "resource_metadata": "", + "diff_time_logo_combine": res.DiffTimeLogoCombine, + "diff_time_upload_file": res.DiffTimeUploadFile, }) }