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

business/jxstore/cms/store.go

@@ -1786,7 +1786,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 				}
 			}
 			dao.Commit(db, txDB)
-			globals.SugarLogger.Debug("检查一下isStoreMapNeedSync(vendorID, valid)=============%s", isStoreMapNeedSync(vendorID, valid))
 			if isStoreMapNeedSync(vendorID, valid) {
 				globals.SugarLogger.Debug("1.isStoreMapNeedSync(vendorID, valid)=================", isStoreMapNeedSync(vendorID, valid))
 				_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
@@ -1794,9 +1793,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 			}
 		}
 	}
-	globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList))
-	globals.SugarLogger.Debug("errList============", utils.Format4Output(errList, true))
-	return num, errors.New(fmt.Sprintf("errList=%v,err=%v", utils.Format4Output(errList, true), err))
+	errList.AddErr(err)
+	endErr := errList.GetErrListAsOne()
+	globals.SugarLogger.Info("endErr==============", endErr)
+	return num, endErr
 }
 
 func DeleteStore(ctx *jxcontext.Context, storeID int) (num int64, err error) {

business/jxstore/cms/sync_store_sku.go

@@ -189,7 +189,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla
 					globals.SugarLogger.Debugf("SyncStoreCategories in SyncStoreSkuNew2 err on: %s", err)
 				}
 			case 1:
-				globals.SugarLogger.Debugf("同步商品分类,看看走不走: 门店地[%d],平台门店地[%s],商品id[%v]", storeID, vendorStoreID, skuIDs)
 				err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError)
 			}
 			return result, err

business/partner/purchase/tiktok_store/store.go

@@ -131,7 +131,8 @@ func (P *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 			errList.AddErr(err)
 		}
 	}
-	return vendorStoreIDs, errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))
+	endErr := errList.GetErrListAsOne()
+	return vendorStoreIDs, errors.New(fmt.Sprintf("创建抖店平台店铺相关错误信息：%v", endErr))
 }
 
 //电子围栏 仓库 运费模板 限售模板 更新与绑定
@@ -253,11 +254,11 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri
 		_, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID")
 		errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1))
 	}
+	endErr := errList.GetErrListAsOne()
 	if utils.IsNil(errList) {
 		globals.SugarLogger.Debug("绑定门店需进行的错误处理:%v", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true))))
-		return "门店绑定成功，但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))
+		return "门店绑定成功，但需要根据提示进行处理", endErr
 	} else {
-		globals.SugarLogger.Debug("the last step of")
 		return "门店绑定成功", nil
 	}
 }
@@ -370,7 +371,8 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			}
 		}
 	}
-	return errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, true), err))
+	endErr := errList.GetErrListAsOne()
+	return errors.New(fmt.Sprintf("更新抖店平台店铺信息，相关处理错误：%v", endErr))
 }
 
 // UpdateStoreStatus shop/unsuspendStore 门店恢复营业
@@ -461,7 +463,6 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-
 	return resp.TemplateId, nil
 }
 

business/partner/purchase/tiktok_store/warehouse.go

@@ -1,7 +1,6 @@
 package tiktok_store
 
 import (
-	"errors"
 	"fmt"
 	warehouse_bindFencesByStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindFencesByStore/request"
 	warehouse_bindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindStore/request"
@@ -20,6 +19,12 @@ import (
 	"strings"
 )
 
+const (
+	//京西平台的电子围栏形状
+	LocalShapeCircular = 3 //圆
+	LocalShapePolygon  = 2 //普通多边形
+)
+
 // /warehouse/create 创建单个区域仓
 func CreateWarehouse(appOrgCode, outWarehouseID string) (warehouseID int64, err error) {
 	tempName := "京西菜市(" + outWarehouseID + ")的区域仓"
@@ -99,6 +104,7 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
 		db         *dao.DaoDB
 		localStore *LocalStore
 		vertex     []warehouse_createFence_request.VerticesItem
+		param      = &warehouse_createFence_request.WarehouseCreateFenceParam{}
 	)
 	sqlParam := []interface{}{
 		model.VendorIDDD,
@@ -113,14 +119,8 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
 		return "", fmt.Errorf("storeID必填")
 	}
 	if err = dao.GetRow(db, &localStore, sqlStr, sqlParam...); err == nil {
-		param := &warehouse_createFence_request.WarehouseCreateFenceParam{
-			FenceInfo: &warehouse_createFence_request.FenceInfo{
-				OutFenceId: utils.Int64ToStr(storeID), //绑定基于此id
-				Shape:      int32(localStore.DeliveryRangeType),
-			},
-		}
 		globals.SugarLogger.Debug("localStore.DeliveryRangeType==============", localStore.DeliveryRangeType)
-		if localStore.DeliveryRangeType == tiktok_api.ShapeCircular {
+		if localStore.DeliveryRangeType == LocalShapeCircular {
 			circular := &warehouse_createFence_request.Circular{
 				Center: &warehouse_createFence_request.Center{
 					Longitude: utils.Int2Float64(localStore.Lng),
@@ -129,7 +129,8 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
 				Radius: utils.Str2Float64(localStore.DeliveryRange),
 			}
 			param.FenceInfo.Circular = circular
-		} else if localStore.DeliveryRangeType == tiktok_api.ShapePolygon {
+			param.FenceInfo.Shape = tiktok_api.ShapeCircular
+		} else if localStore.DeliveryRangeType == LocalShapePolygon {
 			tempStr := strings.Split(localStore.DeliveryRange, ";")
 			for v := len(tempStr) - 1; v >= 0; v-- {
 				s2 := strings.Split(tempStr[v], ",")
@@ -140,7 +141,9 @@ func CreateFenceByStore(appOrgCode string, storeID int64) (fenceID string, err e
 				vertex = append(vertex, vertices)
 			}
 			param.FenceInfo.Polygon.Vertices = vertex
+			param.FenceInfo.Shape = tiktok_api.ShapePolygon
 		}
+		param.FenceInfo.OutFenceId = utils.Int64ToStr(storeID) //绑定基于此id
 		resp, err := getAPI(appOrgCode, 0, "").CreateFence(param)
 		if err != nil {
 			return "", err
@@ -169,7 +172,7 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
 	var (
 		db         *dao.DaoDB
 		localStore *LocalStore
-		verticeses []warehouse_setFence_request.VerticesItem
+		vertex     []warehouse_setFence_request.VerticesItem
 	)
 	sqlParam := []interface{}{
 		model.VendorIDDD,
@@ -206,9 +209,9 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
 					Longitude: utils.Str2Float64(s2[0]),
 					Latitude:  utils.Str2Float64(s2[1]),
 				}
-				verticeses = append(verticeses, vertices)
+				vertex = append(vertex, vertices)
 			}
-			param.FenceInfo.Polygon.Vertices = verticeses
+			param.FenceInfo.Polygon.Vertices = vertex
 		}
 		if err := getAPI(appOrgCode, 0, "").SetFence(param); err != nil {
 			return err
@@ -244,7 +247,6 @@ func GetFence(appOrgCode, outFenceID string) (warehouse_getFences_response.Fence
 //单独处理运费模板
 func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) error {
 	var (
-		errStr          []string
 		errList         = errlist.New()
 		FreightTemplate = &model.FreightTemplate{}
 		db              *dao.DaoDB
@@ -256,7 +258,6 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err
 		errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
 	}
 	if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
-		globals.SugarLogger.Debug("我在创建绑定运费模板这里=========================")
 		if freightTemplateID, err := CreateFreightTemplate(int(storeID)); err != nil || freightTemplateID == 0 || utils.IsNil(freightTemplateID) {
 			globals.SugarLogger.Debug("创建运费模板失败:", err)
 			errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err))
@@ -271,19 +272,17 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err
 	} else {
 		if err := UpdateFreightTemplate(vendorOrgCode, int(storeID)); err != nil {
 			globals.SugarLogger.Debug("更新运费模板失败:", err)
-			errStr = append(errStr, fmt.Sprintf("%v", err))
-			globals.SugarLogger.Debug("检查是否可行errStr=============", errStr)
 			errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err))
 		}
 	}
-	if err = dao.CreateEntity(db, FreightTemplate); err != nil {
-		globals.SugarLogger.Debug("db update storeID,vendorStoreID defeat on :", err)
-		errList.AddErr(fmt.Errorf("db update storeID,vendorStoreID defeat on :%v", err))
-	} else {
-		_, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID")
-		errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1))
+	err1 := dao.CreateEntity(db, FreightTemplate)
+	if err1 != nil {
+		_, err2 := dao.UpdateEntity(db, FreightTemplate, "TemplateID")
+		if err2 != nil {
+			errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1))
+		}
 	}
-	globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList))
-	globals.SugarLogger.Debugf("errList===============%s", utils.Format4Output(errList, false))
-	return errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, false), err))
+	endErr := errList.GetErrListAsOne()
+	globals.SugarLogger.Debugf("errList===============%s", endErr)
+	return endErr
 }