From 84d93580d686c2c6c1fc8f3e890ed9b5a7a508e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 28 Dec 2022 11:18:17 +0800
Subject: [PATCH] 1

---
 .../partner/purchase/tiktok_store/callback.go | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go
index af12c860e..f144d2477 100644
--- a/business/partner/purchase/tiktok_store/callback.go
+++ b/business/partner/purchase/tiktok_store/callback.go
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	tiktokShop "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/model"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"net/http"
@@ -17,29 +15,30 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
 	globals.SugarLogger.Debugf("GetCallbackOrderId tiktok msg %s", utils.Format4Output(msg, false))
 	if CurPurchaseHandler != nil {
 		orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg)
-		if shopId != 0 {
-			//storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "")
-			//globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false))
-			//globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false))
-			//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))
+		globals.SugarLogger.Debugf("shopId %d", shopId)
+		//if shopId != 0 {
+		//storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "")
+		//globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false))
+		//globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false))
+		//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))
 	}
 	return response
 }