From eb0bc0b7c8d6b9ae312288d10cf3e789859f6573 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, 8 Mar 2021 18:14:19 +0800
Subject: [PATCH] aa

---
 business/jxstore/report/report.go       | 20 ++++++++++++++++----
 business/partner/purchase/ebai/store.go |  4 +++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index 9c76e159b..0869984de 100644
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -7,6 +7,8 @@ import (
 	"sort"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner"
+
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
@@ -400,6 +402,9 @@ type GetStoreManageStateResult struct {
 }
 
 func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, fromTime, toTime string) (getStoreManageStateResult []*GetStoreManageStateResult, err error) {
+	var (
+		db = dao.GetDB()
+	)
 	//权限
 	if permission.IsRoled(ctx) {
 		if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
@@ -419,9 +424,16 @@ func GetStoreManageState(ctx *jxcontext.Context, storeIDs []int, vendorID int, f
 			storeIDs = storeIDs2
 		}
 	}
-	getStoreManageStateResult = append(getStoreManageStateResult, &GetStoreManageStateResult{
-		StoreID:   1,
-		StoreName: "1",
-	})
+	for _, v := range storeIDs {
+		storeDetail, _ := dao.GetStoreDetail(db, v, vendorID, "")
+		result := &GetStoreManageStateResult{
+			StoreID:   v,
+			StoreName: storeDetail.Name,
+		}
+		handler := partner.GetPurchasePlatformFromVendorID(vendorID)
+		store, _ := handler.ReadStore(ctx, storeDetail.VendorOrgCode, storeDetail.VendorStoreID)
+		fmt.Println("testdddd", store.DeliveryRange)
+		getStoreManageStateResult = append(getStoreManageStateResult, result)
+	}
 	return getStoreManageStateResult, err
 }
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index b48985dae..f8dba5834 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -231,7 +231,9 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 		retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0))
 		retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
 		retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"])
-
+		if retVal.DeliveryRange == "" {
+			api.EbaiAPI.ShopDeliveryinfoGet("", utils.Str2Int64(vendorStoreID))
+		}
 		return retVal, nil
 	}
 	return nil, err