From 55cb35c1d091a5b86bd7ac86b2573a2650bc1ae6 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 09:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go         | 60 ++++++++++++++++-------
 business/partner/purchase/jdshop/store.go |  1 +
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d63da4ca5..4d518cefe 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -18,6 +18,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -1499,26 +1500,47 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	db := dao.GetDB()
-	result1, _ := api.JdShopAPI.GetProvince()
-	for _, v := range result1 {
-		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-		place1.JdsCode = v.AreaID
-		dao.UpdateEntity(db, place1, "JdsCode")
-		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-		for _, vv := range result2 {
-			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-			place2.JdsCode = vv.AreaID
-			dao.UpdateEntity(db, place2, "JdsCode")
-			place22, _ := dao.GetPlaceByName(db, vv.AreaName, 3, 0)
-			if place22 != nil {
-				place22.JdsCode = vv.AreaID
-				dao.UpdateEntity(db, place22, "JdsCode")
+	// result1, _ := api.JdShopAPI.GetProvince()
+	// for _, v := range result1 {
+	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+	// 	place1.JdsCode = v.AreaID
+	// 	dao.UpdateEntity(db, place1, "JdsCode")
+	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+	// 	for _, vv := range result2 {
+	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+	// 		place2.JdsCode = vv.AreaID
+	// 		dao.UpdateEntity(db, place2, "JdsCode")
+	// 		place22, _ := dao.GetPlaceByName(db, vv.AreaName, 3, 0)
+	// 		if place22 != nil {
+	// 			place22.JdsCode = vv.AreaID
+	// 			dao.UpdateEntity(db, place22, "JdsCode")
+	// 		}
+	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+	// 		for _, vvv := range result3 {
+	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+	// 			place3.JdsCode = vvv.AreaID
+	// 			dao.UpdateEntity(db, place3, "JdsCode")
+	// 		}
+	// 	}
+	// }
+	beginTime := utils.Str2Time("2020-05-18")
+	endTime := utils.Str2Time("2020-05-24")
+	result, _ := misc.GetStoreTotalScoreList(nil, 0, "", beginTime, endTime, true, 50, 100, 1, 700)
+	for _, v := range result.StoreTotalScoreList {
+		storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+		if len(storeMaps) == 0 {
+			storeMap := &model.StoreMap{
+				Status:              1,
+				VendorID:            model.VendorIDJDShop,
+				AutoPickup:          1,
+				DeliveryCompetition: 1,
+				PricePercentage:     100,
+				IsSync:              1,
+				SyncRule:            1,
 			}
-			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-			for _, vvv := range result3 {
-				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-				place3.JdsCode = vvv.AreaID
-				dao.UpdateEntity(db, place3, "JdsCode")
+			_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.StoreID, storeMap)
+			if err != nil {
+				continue
 			}
 		}
 	}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index d90e0a4b6..11724cb66 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -104,6 +104,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		CategoryName: jdshopapi.JdsStoreCategoryName,
 		CustomerID:   utils.Int2Str(store.ID),
 	}
+	fmt.Println("test1", utils.Format4Output(createEntityStoreParam, false))
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }