From 156e9e18a13e81849a8e4de93d2aa3a45d54ab35 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Tue, 10 Jan 2023 13:43:46 +0800
Subject: [PATCH] 1

---
 .../partner/delivery/tiktok_store/waybill.go  | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go
index b4e27b48e..569d5429c 100644
--- a/business/partner/delivery/tiktok_store/waybill.go
+++ b/business/partner/delivery/tiktok_store/waybill.go
@@ -13,7 +13,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"time"
@@ -62,11 +61,8 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
 			VendorStoreID: utils.Int64ToStr(storeInfo.StoreDetail.Store.StoreId),
 			CourierStatus: int(storeInfo.StoreDetail.Store.State),
 		}
-<<<<<<< HEAD
-=======
 	} else {
 		globals.SugarLogger.Debugf("GetStoreDetail err %s", err)
->>>>>>> 68b5033815cd812e1d9516b5f64acfab2665ee94
 	}
 	return storeDetail, err
 }
@@ -81,28 +77,29 @@ func (c *DeliveryHandler) IsErrStoreExist(err error) bool {
 
 // 呼叫运力并发货
 func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) {
-	relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
-	if err != nil {
-		return nil, errors.New("获取抖音平台账号信息失败，请重试")
-	}
-	apiObj := getAPI(relInfo.VendorOrgCode)
-	if order.VendorID != model.VendorIDDD {
-		return nil, errors.New("非抖音平台店铺不可发抖音配送")
-	}
-	bill = &model.Waybill{
-		VendorOrderID:   order.VendorOrderID,
-		OrderVendorID:   order.VendorID,
-		VendorWaybillID: order.VendorOrderID, //抖音配送订单号即运单号
-		WaybillVendorID: model.VendorIDDYPS,
-	}
-	if dispatcherFee, err := apiObj.GetDispatcherInfo(int64(order.StoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
-		bill.DesiredFee = dispatcherFee
-	}
-	if err := apiObj.ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err != nil {
-		return nil, err
-	}
-	delivery.OnWaybillCreated(bill)
-	return bill, nil
+	return nil, nil
+	//relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
+	//if err != nil {
+	//	return nil, errors.New("获取抖音平台账号信息失败，请重试")
+	//}
+	//apiObj := getAPI(relInfo.VendorOrgCode)
+	//if order.VendorID != model.VendorIDDD {
+	//	return nil, errors.New("非抖音平台店铺不可发抖音配送")
+	//}
+	//bill = &model.Waybill{
+	//	VendorOrderID:   order.VendorOrderID,
+	//	OrderVendorID:   order.VendorID,
+	//	VendorWaybillID: order.VendorOrderID, //抖音配送订单号即运单号
+	//	WaybillVendorID: model.VendorIDDYPS,
+	//}
+	//if dispatcherFee, err := apiObj.GetDispatcherInfo(int64(order.StoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
+	//	bill.DesiredFee = dispatcherFee
+	//}
+	//if err := apiObj.ShopOrderDispatcher(utils.Str2Int64(order.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err != nil {
+	//	return nil, err
+	//}
+	//delivery.OnWaybillCreated(bill)
+	//return bill, nil
 }
 
 func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
@@ -122,15 +119,16 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int,
 }
 
 func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) {
-	relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
-	if err != nil {
-		return nil, errors.New("获取抖音平台账号信息失败，请重试")
-	}
-	if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(utils.Str2Int64(relInfo.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
-		deliveryFeeInfo = &partner.WaybillFeeInfo{}
-		deliveryFeeInfo.DeliveryFee = dispatcherFee
-	}
-	return deliveryFeeInfo, err
+	return nil, nil
+	//relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "")
+	//if err != nil {
+	//	return nil, errors.New("获取抖音平台账号信息失败，请重试")
+	//}
+	//if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(utils.Str2Int64(relInfo.VendorStoreID), order.VendorOrderID, tiktok_api.DispatcherFeeTypeCall); err == nil {
+	//	deliveryFeeInfo = &partner.WaybillFeeInfo{}
+	//	deliveryFeeInfo.DeliveryFee = dispatcherFee
+	//}
+	//return deliveryFeeInfo, err
 }
 func getDispatcherFee(storeID int64, vendorOrderID string, dispatcherType int32) int64 {
 	if relInfo, err := dao.GetStoreDetailForDD(dao.GetDB(), 0, model.VendorIDDD, utils.Int64ToStr(storeID), ""); err != nil {