From 57fd73de46a5ab7fd2d6f77992e53e395fc7289a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 14 Feb 2023 15:10:38 +0800
Subject: [PATCH] 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 {