From 6c004f8c87b466e2f291b422c8c26d68786e8899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 1 Mar 2021 13:53:02 +0800
Subject: [PATCH] aa

---
 business/jxstore/tempop/tempop.go | 34 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 1d1e611e9..ebfd78523 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1865,19 +1865,29 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}, storeMaps)
 	// tasksch.HandleTask(task, nil, true).Run()
 	// _, err = task.GetResult(0)
-	for i := 1; i < 26; i++ {
-		result, _ := api.JdShop2API.ShopList(i)
-		for _, v := range result.List {
-			storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int2Str(v.StoreID), model.VendorIDJDShop, "2")
-			if v.Kilometres == "" {
-				err = api.JdShop2API.CreateGisFence(v.StoreID)
-			}
-			start, end := jxutils.JxOperationTime2StrTime(storeDetail.OpenTime1), jxutils.JxOperationTime2StrTime(storeDetail.CloseTime1)
-			if storeDetail.CloseTime2 != 0 {
-				end = jxutils.JxOperationTime2StrTime(storeDetail.CloseTime2)
-			}
-			err = api.JdShop2API.UpdateDeliveryPromise(start, end, v.StoreID)
+	var (
+		storeMaps []*model.StoreMap
+		db        = dao.GetDB()
+	)
+	sql := `
+		SELECT * FROM store_map WHERE deleted_at = ? AND vendor_org_code = ? AND vendor_id = ? 
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue, "2", model.VendorIDJDShop,
+	}
+	dao.GetRows(db, &storeMaps, sql, sqlParams)
+	for _, v := range storeMaps {
+		stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, nil, "")
+		store := stores[0]
+		// if v.Kilometres == "" {
+		// 	err = api.JdShop2API.CreateGisFence(v.StoreID)
+		// }
+		start, end := jxutils.JxOperationTime2StrTime(store.OpenTime1), jxutils.JxOperationTime2StrTime(store.CloseTime1)
+		if store.CloseTime2 != 0 {
+			end = jxutils.JxOperationTime2StrTime(store.CloseTime2)
 		}
+		err = api.JdShop2API.UpdateDeliveryPromise(start, end, v.StoreID)
+
 	}
 	return err
 }