From 285d0df34ff937e97a0adbdcc65b7598cb2ea11f 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, 16 Dec 2019 16:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8D=E5=AD=97=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=AC=E4=B8=9C=E9=97=A8=E5=BA=97=E7=AD=89=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platformapi/jdapi/store_page.go | 38 ++++++++++++++-------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/platformapi/jdapi/store_page.go b/platformapi/jdapi/store_page.go
index 41a818c6..f3ca82d6 100644
--- a/platformapi/jdapi/store_page.go
+++ b/platformapi/jdapi/store_page.go
@@ -755,26 +755,21 @@ func (a *API) IsJdManagerUser(id int64) (isManager bool, err error) {
 // 查询京东门店等级
 // 无法得到总数，循环50页后放弃寻找。。
 // https://sta-store.jddj.com/store/logquery?venderId=320406&stationNo=11733018&currentPage=1&pageSize=20
-func (a *API) GetJdStoreLevel(vendorOrgCode, vendorStoreID string) (level string, err error) {
-	for i := 1; i < 51; i++ {
-		jdParams := map[string]interface{}{
-			"venderId":    vendorOrgCode,
-			"stationNo":   vendorStoreID,
-			"currentPage": i,
-			"pageSize":    20,
-		}
-		body, err := a.AccessStorePage2("https://sta-store.jddj.com/store/logquery", jdParams, false, "")
-		if err != nil {
-			return "0", err
-		}
-		bodyStr := body.(string)
-		levelList := regexpJDStoreLevel.FindAllStringSubmatch(bodyStr, 1)
-		if len(levelList) > 0 {
-			level = levelList[0][1]
-		}
-		if level != "" {
-			break
-		}
+func (a *API) GetJdStoreLevel(vendorOrgCode, vendorStoreID string, currentPage int) (level string, err error) {
+	jdParams := map[string]interface{}{
+		"venderId":    vendorOrgCode,
+		"stationNo":   vendorStoreID,
+		"currentPage": currentPage,
+		"pageSize":    20,
+	}
+	body, err := a.AccessStorePage2("https://sta-store.jddj.com/store/logquery", jdParams, false, "")
+	if err != nil {
+		return "0", err
+	}
+	bodyStr := body.(string)
+	levelList := regexpJDStoreLevel.FindAllStringSubmatch(bodyStr, 1)
+	if len(levelList) > 0 {
+		level = levelList[0][1]
 	}
 	return level, err
 }
@@ -808,9 +803,8 @@ func (a *API) GetJdUpcCodeByName(name, upcCode string, pageNo, pageSize int) (pr
 			}
 			productInfo := &ProductInfo{
 				OriginalName: v.(map[string]interface{})["name"].(string),
-				Name:         v.(map[string]interface{})["name"].(string),
 				UpcCode:      v.(map[string]interface{})["upcCode"].(string),
-				Weight:       float32(utils.Interface2Float64WithDefault(v.(map[string]interface{})["weight"], 0)),
+				Weight:       float32(utils.Interface2Float64WithDefault(v.(map[string]interface{})["weight"], 0) * 1000),
 				ImgList:      ImgList,
 			}
 			productInfos = append(productInfos, productInfo)