Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

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"
 	"strings"
@@ -28,12 +30,27 @@ func (t *TiktokController) CallbackTiktokOrderMsg() {
 	}
 
 	// 2.参数解析
-	orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList)
+	orderStatus, storeMap, resp := api.TiktokStore.CreateOrderCallback(byteList)
 	if resp.Code != 0 {
 		t.Data["json"] = resp
 		t.ServeJSON()
 		return
 	}
+	globals.SugarLogger.Debugf("storeMap %s", utils.Format4Output(storeMap, false))
+	// 判断订单来源(门店所属菜市,果园,其他方)
+	//for k, _ := range storeMap {
+	//	vendorStoreId := utils.Int64ToStr(k)
+	//	storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreId, model.VendorIDDD, "")
+	//	if err != nil {
+	//		globals.SugarLogger.Errorf("门店信息获取失败: %s", err)
+	//		continue
+	//	}
+	//	if storeDetail != nil {
+	//		continue
+	//	} else {
+	//		// 进入这里面就可能是果园或者其他三放的订单了,将当前信息推送过去
+	//	}
+	//}
 
 	for k, v := range orderStatus {
 		for _, callback := range v {