From 0e95eea7ac83475761a4e91e5000fc58334d32a0 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 8 Mar 2023 17:22:17 +0800
Subject: [PATCH] 1

---
 business/model/dao/freight_template.go         |  2 ++
 .../partner/purchase/tiktok_store/store.go     | 18 +++++++++---------
 .../partner/purchase/tiktok_store/warehouse.go | 16 +++++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/business/model/dao/freight_template.go b/business/model/dao/freight_template.go
index 868620cca..48da72d0a 100644
--- a/business/model/dao/freight_template.go
+++ b/business/model/dao/freight_template.go
@@ -16,6 +16,8 @@ SELECT ?,?,?,?,?,? FROM DUAL WHERE NOT EXISTS(SELECT COUNT(store_id) FROM freigh
 	_, err := ExecuteSQL(GetDB(), sqlStr, sqlParam)
 	return err
 }
+
+// 全参数更新插入
 func ReplaceInsertFreight(tem *model.FreightTemplate) error {
 	if tem.StoreID == 0 || len(tem.VendorStoreID) == 0 {
 		return fmt.Errorf("storeID或vendorStoreID不允许为空")
diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go
index ebc2f6274..7545194ef 100644
--- a/business/partner/purchase/tiktok_store/store.go
+++ b/business/partner/purchase/tiktok_store/store.go
@@ -378,16 +378,16 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		//同步进数据库
 		FreightTemplate.FenceID = tempFenceID
 		FreightTemplate.VendorStoreID = storeInfo.VendorStoreID
-		if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
-			globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
-		}
-		//if err = dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
-		//	if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID", "StoreID", "VendorStoreID"); err1 != nil {
-		//		errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
-		//	} else {
-		//		errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
-		//	}
+		//if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
+		//	globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
 		//}
+		if err = dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
+			if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID", "StoreID", "VendorStoreID"); err1 != nil {
+				errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
+			} else {
+				errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
+			}
+		}
 		if endErr := errList.GetErrListAsOne(); endErr != nil {
 			globals.SugarLogger.Debugf("DouDian UpdateStore wrong information:%v", endErr)
 		}
diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go
index 038c68ad9..75269da45 100644
--- a/business/partner/purchase/tiktok_store/warehouse.go
+++ b/business/partner/purchase/tiktok_store/warehouse.go
@@ -264,13 +264,12 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
 		}
 	)
 	//1.运费模板
-	//bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID)
-	//if err != nil {
-	//	globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err)
-	//	//errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
-	//}
-	if true {
-		//if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
+	bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID)
+	if err != nil {
+		globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err)
+		//errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
+	}
+	if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
 		if freightTemplateID, err := CreateFreightTemplate(int(storeID), int(deliveryFeeDeductionSill)); err != nil || freightTemplateID == 0 {
 			errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err))
 		} else { //绑定
@@ -320,6 +319,9 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
 		}
 	}
 	//多次同步数据库，兜底处理
+	//if err := dao.ReplaceInsertFreight(FreightTemplate); err != nil {
+	//	globals.SugarLogger.Debug("同步数据库错误信息:%v", err)
+	//}
 	if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil {
 		_, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "TradeLimitID")
 		if err1 != nil {