update

@@ -107,131 +107,10 @@ shopRelation的json格式为：
 }
 ```
 
-## 店铺同步
-> 接口名： `/shops/synchronizeShop`
-
-### 入参
-
--------------------------
-|属性名称|类型|例子|说明| 
-|--------|----|----|----|
-|shopName|String|得宝旗舰店|店铺名称|
-|shopNature|int|1|店铺性质(1 旗舰店 2 专卖店)|
-|shopDomain|String|debao|店铺域名|
-|createPid|int|1|创建人ID|
-shopLogo|String|http://img11.static.yhbimg.com/yhb-img01/2015/09/11/02/01f42dff5d5bd383af1025eea1218cbccc.jpg?imageView/{mode}/w/{width}/h/{height}|店铺logo|
-|shopIntro|String|秉承以设计为核心的创新理念，用专业的思维方式将自然与科技、传统与革新、技艺与时尚三者良好融合，着重面料材质与软式廓型的品质互动，更好的诠释“less is more”的设计理念。|店铺简介|
-|shopAdmin|JSON数组|||
-|shopRelation|JSON数组|||
-|websiteUrl|JSON数组|["www.paperworks.com.cn"]||
-|otherUrl|JSON数组|["www.paperworks.com.cn","https:\/\/jnby.tmall.com\/"]||
-|shopAddress|JSON数组|||
----------------------------
-
-### 返回
-
-```json
-
-{
-  "code":200
-  "message":"修改成功"
-}
-{
-  "code":500
-  "message":"shops_id is null"
-}
-{
-  "code":500
-  "message":"shop_name is null"
-}
-{
-  "code":500
-  "message":"Sorry,店铺名已存在"
-}
-{
-  "code":500
-  "message":"shop_domain is null"
-}
-{
-  "code":500
-  "message":"Sorry,域名已存在"
-}
-```
-
-## 根据店铺名查看是否存在
-
-> 接口名：`/shops/checkByShopName`
-
-### 入参
-
--------------------------
-|属性名称|类型|例子|说明| 
-|--------|----|----|----|
-|shopName|String|得宝旗舰店|店铺名称|
-|shopsId|int|15|店铺ID|
--------------------
-
-### 返回
-
-```json
-{
-  "code":500,
-  "message":"shop_name is null"
-}
-{
-  "code":500,
-  "message":"shops_id is null"
-}
-{
-  "code":400,
-  "message":"false"
-}
-{
-  "code":200,
-  "message":"true"
-}
-```
-
-
-## 根据店铺域名查看是否存在
-
-> 接口名: `/shops/checkByShopDomain`
-
-### 入参
-
--------------------------
-|属性名称|类型|例子|说明| 
-|--------|----|----|----|
-|shopDomain|String|debao|店铺域名|
-|shopsId|int|15|店铺ID|
------------------------------
-
-### 返回
-
-```json
-
-{
-  "code":500,
-  "message":"shop_name is null"
-}
-{
-  "code":500,
-  "message":"shops_id is null"
-}
-{
-  "code":400,
-  "message":"false"
-}
-{
-  "code":200,
-  "message":"true"
-}
-
-```
 
 ## 获取店铺详情
 
-> 接口名: `/shops/getDetailByShopId`
+> 接口名: `/ShopsRest/getShopDetailById`
 
 ### 入参
 
@@ -246,66 +125,62 @@ shopLogo|String|http://img11.static.yhbimg.com/yhb-img01/2015/09/11/02/01f42dff5
 ```json
 
 {
-  "code":400,
-  "message":"店铺id有误"
-}
-{
-  "code":400,
-  "message":"shopInfo is none"
-}
-{
-  "code":200
-  "message":"ok"
-  "data":
+  "code": 200,
+  "data": {
+    "checkStatus": 200,
+    "createTime": "2016-01-29 23:11:00",
+    "otherUrl": "other,other2",
+    "shopAddress": "地址1,地址2",
+    "shopDomain": "shopDomain2311",
+    "shopIntro": "shopIntro",
+    "shopLogo": "http:///yhfairshopLogo?imageView/1/w/200/h/200",
+    "shopName": "店铺名称1234",
+    "shopNature": 1,
+    "shopRelationList": [
       {
+        "agreementEndTime": "2016-03-31 00:00:00",
+        "brandId": 178,
+        "brandName": "Artanky",
+        "brandNameCn": "",
+        "brandNameEn": "Artanky ",
+        "brandStatus": 1,
+        "isFreeze": "N",
+        "supplierId": 480,
+        "supplierName": "成都朋克汉堡服装有限公司",
+        "supplierStatus": 300
+      },
       {
-            "shopsId": 15, 
-            "shopName": "",
-            "shopDomain": "",
-            "shopNature": "",
-            "shopLogo": "",
-            "websiteUrl": "",
-            "shopAddress": "",
-            "createPid": "",
-            "checkStatus": "",
-            "createTime": "",
-            "updateTime": "",
-            "status": ""
+        "agreementEndTime": "2017-01-31 00:00:00",
+        "brandId": 355,
+        "brandName": "TMCAZ",
+        "brandNameCn": "磨叽星人",
+        "brandNameEn": "TMCAZ",
+        "brandStatus": 1,
+        "isFreeze": "N",
+        "supplierId": 310,
+        "supplierName": "上海贺王工贸实业公司",
+        "supplierStatus": 300
       },
-            "shopsAdmin": [{
-                "id": "",
-                "shopsId": "",
-                "adminPid": "",
-                "identity": "",
-                "createTime": "",
-                "updateTime": ""
-            },{
-                "id": "",
-                "shopsId": "",
-                "adminPid": "",
-                "identity": "",
-                "createTime": "",
-                "updateTime": ""
-            }], 
-            "shopRelation": [{
-                "id": "",
-                "shopsId": "",
-                "brandId": "",
-                "supplierId": "",
-                "createTime": "",
-                "updateTime": "",
-                "agreementEndTime": ""
-            },{
-                "id": "",
-                "shopsId": "",
-                "brandId": "",
-                "supplierId": "",
-                "createTime": "",
-                "updateTime": "",
-                "agreementEndTime": ""
-            }]
-        }
+      {
+        "agreementEndTime": "2016-12-19 00:00:00",
+        "brandId": 1389,
+        "brandName": "WWTorres",
+        "brandNameCn": "",
+        "brandNameEn": "WWTorres",
+        "brandStatus": 1,
+        "isFreeze": "N",
+        "supplierId": 1226,
+        "supplierName": "上海矩乐文化发展有限公司",
+        "supplierStatus": 300
       }
+    ],
+    "shopsId": 454,
+    "shopsType": 2,
+    "status": 0,
+    "updateTime": "2016-01-29 23:27:05",
+    "websiteUrl": "https,https2"
+  },
+  "message": "操作成功"
 }
 ```