From e14ad0d1f7b672f2cb701b0ad15ccfb3fa449f6f Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 5 Dec 2018 16:10:45 +0800
Subject: [PATCH] - jd.ReadStore.district

---
 business/partner/purchase/jd/store.go | 14 +++++++-------
 controllers/cms.go                    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 418b4af84..1720d4c00 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -54,9 +54,9 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
 		retVal.Lng = jxutils.StandardCoordinate2Int(lng)
 		retVal.Lat = jxutils.StandardCoordinate2Int(lat)
 
+		db := dao.GetDB()
 		cityCode := int(utils.MustInterface2Int64(result["city"]))
 		if cityCode != 0 {
-			db := dao.GetDB()
 			if city, err2 := dao.GetPlaceByJdCode(db, cityCode); err2 == nil {
 				retVal.CityCode = city.Code
 				districtName := utils.Interface2String(result["countyName"]) // 京东的市区号码与通用数据完全无法关联，只有通过名字来关联
@@ -66,12 +66,12 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
 					}
 				}
 			}
-			if retVal.DistrictCode == 0 {
-				retVal.DistrictCode = api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat)
-				if retVal.CityCode == 0 {
-					if district, err := dao.GetPlaceByCode(db, retVal.DistrictCode); err == nil {
-						retVal.CityCode = district.ParentCode
-					}
+		}
+		if retVal.DistrictCode == 0 {
+			retVal.DistrictCode = api.AutonaviAPI.GetCoordinateDistrictCode(lng, lat)
+			if retVal.CityCode == 0 {
+				if district, err := dao.GetPlaceByCode(db, retVal.DistrictCode); err == nil {
+					retVal.CityCode = district.ParentCode
 				}
 			}
 		}
diff --git a/controllers/cms.go b/controllers/cms.go
index 8dd52f21c..8a831009f 100644
--- a/controllers/cms.go
+++ b/controllers/cms.go
@@ -90,7 +90,7 @@ func (c *CmsController) GetQiniuUploadToken() {
 }
 
 // @Title 根据坐标得到区码
-// @Description 根据坐标得到区码，坐标都为火星坐标
+// @Description 根据坐标得到区码，坐标都为火星坐标（有些市是没有区的，比如东莞，这种情况下返回的区码是一个假的区域，即市的编码加上9000000）
 // @Param	token			header		string	true	"认证token"
 // @Param	lng				query		number	true	"经度"
 // @Param	lat				query		number	true	"纬度"