From a198b6e0cc2b71656e1cd57901d825c418d6fce7 Mon Sep 17 00:00:00 2001 From: wukesheng Date: Sun, 2 Jun 2024 21:13:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0const=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/didi-union/consts.go | 8 ++++++++ platform/eleme-union/api_test.go | 10 ++++++---- platform/eleme-union/consts.go | 8 ++++++++ platform/meituan-csr/consts.go | 11 ++++++++++- platform/meituan-union/api.go | 4 ---- platform/meituan-union/api_test.go | 5 +++-- platform/meituan-union/client.go | 1 - platform/meituan-union/consts.go | 11 ++++++++++- platform/meituan-union/types.go | 22 ++++++++++++++-------- 9 files changed, 59 insertions(+), 21 deletions(-) diff --git a/platform/didi-union/consts.go b/platform/didi-union/consts.go index ba00bf1..096764f 100644 --- a/platform/didi-union/consts.go +++ b/platform/didi-union/consts.go @@ -1,5 +1,13 @@ package didi_union +// 相关地址 +const ( + SiteDomain = "https://union.didi.cn" // SiteDomain 滴滴联盟域名 + SiteUrl = "https://union.didi.cn/#/backhome" // SiteUrl 滴滴联盟后台地址 + DocUrl = "https://union.didi.cn/#/helpCenter/commonProblem/f1466" // DocUrl 滴滴联盟文档地址 + ApiDocUrl = "https://union.didi.cn/#/account/apiManage" // ApiDocUrl 滴滴联盟API文档地址 +) + // OrderType 订单类型 type OrderType string diff --git a/platform/eleme-union/api_test.go b/platform/eleme-union/api_test.go index 84c31f7..09ad5bb 100644 --- a/platform/eleme-union/api_test.go +++ b/platform/eleme-union/api_test.go @@ -69,12 +69,14 @@ func (a *apiClientSuite) Test_ElemePromotionOfficialActivityGet() { func (a *apiClientSuite) Test_KbcpxPositiveOrderGet() { req := &request.AlibabaAlscUnionKbcpxPositiveOrderGetRequest{ - DateType: pointer.Int64(1), - Pid: pointer.String("alsc_23378482_4796002_15513017"), + DateType: pointer.Int64(1), + //Pid: pointer.String("alsc_23378482_4796002_15513017"), BizUnit: pointer.Int64(2), - PageSize: pointer.Int64(10), + PageSize: pointer.Int64(20), PageNumber: pointer.Int64(1), - StartDate: pointer.String("2024-05-01 00:00:00"), + StartDate: pointer.String("2024-05-16 00:00:00"), + EndDate: pointer.String("2024-05-17 00:00:00"), + //OrderId: pointer.String("8036650073745353114"), } resp, err := a.api.KbcpxPositiveOrderGet(req) if err != nil { diff --git a/platform/eleme-union/consts.go b/platform/eleme-union/consts.go index 2963989..a047d1f 100644 --- a/platform/eleme-union/consts.go +++ b/platform/eleme-union/consts.go @@ -1 +1,9 @@ package eleme_union + +// 相关地址 +const ( + SiteDomain = "https://union.ele.me" // SiteDomain 域名 + SiteUrl = "https://union.ele.me/index#/ele-login" // SiteUrl 后台地址 + DocUrl = "https://www.yuque.com/jieqian-aa5ms/gpgci8" // DocUrl 文档地址 + ApiDocUrl = "https://open.taobao.com/api.htm?docId=60449&docType=2&scopeId=24408" // ApiDocUrl api文档地址 +) diff --git a/platform/meituan-csr/consts.go b/platform/meituan-csr/consts.go index 8f83bf5..ae404a2 100644 --- a/platform/meituan-csr/consts.go +++ b/platform/meituan-csr/consts.go @@ -1,6 +1,15 @@ package meituan_csr +// 相关地址 const ( - Domain = "https://union.dianping.com" + SiteDomain = "https://union.dianping.com" // SiteDomain 域名 + SiteUrl = "" // SiteUrl 后台地址 + DocUrl = "" // DocUrl 文档地址 + ApiDocUrl = "" // ApiDocUrl api文档地址 +) + +// 接口地址 +const ( + Domain = "https://union.dianping.com" // Domain 域名 GetLinkUrl = Domain + "/api/promotion/link" ) diff --git a/platform/meituan-union/api.go b/platform/meituan-union/api.go index c7b035b..346c7ea 100644 --- a/platform/meituan-union/api.go +++ b/platform/meituan-union/api.go @@ -64,7 +64,6 @@ func (a *meituanUnionApiImpl) GetLink(params GenerateLinkRequest) (*GenerateLink a.log.WithFields().Errorf("[meituanUnionApiImpl][GetLink] copy request error: %v", err) return nil, err } - request.Appkey = a.client.authConfig.AppKey request.Sign = a.Sign(util.StructToMap(request)) queryArgs := util.StructToMap(request) req := &client.HttpRequest{Headers: a.client.Headers, QueryArgs: queryArgs} @@ -82,7 +81,6 @@ func (a *meituanUnionApiImpl) MiniCode(params MiniCodeRequest) (*MimiCodeRespons a.log.WithFields().Errorf("[meituanUnionApiImpl][GetLink] copy request error: %v", err) return nil, err } - request.Appkey = a.client.authConfig.AppKey request.Sign = a.Sign(util.StructToMap(request)) queryArgs := util.StructToMap(request) req := &client.HttpRequest{Headers: a.client.Headers, QueryArgs: queryArgs} @@ -100,7 +98,6 @@ func (a *meituanUnionApiImpl) GetOrderBySinge(params GetOrderBySingeRequest) (*G a.log.WithFields().Errorf("[meituanUnionApiImpl][GetLink] copy request error: %v", err) return nil, err } - request.Appkey = a.client.authConfig.AppKey request.Sign = a.Sign(util.StructToMap(request)) queryArgs := util.StructToMap(request) req := &client.HttpRequest{Headers: a.client.Headers, QueryArgs: queryArgs} @@ -120,7 +117,6 @@ func (a *meituanUnionApiImpl) GetOrderByBatch(params GetOrderByBatchRequest) (*G a.log.WithFields().Errorf("[meituanUnionApiImpl][GetLink] copy request error: %v", err) return nil, err } - request.Appkey = a.client.authConfig.AppKey request.Ts = int32(time.Now().Unix()) request.Sign = a.Sign(util.StructToMap(request)) queryArgs := util.StructToMap(request) diff --git a/platform/meituan-union/api_test.go b/platform/meituan-union/api_test.go index 903aebe..6ba1c64 100644 --- a/platform/meituan-union/api_test.go +++ b/platform/meituan-union/api_test.go @@ -38,7 +38,8 @@ func (a *apiClientSuite) Test_Sign() { func (a *apiClientSuite) Test_GetOrderBySinge() { req := GetOrderBySingeRequest{ - ActId: 33, + ActId: 33, + OrderId: "3801047573041660994", } resp, err := a.api.GetOrderBySinge(req) if !a.NoError(err) { @@ -54,7 +55,7 @@ func (a *apiClientSuite) Test_GetOrderByBatch() { Page: 1, Limit: 10, StartTime: 1714147200, - //EndTime: 1714233600, + EndTime: 1714233500, } list, err := a.api.GetOrderByBatch(req) if !a.NoError(err) { diff --git a/platform/meituan-union/client.go b/platform/meituan-union/client.go index f47c1e5..6626230 100644 --- a/platform/meituan-union/client.go +++ b/platform/meituan-union/client.go @@ -8,7 +8,6 @@ import ( // AuthConfig api鉴权参数 type AuthConfig struct { - AppKey string // 应用key SignKey string // 签名秘钥 NotifyKey string // 回调秘钥 } diff --git a/platform/meituan-union/consts.go b/platform/meituan-union/consts.go index 1779c5b..5132028 100644 --- a/platform/meituan-union/consts.go +++ b/platform/meituan-union/consts.go @@ -1,7 +1,16 @@ package meituan_union +// 相关地址 const ( - Domain = "https://openapi.meituan.com" + SiteDomain = "https://union.meituan.com" // Domain 后台域名 + SiteUrl = "https://union.meituan.com/v2/overview" // SiteUrl 后台地址 + DocUrl = "https://union.meituan.com/single/helpCenter?id=44" // DocUrl 文档地址 + ApiDocUrl = "https://union.meituan.com/single/helpCenter?id=44" // ApiDocUrl api文档地址 +) + +// 接口地址 +const ( + Domain = "https://openapi.meituan.com" // Domain api域名 GetLinkUrl = Domain + "/api/generateLink" GetMiniCode = Domain + "/api/miniCode" GetOrderSinge = Domain + "/api/order" diff --git a/platform/meituan-union/types.go b/platform/meituan-union/types.go index a44df80..6f9d1cb 100644 --- a/platform/meituan-union/types.go +++ b/platform/meituan-union/types.go @@ -2,6 +2,7 @@ package meituan_union // GenerateLinkRequest 生成推广链接请求 （内部） type GenerateLinkRequest struct { + AppKey string `json:"appKey"` // 必传，应用appKey ActId int64 `json:"actId"` // 活动id LinkType int64 `json:"linkType"` // 链接类型 ShortLink int64 `json:"shortLink"` // 是否生成短链接 @@ -10,6 +11,7 @@ type GenerateLinkRequest struct { // MiniCodeRequest 获取小程序码请求 type MiniCodeRequest struct { + AppKey string `json:"appKey"` // 必传，应用appKey ActId int64 `json:"actId"` Sid string `json:"sid"` LinkType int64 `json:"linkType"` @@ -17,16 +19,20 @@ type MiniCodeRequest struct { // GetOrderBySingeRequest 获取单个订单请求 type GetOrderBySingeRequest struct { - ActId int64 `json:"actId"` - Full int64 `json:"full"` - OrderId string `json:"orderId"` + AppKey string `json:"appKey"` // 必传，应用appKey + BusinessLine int64 `json:"businessLine"` // 业务线 + ActId int64 `json:"actId"` + Full int64 `json:"full"` + OrderId string `json:"orderId"` } // GetOrderByBatchRequest 批量获取订单请求 type GetOrderByBatchRequest struct { - ActId int32 `json:"actId"` // 活动id - StartTime int32 `json:"startTime"` // 开始时间戳 - EndTime int32 `json:"endTime"` // 结束时间戳 - Page int32 `json:"page"` // 页码 - Limit int32 `json:"limit"` // 每页数量 + AppKey string `json:"appKey"` // 必传，应用appKey + ActId int32 `json:"actId"` // 活动id + BusinessLine int64 `json:"businessLine"` // 业务线 + StartTime int32 `json:"startTime"` // 开始时间戳 + EndTime int32 `json:"endTime"` // 结束时间戳 + Page int32 `json:"page"` // 页码 + Limit int32 `json:"limit"` // 每页数量，最大值 100 }