From eb0e0a501961012d33746a209b137e449a250055 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 14:27:45 +0800 Subject: [PATCH] 1 --- .../partner/purchase/tiktok_store/callback.go | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index b89b7fbf3..9211a667a 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -6,42 +6,40 @@ 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) - 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,%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 + // } + //} jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD))