Authored by liqingzhong

Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-doc into develop

@@ -303,4 +303,131 @@ @@ -303,4 +303,131 @@
303 "message": "save netSale Recommend success." 303 "message": "save netSale Recommend success."
304 } 304 }
305 305
  306 +```
  307 +
  308 +
  309 +
  310 +
  311 +# 展示店铺的数据源
  312 +
  313 +> 接口名: `/ShopsRest/getShopList`
  314 +
  315 +### 入参 {"brandId":928}
  316 +
  317 +-------------------------
  318 +|属性名称|类型|例子|说明|是否必填|
  319 +|--------|----|----|----|--------|
  320 +|brandId|number||商品所属品牌Id|必填|
  321 +
  322 +---------------------
  323 +
  324 +### 返回 (关注list里面的id 和 text)
  325 +
  326 +``` json
  327 +{
  328 + "code": 200,
  329 + "data": {
  330 + "list": [
  331 + {
  332 + "checkStatus": 100,
  333 + "createTime": "2015-09-15",
  334 + "id": 18,
  335 + "shopName": "得宝纸巾单品专卖店【测试】",
  336 + "shopNature": 0,
  337 + "shopsId": 18,
  338 + "shopsType": 0,
  339 + "status": 1,
  340 + "text": "得宝纸巾单品专卖店【测试】",
  341 + "updateTime": "2016-02-18"
  342 + },
  343 + {
  344 + "checkStatus": 100,
  345 + "createTime": "2015-09-11",
  346 + "id": 16,
  347 + "shopName": ":CHOCOOLATEQ",
  348 + "shopNature": 0,
  349 + "shopsId": 16,
  350 + "shopsType": 0,
  351 + "status": 1,
  352 + "text": ":CHOCOOLATEQ",
  353 + "updateTime": "2016-02-18"
  354 + },
  355 + {
  356 + "checkStatus": 100,
  357 + "createTime": "2015-09-11",
  358 + "id": 15,
  359 + "shopName": "得宝旗舰店",
  360 + "shopNature": 0,
  361 + "shopsId": 15,
  362 + "shopsType": 0,
  363 + "status": 1,
  364 + "text": "得宝旗舰店",
  365 + "updateTime": "2016-02-17"
  366 + }
  367 + ],
  368 + "page": 1,
  369 + "size": 10,
  370 + "total": 3,
  371 + "totalPage": 1
  372 + },
  373 + "message": "操作成功"
  374 +}
  375 +
  376 +```
  377 +
  378 +
  379 +
  380 +
  381 +# 上下架productskc
  382 +
  383 +> 接口名: `/product/updateGoodsStatus`
  384 +
  385 +### 入参 {"productSkc":928, "targetStatus" : 0}
  386 +
  387 +-------------------------
  388 +|属性名称|类型|例子|说明|是否必填|
  389 +|--------|----|----|----|--------|
  390 +|productSkc|number||商品skc|必填|
  391 +|targetStatus|number||目标状态 0 代表下架, 1 代表上架|必填|
  392 +
  393 +---------------------
  394 +
  395 +### 返回
  396 +
  397 +``` json
  398 +{
  399 + "code": 200,
  400 + "data": [],
  401 + "md5": "d751713988987e9331980363e24189ce",
  402 + "message": "update status success."
  403 +}
  404 +
  405 +```
  406 +
  407 +
  408 +
  409 +# 上下架productsku
  410 +
  411 +> 接口名: `/product/updateProductSkuStatus`
  412 +
  413 +### 入参 {"productSku":928, "targetStatus" : 0}
  414 +
  415 +-------------------------
  416 +|属性名称|类型|例子|说明|是否必填|
  417 +|--------|----|----|----|--------|
  418 +|productSku|number||商品sku|必填|
  419 +|targetStatus|number||目标状态 0 代表下架, 1 代表上架|必填|
  420 +
  421 +---------------------
  422 +
  423 +### 返回
  424 +
  425 +``` json
  426 +{
  427 + "code": 200,
  428 + "data": [],
  429 + "md5": "d751713988987e9331980363e24189ce",
  430 + "message": "update status success."
  431 +}
  432 +
306 ``` 433 ```
@@ -117,16 +117,12 @@ @@ -117,16 +117,12 @@
117 "code": 200, 117 "code": 200,
118 "data": [ 118 "data": [
119 { 119 {
120 - "checkStatus": 0,  
121 - "shopName": "得宝旗舰店",  
122 - "shopsId": 15,  
123 - "status": 0 120 + "id": 80,
  121 + "text": "Marmiulous"
124 }, 122 },
125 { 123 {
126 - "checkStatus": 0,  
127 - "shopName": ":CHOCOOLATEQ",  
128 - "shopsId": 16,  
129 - "status": 0 124 + "id": 81,
  125 + "text": "Ethel"
130 } 126 }
131 ], 127 ],
132 "message": "操作成功" 128 "message": "操作成功"
@@ -153,19 +149,12 @@ @@ -153,19 +149,12 @@
153 "code": 200, 149 "code": 200,
154 "data": [ 150 "data": [
155 { 151 {
156 - "brandDomain": "lily",  
157 - "brandName": "lily",  
158 - "brandNameEn": "lily",  
159 - "id": 1431,  
160 - "status": 1 152 + "id": 80,
  153 + "text": "Marmiulous"
161 }, 154 },
162 { 155 {
163 - "brandDomain": "test",  
164 - "brandName": "test",  
165 - "brandNameCn": "",  
166 - "brandNameEn": "test",  
167 - "id": 1430,  
168 - "status": 1 156 + "id": 81,
  157 + "text": "Ethel"
169 } 158 }
170 ], 159 ],
171 "md5": "03098c8c158c8405117daadb91ed792a", 160 "md5": "03098c8c158c8405117daadb91ed792a",
@@ -192,20 +181,19 @@ @@ -192,20 +181,19 @@
192 { 181 {
193 "code": 200, 182 "code": 200,
194 "data": [ 183 "data": [
195 - {  
196 - "brandId": 0,  
197 - "supplierId": 1,  
198 - "supplierName": "10*1"  
199 - },  
200 - { 184 + {
  185 + "agreementEndTime": 0,
201 "brandId": 0, 186 "brandId": 0,
202 - "supplierId": 2,  
203 - "supplierName": "广派商业(上海)有限公司" 187 + "id": 73,
  188 + "supplierId": 0,
  189 + "text": "广州乐夏服饰贸易有限公司"
204 }, 190 },
205 { 191 {
  192 + "agreementEndTime": 0,
206 "brandId": 0, 193 "brandId": 0,
207 - "supplierId": 3,  
208 - "supplierName": "广州市海珠区艺柏时装经营部" 194 + "id": 75,
  195 + "supplierId": 0,
  196 + "text": "MYGE"
209 } 197 }
210 ], 198 ],
211 "message": "操作成功" 199 "message": "操作成功"
@@ -313,7 +313,7 @@ http://127.0.0.1:8083/yohobuy-platform-web/product/getProductSort @@ -313,7 +313,7 @@ http://127.0.0.1:8083/yohobuy-platform-web/product/getProductSort
313 开启 313 开启
314 /product/publishProductSort 314 /product/publishProductSort
315 315
316 -请求参数 {"id" : 1} 316 +请求参数 {"param" : 1}
317 响应 :{ 317 响应 :{
318 "code": 200, 318 "code": 200,
319 "data": [], 319 "data": [],
@@ -325,7 +325,7 @@ http://127.0.0.1:8083/yohobuy-platform-web/product/getProductSort @@ -325,7 +325,7 @@ http://127.0.0.1:8083/yohobuy-platform-web/product/getProductSort
325 325
326 /product/closeProductSort 326 /product/closeProductSort
327 327
328 -请求参数 {"id" : 1} 328 +请求参数 {"param" : 1}
329 响应 :{ 329 响应 :{
330 "code": 200, 330 "code": 200,
331 "data": [], 331 "data": [],
@@ -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 ```