From 57fd73de46a5ab7fd2d6f77992e53e395fc7289a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 15:10:38 +0800 Subject: [PATCH 01/13] 1 --- .../partner/purchase/tiktok_store/callback.go | 51 ++++++++++--------- .../purchase/tiktok_store/store_sku2_utils.go | 3 ++ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 9211a667a..54db6bf6f 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -6,40 +6,43 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" + "io/ioutil" "net/http" "strings" + "time" ) // OnOrderMsg 抖音 func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { if CurPurchaseHandler != nil { orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) - globals.SugarLogger.Debugf("order_id %s,%s", orderId, shopId) - //orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) - //if err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - //} - //vendorStoreID := orderDetail.ShopId - //if vendorStoreID != 0 { - // storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") - // if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { - // // 当前订单所属门店不属于菜市时,将消息推送到果园 - // gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} - // // 通知到果园 - // gyResult, err := HttpToGuoYuan(gyMsg, "order") - // if err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - // } - // result, _ := ioutil.ReadAll(gyResult.Body) - // var guoYuan *tiktokShop.CallbackResponse - // if err := json.Unmarshal(result, guoYuan); err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - // } - // return guoYuan - // } - //} + globals.SugarLogger.Debugf("order_id %s,%d", orderId, shopId) + orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) + if err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + vendorStoreID := orderDetail.ShopId + if vendorStoreID != 0 { + storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") + if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { + // 当前订单所属门店不属于菜市时,将消息推送到果园 + gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} + // 通知到果园 + gyResult, err := HttpToGuoYuan(gyMsg, "order") + if err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + result, _ := ioutil.ReadAll(gyResult.Body) + var guoYuan *tiktokShop.CallbackResponse + if err := json.Unmarshal(result, guoYuan); err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + return guoYuan + } + } jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index b35fd7207..e023e0eff 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -722,6 +722,9 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { // GetDeliveryTemp 获取运费模板id,运费模板不存在则创建 func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao.StoreDetail) (int64, error) { + if vendorStoreID == "" { + return 0, errors.New("平台门店id未绑定") + } // 没有模板是查询线上模板 freightId, _ := api.GetStoreBindTemp(utils.Str2Int64(vendorStoreID)) if freightId == 0 { From f839c10b7623248ad722e8baacbd2fc81ae6b20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 15:11:40 +0800 Subject: [PATCH 02/13] 1 --- .../partner/purchase/tiktok_store/callback.go | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 54db6bf6f..8d70ea0f0 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -6,13 +6,10 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" - "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" - "io/ioutil" "net/http" "strings" - "time" ) // OnOrderMsg 抖音 @@ -20,29 +17,29 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes if CurPurchaseHandler != nil { orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) globals.SugarLogger.Debugf("order_id %s,%d", orderId, shopId) - orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) - if err != nil { - return tiktokShop.Err2CallbackResponse(err, "") - } - vendorStoreID := orderDetail.ShopId - if vendorStoreID != 0 { - storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") - if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { - // 当前订单所属门店不属于菜市时,将消息推送到果园 - gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} - // 通知到果园 - gyResult, err := HttpToGuoYuan(gyMsg, "order") - if err != nil { - return tiktokShop.Err2CallbackResponse(err, "") - } - result, _ := ioutil.ReadAll(gyResult.Body) - var guoYuan *tiktokShop.CallbackResponse - if err := json.Unmarshal(result, guoYuan); err != nil { - return tiktokShop.Err2CallbackResponse(err, "") - } - return guoYuan - } - } + //orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) + //if err != nil { + // return tiktokShop.Err2CallbackResponse(err, "") + //} + //vendorStoreID := orderDetail.ShopId + //if vendorStoreID != 0 { + // storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") + // if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { + // // 当前订单所属门店不属于菜市时,将消息推送到果园 + // gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} + // // 通知到果园 + // gyResult, err := HttpToGuoYuan(gyMsg, "order") + // if err != nil { + // return tiktokShop.Err2CallbackResponse(err, "") + // } + // result, _ := ioutil.ReadAll(gyResult.Body) + // var guoYuan *tiktokShop.CallbackResponse + // if err := json.Unmarshal(result, guoYuan); err != nil { + // return tiktokShop.Err2CallbackResponse(err, "") + // } + // return guoYuan + // } + //} jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) From 19bb2f1e3c380b98903a36ade2b14ef7a7db705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 15:54:00 +0800 Subject: [PATCH 03/13] 1 --- .../partner/purchase/tiktok_store/callback.go | 49 ++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 8d70ea0f0..54db6bf6f 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -6,10 +6,13 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" + "io/ioutil" "net/http" "strings" + "time" ) // OnOrderMsg 抖音 @@ -17,29 +20,29 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes if CurPurchaseHandler != nil { orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) globals.SugarLogger.Debugf("order_id %s,%d", orderId, shopId) - //orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) - //if err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - //} - //vendorStoreID := orderDetail.ShopId - //if vendorStoreID != 0 { - // storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") - // if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { - // // 当前订单所属门店不属于菜市时,将消息推送到果园 - // gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} - // // 通知到果园 - // gyResult, err := HttpToGuoYuan(gyMsg, "order") - // if err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - // } - // result, _ := ioutil.ReadAll(gyResult.Body) - // var guoYuan *tiktokShop.CallbackResponse - // if err := json.Unmarshal(result, guoYuan); err != nil { - // return tiktokShop.Err2CallbackResponse(err, "") - // } - // return guoYuan - // } - //} + orderDetail, err := GetTiktokApi(utils.Int64ToStr(shopId), 0, "").GetTiktokOrderDetail(orderId) + if err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + vendorStoreID := orderDetail.ShopId + if vendorStoreID != 0 { + storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") + if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { + // 当前订单所属门店不属于菜市时,将消息推送到果园 + gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} + // 通知到果园 + gyResult, err := HttpToGuoYuan(gyMsg, "order") + if err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + result, _ := ioutil.ReadAll(gyResult.Body) + var guoYuan *tiktokShop.CallbackResponse + if err := json.Unmarshal(result, guoYuan); err != nil { + return tiktokShop.Err2CallbackResponse(err, "") + } + return guoYuan + } + } jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) From ea2f6bcc16d8656a52ef1095c9823b180afdb91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 16:30:04 +0800 Subject: [PATCH 04/13] 1 --- .../partner/purchase/tiktok_store/callback.go | 28 ++++++++++++------- globals/api/apimanager/apimanager.go | 3 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 54db6bf6f..c8bf531d0 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -24,9 +24,10 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes if err != nil { return tiktokShop.Err2CallbackResponse(err, "") } - vendorStoreID := orderDetail.ShopId - if vendorStoreID != 0 { - storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(vendorStoreID), model.VendorIDDD, "") + vendorStoreID := orderDetail.SkuOrderList[0].StoreInfo.StoreId + + if vendorStoreID != "" { + storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreID, model.VendorIDDD, "") if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { // 当前订单所属门店不属于菜市时,将消息推送到果园 gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} @@ -37,8 +38,8 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes } result, _ := ioutil.ReadAll(gyResult.Body) var guoYuan *tiktokShop.CallbackResponse - if err := json.Unmarshal(result, guoYuan); err != nil { - return tiktokShop.Err2CallbackResponse(err, "") + if err2 := json.Unmarshal(result, guoYuan); err2 != nil { + return tiktokShop.Err2CallbackResponse(err2, "") } return guoYuan } @@ -51,12 +52,19 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes } func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Response, error) { - globals.SugarLogger.Debugf("=========param %s", utils.Format4Output(param, false)) - paramData, err := json.Marshal(param) - if err != nil { - return nil, err + var paramData []byte + var err error + if requestType == "order" { + paramData, err = json.Marshal([]interface{}{param}) + if err != nil { + return nil, err + } + } else { + paramData, err = json.Marshal(param) + if err != nil { + return nil, err + } } - body := strings.NewReader(string(paramData)) url := "" diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 550a5c3c6..f45c53748 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -73,7 +73,8 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) if len(codes) == 0 { return nil } - pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) + // pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) + pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), "{\"access_token\":\"41a91991-7652-4d20-a7ef-12396a1a42ea\",\"expires_in\":1676849351,\"scope\":\"SCOPE\",\"shop_id\":57939570,\"shop_name\":\"京西菜市速食\",\"refresh_token\":\"3d4ad783-8371-48ae-8212-3ee143ea7aca\",\"authority_id\":\"\"}") } return pfAPI } From 6ecee0ad835268327bb9df783e0c20509d6952f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 17:19:05 +0800 Subject: [PATCH 05/13] 1 --- business/jxstore/cms/store.go | 2 +- .../partner/purchase/tiktok_store/callback.go | 2 ++ controllers/tiktok_order.go | 16 +++++++++++----- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c9ece74c9..4572b9723 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3526,7 +3526,7 @@ func GetStoreCategoryMap(ctx *jxcontext.Context, parentID, level int, storeID in if err != nil { return nil, err } - if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { + if ctx.GetLoginType() != auth2.AuthTypePassword && ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini && ctx.GetLoginType() != weixin.AuthTypeWxApp && ctx.GetLoginType() != weixin.AuthTypeWxAppCaishi && ctx.GetLoginType() != auth2.AuthTypeMobile { return storeCatMaps, err } //表示没有门店分类 diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index c8bf531d0..4733dbdfb 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -55,6 +55,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp var paramData []byte var err error if requestType == "order" { + param["data"] = utils.Format4Output(param["data"], false) paramData, err = json.Marshal([]interface{}{param}) if err != nil { return nil, err @@ -80,6 +81,7 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp if err != nil { return nil, err } + httpReq.Header.Set("Content-Type", "application/json") httpRes, err := http.DefaultClient.Do(httpReq) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 2a1eecdcb..9c3b79376 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" + beego "github.com/astaxie/beego/server/web" "strings" ) @@ -15,12 +16,17 @@ type TiktokController struct { // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) func (t *TiktokController) CallbackTiktokOrderMsg() { // 1.防伪校验 - resp, byteList := api.TiktokStore.EventSignChange(t.Ctx.Request) - if resp.Code != 0 { - t.Data["json"] = resp - t.ServeJSON() - return + var byteList []byte + var resp *tiktok_api.CallbackResponse + if beego.BConfig.RunMode != "jxgy" { + resp, byteList = api.TiktokStore.EventSignChange(t.Ctx.Request) + if resp.Code != 0 { + t.Data["json"] = resp + t.ServeJSON() + return + } } + if strings.Contains(string(byteList), "\"msg_id\":\"0\"") { t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} t.ServeJSON() From 85aa68245314887f1e2983615e42ec2951b968ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 17:37:46 +0800 Subject: [PATCH 06/13] 1 --- business/partner/purchase/tiktok_store/callback.go | 4 ++++ controllers/tiktok_order.go | 3 +++ 2 files changed, 7 insertions(+) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 4733dbdfb..4afa7f607 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -17,6 +17,7 @@ import ( // OnOrderMsg 抖音 func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { + globals.SugarLogger.Debugf("guoyuan %s,%s", msgId, utils.Format4Output(msg, false)) if CurPurchaseHandler != nil { orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) globals.SugarLogger.Debugf("order_id %s,%d", orderId, shopId) @@ -47,6 +48,9 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) + } else { + globals.SugarLogger.Debugf("============2") + } return response } diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 9c3b79376..13fb0d938 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -2,7 +2,9 @@ package controllers import ( "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "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" beego "github.com/astaxie/beego/server/web" @@ -35,6 +37,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() { // 2.参数解析 orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList) + globals.SugarLogger.Debugf("orderStatus %s,%s", utils.Format4Output(orderStatus, false), utils.Format4Output(resp, false)) if resp.Code != 0 { t.Data["json"] = resp t.ServeJSON() From 90d6d41cfaf76120b82dbe5fee3d2e7d17c47528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 17:42:34 +0800 Subject: [PATCH 07/13] 1 --- controllers/tiktok_order.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go index 13fb0d938..358e1dbc8 100644 --- a/controllers/tiktok_order.go +++ b/controllers/tiktok_order.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" - beego "github.com/astaxie/beego/server/web" "strings" ) @@ -18,15 +17,11 @@ type TiktokController struct { // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore) func (t *TiktokController) CallbackTiktokOrderMsg() { // 1.防伪校验 - var byteList []byte - var resp *tiktok_api.CallbackResponse - if beego.BConfig.RunMode != "jxgy" { - resp, byteList = api.TiktokStore.EventSignChange(t.Ctx.Request) - if resp.Code != 0 { - t.Data["json"] = resp - t.ServeJSON() - return - } + resp, byteList := api.TiktokStore.EventSignChange(t.Ctx.Request) + if resp.Code != 0 { + t.Data["json"] = resp + t.ServeJSON() + return } if strings.Contains(string(byteList), "\"msg_id\":\"0\"") { From ae6866917ff2acbec9bbacfaee8f7010247eb0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 17:46:18 +0800 Subject: [PATCH 08/13] 1 --- globals/api/apimanager/apimanager.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index f45c53748..550a5c3c6 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -73,8 +73,7 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) if len(codes) == 0 { return nil } - // pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) - pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), "{\"access_token\":\"41a91991-7652-4d20-a7ef-12396a1a42ea\",\"expires_in\":1676849351,\"scope\":\"SCOPE\",\"shop_id\":57939570,\"shop_name\":\"京西菜市速食\",\"refresh_token\":\"3d4ad783-8371-48ae-8212-3ee143ea7aca\",\"authority_id\":\"\"}") + pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) } return pfAPI } From 076139e60028d81c37456be26558410f620a8dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 14 Feb 2023 18:07:04 +0800 Subject: [PATCH 09/13] 1 --- globals/api/apimanager/apimanager.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index 550a5c3c6..d84ba6ea9 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -3,6 +3,7 @@ package apimanager import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" @@ -73,6 +74,9 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) if len(codes) == 0 { return nil } + globals.SugarLogger.Debugf("============codes1 %s", utils.Format4Output(codes, false)) + globals.SugarLogger.Debugf("============codes2 %s", beego.AppConfig.DefaultString("tiktokShopAppId", "")) + globals.SugarLogger.Debugf("============codes3 %s", beego.AppConfig.DefaultString("tiktokShopAppSecret", "")) pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) } return pfAPI From eab817817fda59c04d0dd18c9f9d231dca0e9d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 15 Feb 2023 14:09:51 +0800 Subject: [PATCH 10/13] 1 --- business/jxstore/cms/store.go | 3 +- business/model/store.go | 11 ++-- business/partner/purchase/ebai/order.go | 46 ++++++++++----- .../partner/purchase/tiktok_store/callback.go | 22 +++++-- controllers/tiktok_delivery.go | 58 ++++++++++++++++--- controllers/tiktok_store.go | 1 + 6 files changed, 105 insertions(+), 36 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 4572b9723..a90fff742 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -523,6 +523,7 @@ func setStoreMapInfo(ctx *jxcontext.Context, db *dao.DaoDB, storesInfo *StoresIn v.IDCardFront = "" v.IDCardBack = "" v.IDCardHand = "" + v.IDCardHandBack = "" v.Licence = "" v.Licence2Image = "" } @@ -4455,7 +4456,7 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) { v.UpdatedAt = time.Now() v.StoreBrandName = "定时任务更新" dao.UpdateEntity(db, v, "Token", "UpdatedAt", "StoreBrandName") - tiktok_store.HttpToGuoYuan(utils.Struct2MapByJson(v), "token") + tiktok_store.HttpToGuoYuan(utils.Struct2MapByJson(v), tiktok_store.CaiShiPushGyTagToken) } } } diff --git a/business/model/store.go b/business/model/store.go index 763dcdb04..1c0ed42b3 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -340,11 +340,12 @@ type Store struct { PrinterSound string `json:"printerSound"` //打印机语音，京西打印机 PrinterTemplate string `json:"printerTemplate"` //打印模板。京西打印机 - IDCardFront string `orm:"size(255);column(id_card_front)" json:"idCardFront"` - IDCardBack string `orm:"size(255);column(id_card_back)" json:"idCardBack"` - IDCardHand string `orm:"size(255);column(id_card_hand)" json:"idCardHand"` - Licence string `orm:"size(255)" json:"licence"` // 营业执照图片 - LicenceCode string `orm:"size(32)" json:"licenceCode"` + IDCardFront string `orm:"size(255);column(id_card_front)" json:"idCardFront"` // 身份证正面 + IDCardBack string `orm:"size(255);column(id_card_back)" json:"idCardBack"` // 身份证背面 + IDCardHand string `orm:"size(255);column(id_card_hand)" json:"idCardHand"` // 手持身份证正面 + IDCardHandBack string `orm:"size(255);column(id_card_hand_back)" json:"idCardHandBack"` // 手持身份证背面 + Licence string `orm:"size(255)" json:"licence"` // 营业执照图片 + LicenceCode string `orm:"size(32)" json:"licenceCode"` LicenceType int8 `json:"licenceType"` // 营业执照类型，0：个人，1：公司 LicenceCorpName string `orm:"size(64)" json:"licenceCorpName"` // 营业执照公司名称 diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index f4d92ddb1..5eea2f695 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -1,6 +1,7 @@ package ebai import ( + "errors" "fmt" "math" "strings" @@ -387,23 +388,36 @@ func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *mod // 将订单从购物平台配送转为自送 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { if globals.EnableEbaiStoreWrite { - if order.DeliveryType == model.OrderDeliveryTypePlatform { - if err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID); err != nil { - if strings.Contains(err.Error(), "301251") { - api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手 - } - if utils.IsErrMatch(err, "301251", nil) { - if deliveryStatus, err2 := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err2 == nil { - deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatus["status"])) - if deliveryStatus == ebaiapi.WaybillStatusSelfDelivery { - err = nil - } else if deliveryStatus == ebaiapi.WaybillStatusDeliveryCancled { - p.trySyncCancelStatus(order.VendorOrderID) - } - } - } - } + deliveryStatusObj, _ := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID) + deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatusObj["status"])) + switch deliveryStatus { + case ebaiapi.WaybillStatusSelfDelivery: + err = nil + case ebaiapi.WaybillStatusDeliveryCancled: + p.trySyncCancelStatus(order.VendorOrderID) + case ebaiapi.WaybillStatusNew, ebaiapi.WaybillStatusRequestDelivery, ebaiapi.WaybillStatusWait4Courier: + err = api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手 + case ebaiapi.WaybillStatusCourierAccepted: + err = errors.New("骑手已接单,无法转自送") } + + //if order.DeliveryType == model.OrderDeliveryTypePlatform { + // if err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID); err != nil { + // if strings.Contains(err.Error(), "301251") { + // api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手 + // } + // if utils.IsErrMatch(err, "301251", nil) { + // if deliveryStatus, err2 := api.EbaiAPI.OrderDeliveryGet(order.VendorOrderID); err2 == nil { + // deliveryStatus := utils.Int64ToStr(utils.MustInterface2Int64(deliveryStatus["status"])) + // if deliveryStatus == ebaiapi.WaybillStatusSelfDelivery { + // err = nil + // } else if deliveryStatus == ebaiapi.WaybillStatusDeliveryCancled { + // p.trySyncCancelStatus(order.VendorOrderID) + // } + // } + // } + // } + //} } if err == nil { // 饿百不会发送配送中，模拟发送 diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index 4afa7f607..205742f57 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -15,6 +15,15 @@ import ( "time" ) +// 同一账号下,菜市消息推送到果园 +const ( + CaiShiPushGyTagOrder = "order" // 订单 + CaiShiPushGyTagToken = "token" // 授权 + CaiShiPushGyTagDeliveryRegister = "delivery" // 配送注册查询 + CaiShiPushGyTagDeliveryDetail = "deliveryDetail" // 配送详情 + CaiShiPushGyTagWayBill = "waybill" // 配送 +) + // OnOrderMsg 抖音 func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { globals.SugarLogger.Debugf("guoyuan %s,%s", msgId, utils.Format4Output(msg, false)) @@ -33,7 +42,7 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes // 当前订单所属门店不属于菜市时,将消息推送到果园 gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} // 通知到果园 - gyResult, err := HttpToGuoYuan(gyMsg, "order") + gyResult, err := HttpToGuoYuan(gyMsg, CaiShiPushGyTagOrder) if err != nil { return tiktokShop.Err2CallbackResponse(err, "") } @@ -50,7 +59,6 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD)) } else { globals.SugarLogger.Debugf("============2") - } return response } @@ -74,11 +82,15 @@ func HttpToGuoYuan(param map[string]interface{}, requestType string) (*http.Resp url := "" switch requestType { - case "order": // 订单相关 + case CaiShiPushGyTagOrder: // 订单相关 url = "http://callback-jxgy.jxc4.com/tiktok/callbackTiktokOrderMsg" - case "token": // 授权相关 + case CaiShiPushGyTagToken: // 授权相关 url = "http://callback-jxgy.jxc4.com/tiktokShop/jxcsToGyTiktokToken" - case "wayBill": // 运单消息 + case CaiShiPushGyTagDeliveryRegister: // 配送查询注册 + url = "http://callback-jxgy.jxc4.com/logistics/logisticsRegister" + case CaiShiPushGyTagDeliveryDetail: // 配送查询详情 + url = "http://callback-jxgy.jxc4.com/logistics/logisticsQuery" + case CaiShiPushGyTagWayBill: // 运单消息 } httpReq, err := http.NewRequest(http.MethodPost, url, body) diff --git a/controllers/tiktok_delivery.go b/controllers/tiktok_delivery.go index 0bd9daf92..377f98bb5 100644 --- a/controllers/tiktok_delivery.go +++ b/controllers/tiktok_delivery.go @@ -7,7 +7,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" - "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "github.com/astaxie/beego/server/web" "io/ioutil" "time" @@ -58,8 +58,32 @@ func (c *LogisticsController) LogisticsRegister() { } // 查询订单的运单是否存在 data, err := dao.GetWayBillsByWayBillId(dao.GetDB(), register.TrackNo) - if err != nil { - globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err) + + // 此订单可能是果园订单 + if web.BConfig.RunMode != "jxgy" && (len(data) == 0 || err != nil) { + resp, err := tiktok_store.HttpToGuoYuan(utils.Struct2Map(register, "", true), tiktok_store.CaiShiPushGyTagDeliveryRegister) + if err != nil { + c.Data["json"] = LogisticsRegisterResp{ + Result: false, + ReturnCode: "1002", + Message: "单号不存在", + } + c.ServeJSON() + return + } + gyData := &LogisticsRegisterResp{} + gyBody, _ := ioutil.ReadAll(resp.Body) + if err := json.Unmarshal(gyBody, gyData); err != nil { + c.Data["json"] = LogisticsRegisterResp{ + Result: false, + ReturnCode: "1002", + Message: "单号不存在", + } + c.ServeJSON() + return + } + c.Data["json"] = gyData + c.ServeJSON() } if len(data) == 0 || err != nil { @@ -156,14 +180,30 @@ func (c *LogisticsController) LogisticsQuery() { // 查询订单的运单是否存在 data, err := dao.GetWayBillsByWayBillId(dao.GetDB(), param.TrackNo) - if err != nil || len(data) == 0 { - c.Data["json"] = LogisticsQueryRest{ - Result: false, - ReturnCode: "1002", - Message: "运单账号不存在", + if (err != nil || len(data) == 0) && web.BConfig.RunMode != "jxgy" { + resp, err := tiktok_store.HttpToGuoYuan(utils.Struct2Map(param, "", true), tiktok_store.CaiShiPushGyTagDeliveryDetail) + if err != nil { + c.Data["json"] = LogisticsQueryRest{ + Result: false, + ReturnCode: "1002", + Message: "运单账号不存在", + } + c.ServeJSON() + return } + wayBillDetail := &LogisticsQueryRest{} + gyBody, _ := ioutil.ReadAll(resp.Body) + if err := json.Unmarshal(gyBody, wayBillDetail); err != nil { + c.Data["json"] = LogisticsQueryRest{ + Result: false, + ReturnCode: "1002", + Message: "json unmarshal", + } + c.ServeJSON() + return + } + c.Data["json"] = wayBillDetail c.ServeJSON() - return } returnParam := &LogisticsQueryRest{ diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index 3ad78c873..f08a3aab4 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -154,6 +154,7 @@ func (c *TiktokShopController) TokenMsg() { c.ServeJSON() } +// JxcsToGyTiktokToken 果园京西速食接受token更新 func (c *TiktokShopController) JxcsToGyTiktokToken() { data, err := ioutil.ReadAll(c.Ctx.Request.Body) if err != nil { From 02de1644f6bd328100a90cb711a7c77d684d83a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 15 Feb 2023 14:25:27 +0800 Subject: [PATCH 11/13] 1 --- business/model/store.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/business/model/store.go b/business/model/store.go index 1c0ed42b3..f0b292cff 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -340,12 +340,11 @@ type Store struct { PrinterSound string `json:"printerSound"` //打印机语音，京西打印机 PrinterTemplate string `json:"printerTemplate"` //打印模板。京西打印机 - IDCardFront string `orm:"size(255);column(id_card_front)" json:"idCardFront"` // 身份证正面 - IDCardBack string `orm:"size(255);column(id_card_back)" json:"idCardBack"` // 身份证背面 - IDCardHand string `orm:"size(255);column(id_card_hand)" json:"idCardHand"` // 手持身份证正面 - IDCardHandBack string `orm:"size(255);column(id_card_hand_back)" json:"idCardHandBack"` // 手持身份证背面 - Licence string `orm:"size(255)" json:"licence"` // 营业执照图片 - LicenceCode string `orm:"size(32)" json:"licenceCode"` + IDCardFront string `orm:"size(255);column(id_card_front)" json:"idCardFront"` // 身份证正面 + IDCardBack string `orm:"size(255);column(id_card_back)" json:"idCardBack"` // 身份证背面 + IDCardHand string `orm:"size(255);column(id_card_hand)" json:"idCardHand"` // 手持身份证正面 + Licence string `orm:"size(255)" json:"licence"` // 营业执照图片 + LicenceCode string `orm:"size(32)" json:"licenceCode"` LicenceType int8 `json:"licenceType"` // 营业执照类型，0：个人，1：公司 LicenceCorpName string `orm:"size(64)" json:"licenceCorpName"` // 营业执照公司名称 @@ -391,13 +390,14 @@ type Store struct { OperatorPhone3 string `orm:"size(16)" json:"operatorPhone3"` // 饿百运营人电话 OperatorRole3 string `orm:"size(32)" json:"operatorRole3"` // 饿百运营人组（角色） - PromoteInfo string `orm:"size(255)" json:"promoteInfo"` //门店公告（所有平台统一的公告） - IsBoughtMatter int `json:"isBoughtMatter"` //这周是否申请过物料 - SoundPercentage int `json:"soundPercentage"` //打印机声音大小比例 - Banner string `orm:"size(9999)" json:"banner"` //门店商城bannar图 - BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID - IsPrintCancelOrder int `orm:"column(is_print_cancel_order)" json:"isPrintCancelOrder"` //是否打印取消订单1是/-1否 - IsPrintRefundOrder int `orm:"column(is_print_refund_order)" json:"isPrintRefundOrder"` //是否打印退款订单1是/-1否 + PromoteInfo string `orm:"size(255)" json:"promoteInfo"` //门店公告（所有平台统一的公告） + IsBoughtMatter int `json:"isBoughtMatter"` //这周是否申请过物料 + SoundPercentage int `json:"soundPercentage"` //打印机声音大小比例 + Banner string `orm:"size(9999)" json:"banner"` //门店商城bannar图 + BrandID int `orm:"column(brand_id)" json:"brandID"` //品牌ID + IsPrintCancelOrder int `orm:"column(is_print_cancel_order)" json:"isPrintCancelOrder"` //是否打印取消订单1是/-1否 + IsPrintRefundOrder int `orm:"column(is_print_refund_order)" json:"isPrintRefundOrder"` //是否打印退款订单1是/-1否 + IDCardHandBack string `orm:"size(255);column(id_card_hand_back)" json:"idCardHandBack"` // 手持身份证背面 } func (*Store) TableUnique() [][]string { From b42a82354071bd57c6fa49b01252f032a12ac825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 15 Feb 2023 15:26:41 +0800 Subject: [PATCH 12/13] 1 --- business/jxstore/cms/sku.go | 32 +++++++++++++++------------- globals/api/apimanager/apimanager.go | 4 ---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index e8d5d9ce4..fa45d34ae 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1087,23 +1087,25 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf } if len(skuIDs) > 0 { // 判断是否改价 - nowPrice, _ := payload["price"].(json.Number).Int64() - if skuName.Price != int(nowPrice) && nowPrice != 0 { + if payload["price"] != nil { + nowPrice, _ := payload["price"].(json.Number).Int64() + if skuName.Price != int(nowPrice) && nowPrice != 0 { - for _, v1 := range payload["skus"].([]interface{}) { - v := v1.(map[string]interface{}) - skuInfo := &aa{} - if err := utils.Map2StructByJson(v, skuInfo, false); err != nil { - globals.SugarLogger.Debugf("errr %v", err) - continue + for _, v1 := range payload["skus"].([]interface{}) { + v := v1.(map[string]interface{}) + skuInfo := &aa{} + if err := utils.Map2StructByJson(v, skuInfo, false); err != nil { + globals.SugarLogger.Debugf("errr %v", err) + continue + } + var skuPrice int64 = 0 + if payload["unit"] == "份" { // 商品规格等于份的时候,标准重量保持为500g + skuPrice = int64(float64(skuInfo.SpecQuality) / float64(500) * float64(nowPrice)) + } else { + skuPrice = nowPrice + } + SetUpdateSkuPriceIfChange(db, skuPrice, nowPrice, skuInfo.Id) } - var skuPrice int64 = 0 - if payload["unit"] == "份" { // 商品规格等于份的时候,标准重量保持为500g - skuPrice = int64(float64(skuInfo.SpecQuality) / float64(500) * float64(nowPrice)) - } else { - skuPrice = nowPrice - } - SetUpdateSkuPriceIfChange(db, skuPrice, nowPrice, skuInfo.Id) } } diff --git a/globals/api/apimanager/apimanager.go b/globals/api/apimanager/apimanager.go index d84ba6ea9..550a5c3c6 100644 --- a/globals/api/apimanager/apimanager.go +++ b/globals/api/apimanager/apimanager.go @@ -3,7 +3,6 @@ package apimanager import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" @@ -74,9 +73,6 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{}) if len(codes) == 0 { return nil } - globals.SugarLogger.Debugf("============codes1 %s", utils.Format4Output(codes, false)) - globals.SugarLogger.Debugf("============codes2 %s", beego.AppConfig.DefaultString("tiktokShopAppId", "")) - globals.SugarLogger.Debugf("============codes3 %s", beego.AppConfig.DefaultString("tiktokShopAppSecret", "")) pfAPI = tiktok_api.New(beego.AppConfig.DefaultString("tiktokShopAppId", ""), beego.AppConfig.DefaultString("tiktokShopAppSecret", ""), codes[0].Token) } return pfAPI From 6f036f9dd0037299079d32eafb3a569b650dcd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 15 Feb 2023 18:07:08 +0800 Subject: [PATCH 13/13] 1 --- business/jxstore/cms/sku.go | 5 ----- business/partner/purchase/tiktok_store/dy.go | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index fa45d34ae..3b0e5dc1f 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -950,7 +950,6 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s } func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interface{}, isExd bool) (num int64, err error) { - globals.SugarLogger.Debugf("==========payload %s", utils.Format4Output(payload, false)) userName := ctx.GetUserName() skuName := &model.SkuName{} skuName.ID = nameID @@ -1026,10 +1025,6 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf panic(r) } }() - globals.SugarLogger.Debugf("UpdateEntityLogically 1 := %s", utils.Format4Output(skuName, false)) - globals.SugarLogger.Debugf("UpdateEntityLogically 2 := %s", utils.Format4Output(valid, false)) - globals.SugarLogger.Debugf("UpdateEntityLogically 3 := %s", userName) - // valid[model.FieldJdSyncStatus] = model.SyncFlagModifiedMask | skuName.JdSyncStatus if num, err = dao.UpdateEntityLogically(db, skuName, valid, userName, nil); err != nil { dao.Rollback(db, txDB) return 0, err diff --git a/business/partner/purchase/tiktok_store/dy.go b/business/partner/purchase/tiktok_store/dy.go index 355e52627..f2772c3b4 100644 --- a/business/partner/purchase/tiktok_store/dy.go +++ b/business/partner/purchase/tiktok_store/dy.go @@ -47,7 +47,7 @@ func (c *PurchaseHandler) GetVendorID() int { } func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) { - cats, err := getAPI("57939570", 0, "").GetShopCategory(0) + cats, err := getAPI("68023619", 0, "").GetShopCategory(0) if err != nil { return nil, err }