From 7c070301f74b3547bb457bdfaae7d850b4a7ef40 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, 11 Oct 2022 10:34:29 +0800
Subject: [PATCH 1/2] 1

---
 business/partner/purchase/tiktok_store/store_sku2.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/tiktok_store/store_sku2.go b/business/partner/purchase/tiktok_store/store_sku2.go
index a3380e3ca..8c49396b5 100644
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/business/partner/purchase/tiktok_store/store_sku2.go
@@ -8,6 +8,7 @@ import (
 	product_addV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_addV2/request"
 	product_detail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_detail/response"
 	product_editV2_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_editV2/request"
+	product_editV2_commit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_editV2_commit/request"
 	shop_bindStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreFreight/request"
 	shop_bindStoreSaleLimit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreSaleLimit/request"
 	sku_editPrice_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_editPrice/request"
@@ -587,7 +588,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 	if status == model.SkuStatusNormal { // 上架
 		for _, v := range storeSkuList {
 			//	p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false)
-			if err := api.EditStoreCommodity(&product_editV2_request.ProductEditV2Param{
+			if err := api.EditStoreCommodityCommit(&product_editV2_commit_request.ProductEditV2Param2{
 				ProductId: utils.Str2Int64(v.VendorSkuID),
 				Commit:    true,
 			}); err != nil {

From 33b774bfaff27d2b563c31e3ef0c2ad14b527882 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, 11 Oct 2022 11:23:13 +0800
Subject: [PATCH 2/2] 1

---
 business/partner/purchase/tiktok_store/mtwm_test.go | 1 +
 business/partner/purchase/tiktok_store/store.go     | 2 +-
 controllers/tiktok_order.go                         | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/tiktok_store/mtwm_test.go b/business/partner/purchase/tiktok_store/mtwm_test.go
index 8d01ccebe..bc1d2920f 100644
--- a/business/partner/purchase/tiktok_store/mtwm_test.go
+++ b/business/partner/purchase/tiktok_store/mtwm_test.go
@@ -47,5 +47,6 @@ func TestGetVendorCategories(t *testing.T) {
 			t.Log(utils.Format4Output(err, false))
 		}
 	}
+
 	t.Log(utils.Format4Output(result, false))
 }
diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go
index dd6fb84c3..308a1cec9 100644
--- a/business/partner/purchase/tiktok_store/store.go
+++ b/business/partner/purchase/tiktok_store/store.go
@@ -145,7 +145,7 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		} else {
 			if freightTemplateID == 0 {
 				globals.SugarLogger.Debug("freightTemplateID=========", freightTemplateID)
-				errList.AddErr(fmt.Errorf(" ", int64(storeDetail.Store.ID), freightTemplateID, err))
+				errList.AddErr(fmt.Errorf("门店：%d 绑定运费模板:%d 失败原因：%v", int64(storeDetail.Store.ID), freightTemplateID, err))
 			}
 			err = P.ShopBindStoreFreight(int64(storeDetail.Store.ID), freightTemplateID)
 			if err != nil {
diff --git a/controllers/tiktok_order.go b/controllers/tiktok_order.go
index d4e5c7667..b4f42da3b 100644
--- a/controllers/tiktok_order.go
+++ b/controllers/tiktok_order.go
@@ -6,6 +6,7 @@ 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"
 )
 
 type TiktokController struct {
@@ -14,6 +15,11 @@ type TiktokController struct {
 
 // CallbackTiktokOrderMsg 抖店用户下单订单推送 (tiktokStore)
 func (t *TiktokController) CallbackTiktokOrderMsg() {
+	if beego.BConfig.RunMode == "beta" {
+		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 {