From 6d1226217bd0fea35345bf1e47540eda5609fdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 17:25:29 +0800 Subject: [PATCH 1/4] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 5 +++-- controllers/tiktok_store.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index b36c148fb..896a6f0be 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -586,13 +586,14 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr api := getAPI(vendorOrgCode, storeID, vendorStoreID) if status == model.SkuStatusNormal { // 上架 for _, v := range storeSkuList { + // p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false) if err := api.EditStoreCommodity(&product_editV2_request.ProductEditV2Param{ ProductId: utils.Str2Int64(v.VendorSkuID), Commit: true, }); err != nil { - failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常")...) - } else { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品异常")...) + } else { + failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "上架商品正常")...) } } } else { // 下架 diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index e6980a039..dddfbf25f 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -51,8 +51,8 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { } -// CallbackTiktokTokenMsg 抖音用户授权 -func (c *TiktokController) CallbackTiktokTokenMsg() { +// TokenMsg 抖音用户授权 +func (c *TiktokController) TokenMsg() { code := c.Ctx.Request.URL.Query().Get("code") globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", code) result, err := api.TiktokStore.CreateToken(code) From de03915d064307eb14b71398d50a00934ed63652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 17:34:26 +0800 Subject: [PATCH 2/4] 1 --- controllers/tiktok_order.go | 48 +++++++++++++++++++++++++++++++++++++ controllers/tiktok_store.go | 40 ++----------------------------- routers/router.go | 3 ++- 3 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 controllers/tiktok_order.go diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go new file mode 100644 index 000000000..d4e5c7667 --- /dev/null +++ b/controllers/tiktok_order.go @@ -0,0 +1,48 @@ +package controllers + +import ( + "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" + "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/globals/api" + "github.com/astaxie/beego/server/web" +) + +type TiktokController struct { + web.Controller +} + +// CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) +func (t *TiktokController) CallbackTiktokOrderMsg() { + // 1.防伪校验 + resp := api.TiktokStore.EventSignChange(t.Ctx.Request) + if resp.Code != 0 { + t.Data["json"] = resp + t.ServeJSON() + return + } + + // 2.参数解析 + orderStatus, resp := api.TiktokStore.CreateOrderCallback(t.Ctx.Request) + globals.SugarLogger.Debug("抖音订单回调数据打印测试===========", orderStatus) + if resp.Code != 0 { + t.Data["json"] = resp + t.ServeJSON() + return + } + + for k, v := range orderStatus { + for _, callback := range v { + resp2 := tiktok_store.OnOrderMsg(k, callback) + if resp2.Code != 0 { + t.Data["json"] = resp2 + t.ServeJSON() + return + } + } + } + + t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} + t.ServeJSON() + +} diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index dddfbf25f..adedb2865 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -5,54 +5,18 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/jx-callback/business/jxstore/common" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" "time" ) -type TiktokController struct { +type TiktokShopController struct { web.Controller } -// CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) -func (t *TiktokController) CallbackTiktokOrderMsg() { - // 1.防伪校验 - resp := api.TiktokStore.EventSignChange(t.Ctx.Request) - if resp.Code != 0 { - t.Data["json"] = resp - t.ServeJSON() - return - } - - // 2.参数解析 - orderStatus, resp := api.TiktokStore.CreateOrderCallback(t.Ctx.Request) - globals.SugarLogger.Debug("抖音订单回调数据打印测试===========", orderStatus) - if resp.Code != 0 { - t.Data["json"] = resp - t.ServeJSON() - return - } - - for k, v := range orderStatus { - for _, callback := range v { - resp2 := tiktok_store.OnOrderMsg(k, callback) - if resp2.Code != 0 { - t.Data["json"] = resp2 - t.ServeJSON() - return - } - } - } - - t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} - t.ServeJSON() - -} - // TokenMsg 抖音用户授权 -func (c *TiktokController) TokenMsg() { +func (c *TiktokShopController) TokenMsg() { code := c.Ctx.Request.URL.Query().Get("code") globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", code) result, err := api.TiktokStore.CreateToken(code) diff --git a/routers/router.go b/routers/router.go index e1cb85fa8..56c3830ba 100644 --- a/routers/router.go +++ b/routers/router.go @@ -184,7 +184,8 @@ func init() { web.AutoRouter(&controllers.TicTocController{}) web.AutoRouter(&controllers.EnterpriseController{}) - web.AutoRouter(&controllers.TiktokController{}) + web.AutoRouter(&controllers.TiktokController{}) // 订单 + web.AutoRouter(&controllers.TiktokShopController{}) // 门店授权 // 如下都是用于检测存活的空接口 web.Any("/", func(ctx *beecontext.Context) { ctx.WriteString("pong\n") From e379dac630a6e5109fccae68f6fcdacf0df485e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 18:02:00 +0800 Subject: [PATCH 3/4] 1 --- controllers/tiktok_order.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index d4e5c7667..67d2fcbee 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -14,6 +14,9 @@ type TiktokController struct { // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) func (t *TiktokController) CallbackTiktokOrderMsg() { + t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} + t.ServeJSON() + return // 1.防伪校验 resp := api.TiktokStore.EventSignChange(t.Ctx.Request) if resp.Code != 0 { From c61edcf570192c90facbeb59d685c155cbffcb63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Oct 2022 20:01:33 +0800 Subject: [PATCH 4/4] 1 --- business/partner/purchase/tiktok_store/store_sku2.go | 11 ++++++----- controllers/tiktok_order.go | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go index 896a6f0be..a3380e3ca 100644 --- a/business/partner/purchase/tiktok_store/store_sku2.go +++ b/business/partner/purchase/tiktok_store/store_sku2.go @@ -664,11 +664,12 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg tiktokApi := getAPI(storeSkuList[0].VendorOrgCode, storeID, vendorStoreID) for _, v := range storeSkuList { err := tiktokApi.UpdateSkuStock(&sku_syncStock_request.SkuSyncStockParam{ - SkuId: utils.Str2Int64(v.VendorSkuAttrId), - ProductId: utils.Str2Int64(v.VendorSkuID), - Incremental: false, - IdempotentId: "", - StockNum: int64(v.Stock), + SkuId: utils.Str2Int64(v.VendorSkuAttrId), + ProductId: utils.Str2Int64(v.VendorSkuID), + Incremental: false, + IdempotentId: "", + StockNum: int64(v.Stock), + OutWarehouseId: vendorStoreID, }) if err != nil { failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "更新库存错误")...) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 67d2fcbee..d4e5c7667 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -14,9 +14,6 @@ type TiktokController struct { // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) func (t *TiktokController) CallbackTiktokOrderMsg() { - t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} - t.ServeJSON() - return // 1.防伪校验 resp := api.TiktokStore.EventSignChange(t.Ctx.Request) if resp.Code != 0 {