Authored by ping

update

@@ -7,20 +7,47 @@ @@ -7,20 +7,47 @@
7 7
8 ### 入参 8 ### 入参
9 ```json 9 ```json
  10 +
  11 +
  12 +//店铺创建列表
  13 +{
  14 + "page":1,//可选
  15 + "size":10,//可选
  16 + "supplierId":0,//可选
  17 + "brandId":0,//可选
  18 + "checkStatus":0,//可选
  19 + "operationStatus":1,
  20 + "checkStatusArr":"100,200,900"
  21 +}
  22 +
  23 +//店铺信息管理列表
  24 +{
  25 + "page":1,//可选
  26 + "size":10,//可选
  27 + "supplierId":0,//可选
  28 + "brandId":0,//可选
  29 + "checkStatus":0,//可选
  30 + "operationStatus":2,
  31 + "checkStatusArr":"200,300,900"
  32 +}
  33 +/Data/logs/union
  34 +
  35 +//店铺审核列表
10 { 36 {
11 - "page":2,  
12 - "size":12,  
13 - "supplierId":950,  
14 - "brandId":928,  
15 - "checkStatus":100,  
16 - "operationStatus":1,  
17 - "checkStatusArr":"100,200,900" 37 + "page":1,//可选
  38 + "size":10,//可选
  39 + "supplierId":0,//可选
  40 + "brandId":0,//可选
  41 + "checkStatus":200,
  42 + "operationStatus":0,
  43 + "checkStatusArr":"200"
18 } 44 }
  45 +
19 ``` 46 ```
20 ------------------------- 47 -------------------------
21 |属性名称|类型|例子|说明| 48 |属性名称|类型|例子|说明|
22 |--------|----|----|----| 49 |--------|----|----|----|
23 -|page|int|2|第几页| 50 +|page|int|1|第几页|
24 |size|int|50|每页条数| 51 |size|int|50|每页条数|
25 |supplierId|int|950|供应商ID| 52 |supplierId|int|950|供应商ID|
26 |brandId|int|928|品牌ID| 53 |brandId|int|928|品牌ID|
@@ -39,23 +66,50 @@ @@ -39,23 +66,50 @@
39 "data": { 66 "data": {
40 "list": [ 67 "list": [
41 { 68 {
42 - "checkStatus": 200,  
43 - "createTime": "2015-11-27 15:45:19",  
44 - "shopName": "Case Scenario", 69 + "checkStatus": 900,
  70 + "createTime": "2016-02-26",
  71 + "shopName": "预生产",
  72 + "shopNature": 0,
45 "shopRelationList": [ 73 "shopRelationList": [
46 { 74 {
47 - "brandId": 409,  
48 - "brandName": "Case Scenario",  
49 - "brandNameCn": "",  
50 - "brandNameEn": "Case Scenario", 75 + "agreementEndTime": 0,
  76 + "brandId": 1499,
  77 + "brandName": "标哥",
  78 + "brandNameEn": "标哥",
51 "brandStatus": 1, 79 "brandStatus": 1,
  80 + "id": 1,
  81 + "status": 0,
  82 + "supplierId": 0,
  83 + "supplierStatus": 0
  84 + }
  85 + ],
  86 + "shopsId": 582,
  87 + "shopsType": 0,
  88 + "status": 0,
  89 + "updateTime": "2016-02-26"
  90 + },
  91 + {
  92 + "checkStatus": 900,
  93 + "createTime": "2016-02-25",
  94 + "shopName": "店铺123abc",
  95 + "shopNature": 0,
  96 + "shopRelationList": [
  97 + {
  98 + "agreementEndTime": 0,
  99 + "brandId": 1492,
  100 + "brandName": "茶",
  101 + "brandNameEn": "C",
  102 + "brandStatus": 0,
  103 + "id": 2,
  104 + "status": 0,
52 "supplierId": 0, 105 "supplierId": 0,
53 "supplierStatus": 0 106 "supplierStatus": 0
54 } 107 }
55 ], 108 ],
56 - "shopsId": 31,  
57 - "status": 1,  
58 - "updateTime": "2015-12-08 19:20:44" 109 + "shopsId": 571,
  110 + "shopsType": 0,
  111 + "status": 0,
  112 + "updateTime": "2016-02-25"
59 } 113 }
60 ], 114 ],
61 "page": 1, 115 "page": 1,
@@ -71,7 +125,13 @@ @@ -71,7 +125,13 @@
71 125
72 ## 获取店铺详情 126 ## 获取店铺详情
73 127
74 -> 接口名: `/ShopsRest/getShopDetailById` 128 +> 接口名:
  129 +
  130 +创建店铺的列表中,点击详情和编辑的url:/ShopsRest/getShopDetailById 查询的是check表
  131 +审核店铺的列表中,点击详情和编辑的url:/ShopsRest/getShopDetailById 查询的是check表
  132 +店铺信息管理列表中,点查看的url:/ShopsCheckRest/getLastCheckShopInfoById 查询的是店铺表,该表的数据是已经审核通过的或者是曾经审核通过的数据
  133 +店铺信息管理列表中,点编辑的url:/ShopsRest/getShopDetailById 查询的是check表
  134 +
75 135
76 ### 入参 136 ### 入参
77 137
@@ -181,13 +241,19 @@ shopRelation的json格式为: @@ -181,13 +241,19 @@ shopRelation的json格式为:
181 241
182 "shopRelation":[ 242 "shopRelation":[
183 { 243 {
  244 + "method":"add",
184 "brandId":355, 245 "brandId":355,
  246 + "brandName":"TMCAZ",
185 "supplierId":310, 247 "supplierId":310,
  248 + "supplierName":"上海贺王工贸实业公司",
186 "agreementEndTime":1485792000 249 "agreementEndTime":1485792000
187 }, 250 },
188 { 251 {
  252 + "method":"add",
189 "brandId":1389, 253 "brandId":1389,
  254 + "brandName":"WWTorres",
190 "supplierId":1226, 255 "supplierId":1226,
  256 + "supplierName":"上海矩乐文化发展有限公司",
191 "agreementEndTime":1482076800 257 "agreementEndTime":1482076800
192 } 258 }
193 ] 259 ]
@@ -234,18 +300,30 @@ shopRelation的json格式为: @@ -234,18 +300,30 @@ shopRelation的json格式为:
234 300
235 "shopRelation":[ 301 "shopRelation":[
236 { 302 {
237 - ""id":1," 303 + "id":737,
  304 + "method":"delete",
238 "brandId":355, 305 "brandId":355,
  306 + "brandName":"TMCAZ",
239 "supplierId":310, 307 "supplierId":310,
240 - "agreementEndTime":1485792000,  
241 - "method":"delete" 308 + "supplierName":"上海贺王工贸实业公司",
  309 + "agreementEndTime":1485792000
242 }, 310 },
243 { 311 {
244 - "id":2, 312 + "id":738,
  313 + "method":"",
245 "brandId":1389, 314 "brandId":1389,
  315 + "brandName":"WWTorres",
246 "supplierId":1226, 316 "supplierId":1226,
247 - "agreementEndTime":1482076800,  
248 - "method":"add" 317 + "supplierName":"上海矩乐文化发展有限公司",
  318 + "agreementEndTime":1482076800
  319 + },
  320 + {
  321 + "method":"add",
  322 + "brandId":1480,
  323 + "brandName":"满了",
  324 + "supplierId":1348,
  325 + "supplierName":"满了吧",
  326 + "agreementEndTime":1482076800
249 } 327 }
250 ] 328 ]
251 ``` 329 ```