From 6092a1c3be0d3d5d5199c39cb68f93858f5e2f68 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 17:02:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/orders.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/constants/orders.go b/constants/orders.go index d6ffa7bf..7911782a 100644 --- a/constants/orders.go +++ b/constants/orders.go @@ -23,8 +23,8 @@ type ExchangeRateUnit interface{} type PayMethods string const ( - PAY_METHOD_CARD PayMethods = "CARD" - PAY_METHOD_VISA PayMethods = "VISA" + PAY_METHOD_CARD PayMethods = "CARD" //card + PAY_METHOD_VISA PayMethods = "VISA" //visa ) // 支付状态 From 093864943e13f906b6d3e531fa668d9395728a69 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 17:09:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/service/repositories/order.go b/service/repositories/order.go index 31b935aa..ad87cc5b 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -152,14 +152,14 @@ type ( Currency string `json:"currency"` Country string `json:"country"` UserId int64 `json:"user_id"` - OrderSn string `json:"order_sn"` - DeliveryMethod int64 `json:"delivery_method"` - DeliveryAddress *OrderAddress `json:"delivery_address"` + OrderSn string `json:"order_sn"` // 订单编号 + DeliveryMethod int64 `json:"delivery_method"` // 收货类型 + DeliveryAddress *OrderAddress `json:"delivery_address"` // 订单收货地址 } CreatePrePaymentByDepositRes struct { ErrorCode basic.StatusResponse - OrderDetail gmodel.OrderDetail - OrderPay OrderPay + OrderDetail gmodel.OrderDetail // 订单详情 + OrderPay OrderPay // 支付详情 } /* 预支付--定金 */ @@ -173,8 +173,8 @@ type ( } CreatePrePaymentByBalanceRes struct { ErrorCode basic.StatusResponse - OrderDetail gmodel.OrderDetail - OrderPay OrderPay + OrderDetail gmodel.OrderDetail // 订单详情 + OrderPay OrderPay // 支付详情 } /* 预支付--尾款 */ @@ -186,7 +186,7 @@ type ( OriginalCurrency string `json:"original_currency"` // 原始货币 UserId int64 `json:"user_id"` CartIds []int64 `json:"cart_ids"` - DeliveryMethod int64 `json:"delivery_method"` + DeliveryMethod int64 `json:"delivery_method"` // 收货类型 DeliveryAddress *OrderAddress `json:"delivery_address"` // 收货地址 } CreateRes struct { @@ -202,18 +202,18 @@ type ( } DetailRes struct { ErrorCode basic.StatusResponse - OrderDetail gmodel.OrderDetail - OrderDetailOriginal OrderDetailOriginal + OrderDetail gmodel.OrderDetail // 订单详情 + OrderDetailOriginal OrderDetailOriginal // 订单详情--原始数据 } OrderDetailOriginal struct { - Status *gmodel.OrderStatus - OrderAmount *gmodel.OrderAmount - OrderAddress *gmodel.OrderAddress - OrderProduct []gmodel.OrderProductInter - ShoppingCartSnapshot []gmodel.FsShoppingCart - ShoppingProductSnapshot []gmodel.RelaFsProduct - StatusLink []gmodel.OrderStatus - PayStatusLink []gmodel.PayStatus + Status *gmodel.OrderStatus // 订单状态 + OrderAmount *gmodel.OrderAmount // 订单金额 + OrderAddress *gmodel.OrderAddress // 订单收货地址 + OrderProduct []gmodel.OrderProductInter // 订单商品 + ShoppingCartSnapshot []gmodel.FsShoppingCart // 订单购物车快照 + ShoppingProductSnapshot []gmodel.RelaFsProduct // 订单商品快照 + StatusLink []gmodel.OrderStatus // 订单状态链路 + PayStatusLink []gmodel.PayStatus // 订单支付状态链路 } /* 详情 */ From 916c852a7145819b375c9ad6ce5c9243046b2766 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 18:26:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=88=E5=9B=BE=E9=87=8D=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/image_handle.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go index 69a45800..656ebfb9 100644 --- a/service/repositories/image_handle.go +++ b/service/repositories/image_handle.go @@ -319,6 +319,8 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq ApiType: 2, UserId: in.UserId, GuestId: in.GuestId, + ResourceId: resourceId, + Refresh: 1, }) // logc.Infof(ctx, "合图--上传文件--结束时间：%v", time.Now().UTC()) endTimeUploadFile := time.Now().UnixMilli() //合图--处理--开始时间 From 56c3ab71bc23f15cc13bd53a41d0f6c00f52d74d Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 18:40:42 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=90=88=E5=9B=BE=E9=87=8D=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/upload/internal/logic/uploadlogologic.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/upload/internal/logic/uploadlogologic.go b/server/upload/internal/logic/uploadlogologic.go index 7a2759ad..54414de9 100644 --- a/server/upload/internal/logic/uploadlogologic.go +++ b/server/upload/internal/logic/uploadlogologic.go @@ -123,6 +123,8 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us UserId: userId, GuestId: guestId, Source: "upload-logo", + ResourceId: resourceId, + Refresh: 1, }) var logoUrl string From fde34cd9b1a09b9d76a27b0270f78a96de3c8108 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 18:45:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/upload/internal/logic/uploadlogologic.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/upload/internal/logic/uploadlogologic.go b/server/upload/internal/logic/uploadlogologic.go index 54414de9..24c86e95 100644 --- a/server/upload/internal/logic/uploadlogologic.go +++ b/server/upload/internal/logic/uploadlogologic.go @@ -114,7 +114,11 @@ func (l *UploadLogoLogic) UploadLogo(req *types.UploadLogoReq, userinfo *auth.Us MysqlConn: l.svcCtx.MysqlConn, AwsSession: l.svcCtx.AwsSession, } - var resourceId string = hash.JsonHashKey(req.FileKey) + var hashKeyMap = make(map[string]interface{}, 2) + hashKeyMap["fileKey"] = req.FileKey + hashKeyMap["userId"] = userId + var resourceId string = hash.JsonHashKey(hashKeyMap) + uploadRes, err := upload.UploadFileByByte(&file.UploadBaseReq{ FileHash: resourceId, FileByte: ioData, From 205767efd530a698b9d8e0aed8fa8eb7d4d7271d Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 18:48:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/image_handle.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/repositories/image_handle.go b/service/repositories/image_handle.go index 656ebfb9..d32c9c82 100644 --- a/service/repositories/image_handle.go +++ b/service/repositories/image_handle.go @@ -163,8 +163,6 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq } // 根据hash 查询数据资源 var hashKeyData = *in - hashKeyData.GuestId = 0 - hashKeyData.UserId = 0 hashKeyData.LogoUrl = in.LogoUrl var hashKeyDataMap map[string]interface{} hashKeyDataB, _ := json.Marshal(hashKeyData)