1

business/jxstore/cms/store.go

@@ -6,12 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	warehouse_getFences_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_getFences/response"
-	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
-	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
-	"git.rosy.net.cn/jx-callback/business/jxstore/common"
-	"git.rosy.net.cn/jx-callback/business/jxstore/event"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
 	"io"
 	"math"
 	"mime/multipart"
@@ -20,6 +14,13 @@ import (
 	"strings"
 	"time"
 
+	warehouse_getFences_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_getFences/response"
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
+	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
+	"git.rosy.net.cn/jx-callback/business/jxstore/common"
+	"git.rosy.net.cn/jx-callback/business/jxstore/event"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
+
 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
@@ -1704,9 +1705,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	if (valid["deliveryFeeDeductionSill"] != nil || valid["deliveryFeeDeductionFee"] != nil || valid["ybStorePrefix"] != nil) && vendorID == model.VendorIDDD {
 		DDFlag = true
 	} //特殊处理抖店运费模板、打包费
-	if (storeMap.DeliveryFeeDeductionFee > 0 || utils.Str2Int(storeMap.YbStorePrefix) > 0) && vendorID == model.VendorIDDD {
-		DDFlag = true
-	}
 	if DDFlag {
 		globals.SugarLogger.Debug("进入DDFlag 特殊处理运费模板、起送价、打包费")
 		if err := tiktok_store.SpecialTreat(storeMap.VendorOrgCode, utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.StoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix)); err != nil {
@@ -1753,7 +1751,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 				}
 			}()
 			if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map，只有Status改变才需要同步到厂商
-				globals.SugarLogger.Debug("进入UpdateEntityLogicallyAndUpdateSyncStatus")
 				num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
 					model.FieldStoreID:  storeID,
 					model.FieldVendorID: vendorID,

business/partner/purchase/tiktok_store/store.go

@@ -3,6 +3,8 @@ package tiktok_store
 import (
 	"errors"
 	"fmt"
+	"reflect"
+
 	freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request"
 	freightTemplate_update_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_update/request"
 	shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request"
@@ -28,7 +30,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"reflect"
 )
 
 func SplicingTimeToDoudian(openTime1, closeTime1, openTime2, closeTime2 int16, flag bool) (timeList string) {
@@ -518,7 +519,7 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
 	}
 	param := &freightTemplate_create_request.FreightTemplateCreateParam{
 		Template: &freightTemplate_create_request.Template{
-			TemplateName:    storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")_",
+			TemplateName:    utils.Int2Str(storeCode) + "的",
 			ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
 			CalculateType:   tiktok_api.CalculateTypeNum,
 			TransferType:    tiktok_api.TransferTypeExpress,
@@ -588,7 +589,6 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
 
 // /freightTemplate/update  修改运费模板
 func UpdateFreightTemplate(storeCode int) error {
-	globals.SugarLogger.Debugf("进入UpdateFreightTemplate")
 	//获取本地门店信息
 	storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeCode, model.VendorIDDD, "")
 	if err != nil {
@@ -602,7 +602,7 @@ func UpdateFreightTemplate(storeCode int) error {
 		param := &freightTemplate_update_request.FreightTemplateUpdateParam{
 			Template: &freightTemplate_update_request.Template{
 				Id:              bindTemplate,
-				TemplateName:    storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")_",
+				TemplateName:    utils.Int2Str(storeCode) + "的",
 				ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
 				CalculateType:   tiktok_api.CalculateTypeNum,
 				TransferType:    tiktok_api.TransferTypeExpress,
@@ -653,7 +653,7 @@ func CreateBindFreeShipTemplate(storeID int, shipFee int64) error {
 	}
 	param := &freightTemplate_create_request.FreightTemplateCreateParam{
 		Template: &freightTemplate_create_request.Template{
-			TemplateName:    storeDetail.VendorStoreName + "(" + utils.Int2Str(storeID) + ")_的满" + utils.Int64ToStr(shipFee) + "包邮模板",
+			TemplateName:    utils.Int2Str(storeID) + "的满" + utils.Int64ToStr(shipFee) + "包邮模板",
 			ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
 			CalculateType:   tiktok_api.CalculateTypeNum,
 			TransferType:    tiktok_api.TransferTypeExpress,

business/partner/purchase/tiktok_store/warehouse.go

@@ -2,6 +2,9 @@ package tiktok_store
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	address_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/address_create/request"
 	address_list_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/address_list/request"
 	address_list_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/address_list/response"
@@ -19,8 +22,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/globals"
-	"strconv"
-	"strings"
 )
 
 const (
@@ -266,7 +267,7 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
 	bindFreightIDs, err := GetStoreFreight(vendorOrgCode, vendorStoreID)
 	if err != nil {
 		globals.SugarLogger.Debug("获取门店(%d) 绑定运费模板出错:", vendorStoreID, err)
-		errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
+		//errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
 	}
 	if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
 		if freightTemplateID, err := CreateFreightTemplate(int(storeID)); err != nil || freightTemplateID == 0 || utils.IsNil(freightTemplateID) {
@@ -290,7 +291,8 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
 	}
 	//3.设置门店起送价 默认为0
 	if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil {
-		errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err))
+		//errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err))
+		globals.SugarLogger.Debugf("获取门店限售模板失败:%v", err)
 	} else {
 		if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建
 			if createSaleLimitID, err := CreateAndBindMinPriceTemplate(vendorOrgCode, vendorStoreID, minPrice); err != nil {