匡佳华 / API-Interfaces · Commits

Go to a project

Authored by xiaofeng.yao@yoho.cn
Commit ac62417461a2ea3aa520ef053dc7fa8c21e51810 2 parents c96019fc d7064d2d

Merge branch 'master' of git.yoho.cn:yoho-documents/api-interfaces

Inline Side-by-side
Showing 6 changed files with 403 additions and 90 deletions
@@ -82,11 +82,13 @@ @@ -82,11 +82,13 @@
82 "promo_code_discount": 0, 82 "promo_code_discount": 0,
83 "promo_id": 0, 83 "promo_id": 0,
84 "province": "山西省", 84 "province": "山西省",
  85 + "street": "xx大街",
85 "receipt_time": 2, 86 "receipt_time": 2,
86 "receipt_time_type": 0, 87 "receipt_time_type": 0,
87 "receiver_info": { 88 "receiver_info": {
88 "address": "ssddsdsds", 89 "address": "ssddsdsds",
89 "area_code": "140203", 90 "area_code": "140203",
  91 + "street": "xx大街",
90 "city": "大同市", 92 "city": "大同市",
91 "consignee_name": "sssaaassa", 93 "consignee_name": "sssaaassa",
92 "district": "矿区", 94 "district": "矿区",
@@ -220,7 +220,7 @@ code为200即为成功，否则是失败。 @@ -220,7 +220,7 @@ code为200即为成功，否则是失败。
220 220
221 注意，通用的头部没有列出。 221 注意，通用的头部没有列出。
222 请求示例 222 请求示例
223 -http://192.168.102.205:8095/social/?method=app.social.getHomePagePostList&uid=2222222&lastedTime=1467116660000&limit=2&debug=XYZ 223 +http://192.168.102.205:8095/social/?method=app.social.getHomePagePostList&uid=2222222&lastedTime=0&limit=2&debug=XYZ
224 224
225 ### 响应 225 ### 响应
226 code为200即为成功，否则是失败。 226 code为200即为成功，否则是失败。
@@ -228,135 +228,183 @@ code为200即为成功，否则是失败。 @@ -228,135 +228,183 @@ code为200即为成功，否则是失败。
228 ```json 228 ```json
229 229
230 230
231 - { 231 +{
232 "alg": "SALT_MD5", 232 "alg": "SALT_MD5",
233 "code": 200, 233 "code": 200,
234 - "data":  
235 - {  
236 - "lastedTime": 1508922386060,  
237 - "list":  
238 - [  
239 - {  
240 - "authorInfo": 234 + "data": {
  235 + "lastedTime": 1516176688370,
  236 + "list": [
241 { 237 {
  238 + "authorInfo": {
242 "bgPic": "", 239 "bgPic": "",
243 - "uid": 21189956 240 + "uid": 123
244 }, 241 },
245 - "blocks":  
246 - [ 242 + "blocks": [
247 { 243 {
248 - "contentData": "http://img11.static.yhbimg.com\yhb-img01/2016/10/25/17/01aa61097d57575eabdd26775b5dc09d2e.jpg?imageView/{mode}/w/{width}/h/{height}", 244 + "contentData": "123123",
249 "order": 1, 245 "order": 1,
250 - "postsId": 4042,  
251 - "size": "334x220",  
252 - "templateKey": "image" 246 + "postsId": 108822,
  247 + "templateKey": "text"
253 }, 248 },
254 { 249 {
255 - "contentData": "http://img10.static.yhbimg.com\yhb-img01/2016/10/25/17/01c39d6d3219ecce8053c12d5bfb11c4b3.jpg?imageView/{mode}/w/{width}/h/{height}", 250 + "contentData": "http://img11.static.yhbimg.com/yhb-img01/2017/02/04/18/01385744720200ad56364517345c2cfab1.jpg?imageMogr2/auto-orient/thumbnail/!{width}x{height}r",
256 "order": 2, 251 "order": 2,
257 - "postsId": 4042,  
258 - "size": "207x220", 252 + "postsId": 108822,
  253 + "size": "1024x768",
259 "templateKey": "image" 254 "templateKey": "image"
260 }, 255 },
261 { 256 {
262 - "contentData": "http://img10.static.yhbimg.com\yhb-img01/2016/10/25/17/0179ef13be85b750a64176bb7e8df0c536.jpg?imageView/{mode}/w/{width}/h/{height}", 257 + "contentData": "http://img11.static.yhbimg.com/yhb-img01/2017/02/04/18/0152bd635f35f862aafabb39058e6f85b5.jpg?imageMogr2/auto-orient/thumbnail/!{width}x{height}r",
263 "order": 3, 258 "order": 3,
264 - "postsId": 4042,  
265 - "size": "155x220",  
266 - "templateKey": "image"  
267 - },  
268 - {  
269 - "contentData": "http://img11.static.yhbimg.com\yhb-img01/2016/10/25/17/016f4aae224000058db4916497b5bd0ed3.jpg?imageView/{mode}/w/{width}/h/{height}",  
270 - "order": 4,  
271 - "postsId": 4042,  
272 - "size": "220x220", 259 + "postsId": 108822,
  260 + "size": "1024x768",
273 "templateKey": "image" 261 "templateKey": "image"
274 } 262 }
275 ], 263 ],
276 "browse": 0, 264 "browse": 0,
277 - "comment": 38,  
278 - "createTime": 1477386733903,  
279 - "forumCode": 10001,  
280 - "forumName": "潮流风向", 265 + "comment": 2,
  266 + "createTime": 1486203158096,
  267 + "forumCode": 10002,
  268 + "forumName": "聚焦潮鞋",
281 "hasPraise": "N", 269 "hasPraise": "N",
282 - "id": 4042,  
283 - "indexTopTime": 1509016257343,  
284 - "isForumTop": 1,  
285 - "isHot": 1, 270 + "id": 108822,
  271 + "indexTopTime": 1517988262626,
  272 + "isForumTop": 0,
  273 + "isHot": 0,
286 "isIndexTop": 1, 274 "isIndexTop": 1,
287 - "postsTitle": "这是一个主题",  
288 - "praise": 0, 275 + "postsTitle": "123123",
  276 + "praise": 3,
289 "revieweState": 0, 277 "revieweState": 0,
290 "revieweTime": 0, 278 "revieweTime": 0,
291 "status": 0, 279 "status": 0,
292 - "updateTime": 1509507947838 280 + "updateTime": 1486740421615,
  281 + "voteInfo": {
  282 + "counts": 737,
  283 + "deadline": 8,
  284 + "hasVoted": "N",
  285 + "options": [
  286 + {
  287 + "image": "http://img11.static.yhbimg.com/yhb-img01/2017/02/10/16/01e864e6c15ac6aeb8e574aacff1b6a977.jpg?imageView/{mode}/w/{width}/h/{height}",
  288 + "optionId": 38,
  289 + "percent": "16.69%",
  290 + "realVoteCount": 0,
  291 + "text": "123",
  292 + "voteCount": 123
  293 + },
  294 + {
  295 + "image": "http://img10.static.yhbimg.com/yhb-img01/2017/02/09/15/01218a391757ea5891f4a0639f9d61b28d.jpg?imageView/{mode}/w/{width}/h/{height}",
  296 + "optionId": 8,
  297 + "percent": "61.87%",
  298 + "realVoteCount": 0,
  299 + "text": "3",
  300 + "voteCount": 456
  301 + },
  302 + {
  303 + "image": "http://img11.static.yhbimg.com/yhb-img01/2017/02/09/16/01e3622231e41556c36c7bc329d314f63c.jpg?imageView/{mode}/w/{width}/h/{height}",
  304 + "optionId": 18,
  305 + "percent": "16.69%",
  306 + "realVoteCount": 0,
  307 + "text": "232423",
  308 + "voteCount": 123
  309 + },
  310 + {
  311 + "image": "http://img10.static.yhbimg.com/yhb-img01/2017/02/07/10/015108d93ca9015af898471e40734544a7.jpg?imageView/{mode}/w/{width}/h/{height}",
  312 + "optionId": 6,
  313 + "percent": "00.68%",
  314 + "realVoteCount": 0,
  315 + "text": "12312",
  316 + "voteCount": 5
  317 + },
  318 + {
  319 + "image": "http://img11.static.yhbimg.com/yhb-img01/2017/02/09/16/01e81e4d04e858a99e6fc2ca18a4e40c17.jpg?imageView/{mode}/w/{width}/h/{height}",
  320 + "optionId": 10,
  321 + "percent": "01.36%",
  322 + "realVoteCount": 0,
  323 + "text": "123",
  324 + "voteCount": 10
  325 + },
  326 + {
  327 + "image": "http://img11.static.yhbimg.com/yhb-img01/2017/02/06/14/01d73665940405769ceb830bc5b2e875bb.jpg?imageView/{mode}/w/{width}/h/{height}",
  328 + "optionId": 20,
  329 + "percent": "01.36%",
  330 + "realVoteCount": 0,
  331 + "text": "1231asdfasdf",
  332 + "voteCount": 10
  333 + },
  334 + {
  335 + "image": "http://img10.static.yhbimg.com/yhb-img01/2017/02/09/16/01478b0ff53ccad477b00e7f4bf0a11ba5.jpg?imageView/{mode}/w/{width}/h/{height}",
  336 + "optionId": 12,
  337 + "percent": "01.36%",
  338 + "realVoteCount": 0,
  339 + "text": "3",
  340 + "voteCount": 10
  341 + }
  342 + ],
  343 + "type": 2
  344 + }
293 }, 345 },
294 { 346 {
295 - "authorInfo":  
296 - {  
297 - "bgPic": "http://img11.static.yhbimg.com\social/2016/08/17/22/01f95abc2c5a96bdab382473d2db77ce44.jpg?imageView/{mode}/w/{width}/h/{height}",  
298 - "headIcon": "http://head.static.yhbimg.com/yhb-head/2016/08/17/22/044d44e6bb7a5277a3cf454e6e01abcc52.867941.jpg?imageView/{mode}/w/{width}/h/{height}",  
299 - "nickName": "",  
300 - "signature": "",  
301 - "uid": 9701721 347 + "authorInfo": {
  348 + "bgPic": "",
  349 + "uid": 21191634
302 }, 350 },
303 - "blocks":  
304 - [ 351 + "blocks": [
305 { 352 {
306 - "contentData": "You'd usurer", 353 + "contentData": "吃吧",
307 "order": 1, 354 "order": 1,
308 - "postsId": 822, 355 + "postsId": 4508,
309 "templateKey": "text" 356 "templateKey": "text"
310 - },  
311 - {  
312 - "contentData": "http://img13.static.yhbimg.com\social/2016/07/16/19/02d68d36bd11d3e257b292b2e64c96b94a.jpg?imageView/{mode}/w/{width}/h/{height}",  
313 - "order": 2,  
314 - "postsId": 822,  
315 - "templateKey": "image"  
316 - },  
317 - {  
318 - "contentData": "http://img10.static.yhbimg.com\social/2016/07/16/19/0125022e0d3f4d9f9729fc0088c6ed6511.png?imageView/{mode}/w/{width}/h/{height}",  
319 - "order": 3,  
320 - "postsId": 822,  
321 - "templateKey": "image"  
322 - },  
323 - {  
324 - "contentData": "http://img12.static.yhbimg.com\social/2016/07/16/19/02ceb69d9d576dccdc7fc2dca67d19988b.png?imageView/{mode}/w/{width}/h/{height}",  
325 - "order": 4,  
326 - "postsId": 822,  
327 - "templateKey": "image"  
328 - },  
329 - {  
330 - "contentData": "",  
331 - "order": 5,  
332 - "postsId": 822,  
333 - "templateKey": "image"  
334 } 357 }
335 ], 358 ],
336 "browse": 0, 359 "browse": 0,
337 "comment": 4, 360 "comment": 4,
338 - "createTime": 1468667954679,  
339 - "forumCode": 10003,  
340 - "forumName": "爱享潮物", 361 + "createTime": 1484640367689,
  362 + "forumCode": 10001,
  363 + "forumName": "潮流风向",
341 "hasPraise": "N", 364 "hasPraise": "N",
342 - "id": 822,  
343 - "indexTopTime": 1508922386060,  
344 - "isForumTop": 1,  
345 - "isHot": 1, 365 + "id": 4508,
  366 + "indexTopTime": 1516176688370,
  367 + "isForumTop": 0,
  368 + "isHot": 0,
346 "isIndexTop": 1, 369 "isIndexTop": 1,
347 - "praise": 11, 370 + "postsTitle": "我去？",
  371 + "praise": 9,
348 "revieweState": 0, 372 "revieweState": 0,
349 "revieweTime": 0, 373 "revieweTime": 0,
350 "status": 0, 374 "status": 0,
351 - "updateTime": 1508922388636 375 + "updateTime": 1484816373516,
  376 + "voteInfo": {
  377 + "counts": 0,
  378 + "deadline": 11,
  379 + "hasVoted": "N",
  380 + "options": [
  381 + {
  382 + "image": "http://img10.static.yhbimg.com/yhb-img01/2017/02/09/15/0148ebc1884367bf388a800bc842b339e0.jpg?imageView/{mode}/w/{width}/h/{height}",
  383 + "optionId": 2,
  384 + "percent": "0%",
  385 + "realVoteCount": 0,
  386 + "text": "vote1",
  387 + "voteCount": 0
  388 + },
  389 + {
  390 + "image": "http://img11.static.yhbimg.com/yhb-img01/2017/02/09/15/01bbae6e224c5b0018cd4d75c77e53f875.jpg?imageView/{mode}/w/{width}/h/{height}",
  391 + "optionId": 4,
  392 + "percent": "0%",
  393 + "realVoteCount": 0,
  394 + "text": "vote2",
  395 + "voteCount": 0
  396 + }
  397 + ],
  398 + "type": 1
  399 + }
352 } 400 }
353 ], 401 ],
354 "pageSize": 2, 402 "pageSize": 2,
355 - "total": 51 403 + "total": 69
356 }, 404 },
357 - "md5": "7623197d7c4375ffe693de7f96f31b47", 405 + "md5": "eb188c13a8b02e48b86fafc246361fe2",
358 "message": "社区最热帖子列表" 406 "message": "社区最热帖子列表"
359 - } 407 +}
360 408
361 409
362 ``` 410 ```
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 2
3 # 目录 # 3 # 目录 #
4 4
  5 +根据活动获取有几个可预约时间 ActivityConfigController/getAppointTime4Activity
  6 +
5 一、潮流课堂、活动： 7 一、潮流课堂、活动：
6 8
7 1、获取未结束活动列表：ActivityConfigController/getActivityNowList 9 1、获取未结束活动列表：ActivityConfigController/getActivityNowList
@@ -22,7 +24,7 @@ @@ -22,7 +24,7 @@
22 24
23 3、获取所有潮流顾问可预约时间：ActivityConfigController/getAppointDateForTour 25 3、获取所有潮流顾问可预约时间：ActivityConfigController/getAppointDateForTour
24 26
25 -4、根据潮流顾问id获取可预约时间：ActivityConfigController/getAppointInfoById 27 +4、根据日期获取可预约时间：ActivityConfigController/getAppointTimeForTour
26 28
27 三、剪发： 29 三、剪发：
28 30
@@ -30,6 +32,10 @@ @@ -30,6 +32,10 @@
30 32
31 2、根据套餐id获取活动详情：ActivityConfigController/getFrontActivityInfoById 33 2、根据套餐id获取活动详情：ActivityConfigController/getFrontActivityInfoById
32 34
  35 +3、获取所有发型师所有套餐可预约日期：ActivityConfigController/getAppointDateForTour
  36 +
  37 +4、根据发型师Id和日期获取可预约时间：ActivityConfigController/getAppointTimeForTour
  38 +
33 四、摄影 39 四、摄影
34 40
35 1、获取套餐列表（同列表接口，不同活动类型入参）：ActivityConfigController/getActivityList 41 1、获取套餐列表（同列表接口，不同活动类型入参）：ActivityConfigController/getActivityList
@@ -422,7 +428,7 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointInfoB @@ -422,7 +428,7 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointInfoB
422 http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getActivityList 428 http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getActivityList
423 429
424 { 430 {
425 - "activityType":5, 431 + "activityType":3,
426 "storeId":66 432 "storeId":66
427 } 433 }
428 434
@@ -504,7 +510,7 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getActivityList @@ -504,7 +510,7 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getActivityList
504 http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointDateForTour 510 http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointDateForTour
505 511
506 { 512 {
507 - "activityType":5, 513 + "activityType":3,
508 "storeId":66, 514 "storeId":66,
509 "isFront":1 515 "isFront":1
510 } 516 }
@@ -548,6 +554,48 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointDateF @@ -548,6 +554,48 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointDateF
548 } 554 }
549 } 555 }
550 556
  557 +## 4、根据日期获取所有潮流顾问可预约时间点 ##
  558 +
  559 +入口：ActivityConfigController/getAppointTimeForTour
  560 +
  561 +**请求参数**
  562 +
  563 +| 参数名称 | 参数类型| 长度 |可否为空 |示例 |默认值 | 备注 |
  564 +| ---------|:--------:| --------:|-----:|------:|------:|------:|
  565 +|activityType |int | 11 |否 | | |活动类型：1-潮流课堂，2-活动，3-潮流顾问，4-摄影套餐，5-发型师套餐|
  566 +|storeId |int | 11 |否 | | |门店id|
  567 +|isFront |int | 11 |是 |1 | 1 |1|
  568 +|dateTime |String | 50 |是 |2016/12/15 | |可预约日期|
  569 +
  570 +**请求示例**
  571 +
  572 +注意，通用的头部没有列出。
  573 +
  574 +http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointTimeForTour
  575 +
  576 + {
  577 + "activityType":3,
  578 + "storeId":66,
  579 + "isFront":1,
  580 + "dateTime":"2016/12/15"
  581 + }
  582 +
  583 +**响应**
  584 +
  585 + {
  586 + "code": 200,
  587 + "message": "success",
  588 + "data": {
  589 + "appointNum": 20,
  590 + "isAppointNum": 0,
  591 + "timeMap": {
  592 + "1481772300": 1,
  593 + "1481792400": 1,
  594 + "1481794560": 1
  595 + }
  596 + }
  597 + }
  598 +
551 599
552 ## 三、剪发 ## 600 ## 三、剪发 ##
553 601
@@ -718,3 +766,151 @@ code为200即为成功，否则是失败。 响应JSON格式如下所示: @@ -718,3 +766,151 @@ code为200即为成功，否则是失败。 响应JSON格式如下所示:
718 } 766 }
719 767
720 768
  769 +## 3、获取发型师所有套餐可预约时间 ##
  770 +
  771 +入口：ActivityConfigController/getAppointDateForTour
  772 +
  773 +**请求参数**
  774 +
  775 +| 参数名称 | 参数类型| 长度 |可否为空 |示例 |默认值 | 备注 |
  776 +| ---------|:--------:| --------:|-----:|------:|------:|------:|
  777 +|activityType |int | 11 |否 | | |活动类型：1-潮流课堂，2-活动，3-潮流顾问，4-摄影套餐，5-发型师套餐|
  778 +|storeId |int | 11 |否 | | |门店id|
  779 +|isFront |int | 11 |是 |1 | 1 |1|
  780 +|hairStylistId |int | 11 |否 |1 | 1 |发型师id|
  781 +
  782 +**请求示例**
  783 +
  784 +注意，通用的头部没有列出。
  785 +
  786 +http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointDateForTour
  787 +
  788 + {
  789 + "activityType":5,
  790 + "storeId":66,
  791 + "isFront":1，
  792 + "hairStylistId":4
  793 + }
  794 +
  795 +**响应**
  796 +
  797 + {
  798 + "code": 200,
  799 + "message": "success",
  800 + "data": {
  801 + "2016/12/21": "周三",
  802 + "2016/12/22": "周四",
  803 + "2016/12/23": "周五",
  804 + "2016/12/24": "周六",
  805 + "2016/12/27": "周二",
  806 + "2016/12/28": "周三",
  807 + "2016/12/29": "周四",
  808 + "2016/12/14": "周三",
  809 + "2016/12/15": "周四",
  810 + "2016/12/16": "周五",
  811 + "2016/12/17": "周六",
  812 + "2016/12/18": "周日",
  813 + "2016/12/19": "周一",
  814 + "2016/12/20": "周二",
  815 + "2016/12/13": "周二",
  816 + "2016/12/25": "周日",
  817 + "2016/12/26": "周一",
  818 + "2016/12/30": "周五",
  819 + "2016/12/31": "周六",
  820 + "2017/01/01": "周日",
  821 + "2017/01/02": "周一",
  822 + "2017/01/03": "周二",
  823 + "2017/01/04": "周三",
  824 + "2017/01/05": "周四",
  825 + "2017/01/06": "周五",
  826 + "2017/01/07": "周六",
  827 + "2017/01/08": "周日",
  828 + "2017/01/09": "周一",
  829 + "2017/01/10": "周二",
  830 + "2017/01/11": "周三"
  831 + }
  832 + }
  833 +
  834 +## 4、根据日期获取所有潮流顾问可预约时间点 ##
  835 +
  836 +入口：ActivityConfigController/getAppointTimeForTour
  837 +
  838 +**请求参数**
  839 +
  840 +| 参数名称 | 参数类型| 长度 |可否为空 |示例 |默认值 | 备注 |
  841 +| ---------|:--------:| --------:|-----:|------:|------:|------:|
  842 +|activityType |int | 11 |否 | | |活动类型：1-潮流课堂，2-活动，3-潮流顾问，4-摄影套餐，5-发型师套餐|
  843 +|storeId |int | 11 |否 | | |门店id|
  844 +|isFront |int | 11 |是 |1 | 1 |1|
  845 +|dateTime |String | 50 |是 |2016/12/15 | |可预约日期|
  846 +|hairStylistId |int | 11 |否 |1 | 1 |发型师id|
  847 +
  848 +**请求示例**
  849 +
  850 +注意，通用的头部没有列出。
  851 +
  852 +http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointTimeForTour
  853 +
  854 + {
  855 + "activityType":5,
  856 + "storeId":66,
  857 + "isFront":1,
  858 + "dateTime":"2016/12/15",
  859 + "hairStylistId":4
  860 + }
  861 +
  862 +**响应**
  863 +
  864 + {
  865 + "code": 200,
  866 + "message": "success",
  867 + "data": {
  868 + "appointNum": 20,
  869 + "isAppointNum": 0,
  870 + "timeMap": {
  871 + "1481772300": 1,
  872 + "1481792400": 1,
  873 + "1481794560": 1
  874 + }
  875 + }
  876 + }
  877 +
  878 +## 根据活动获取有几个可预约时间 ##
  879 +
  880 +入口：/ActivityConfigController/getAppointTime4Activity
  881 +
  882 +**请求参数**
  883 +
  884 +| 参数名称 | 参数类型| 长度 |可否为空 |示例 |默认值 | 备注 |
  885 +| ---------|:--------:| --------:|-----:|------:|------:|------:|
  886 +|activityType |int | 11 |否 | | |活动类型：1-潮流课堂，2-活动，3-潮流顾问，4-摄影套餐，5-发型师套餐|
  887 +|isFront |int | 11 |是 |1 | 1 |1|
  888 +|activityId |int | 11 |否 |123 | |活动 id|
  889 +
  890 +**请求示例**
  891 +
  892 +注意，通用的头部没有列出。
  893 +
  894 +http://192.168.102.210:8080/portal-gateway/ActivityConfigController/getAppointTime4Activity?debug=XYZ&isFront=1&activityId=62&activityType=9
  895 +
  896 +说明 ：
  897 +
  898 +
  899 +如果只有一个时间返回时间戳，多个返回空字符串
  900 +
  901 +
  902 +**响应**
  903 +
  904 + {
  905 + "code": 200,
  906 + "message": "success",
  907 + "data": "1487203200"
  908 + }
  909 +
  910 + {
  911 + "code": 200,
  912 + "message": "success",
  913 + "data": ""
  914 + }
  915 +
  916 +
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 10
11 四、根据目录id获取目录信息 ：MenuConfigController/getFrontMenuById 11 四、根据目录id获取目录信息 ：MenuConfigController/getFrontMenuById
12 12
  13 +五、获取有效的一条潮流之旅信息（潮流之旅首页） ：MenuConfigController/getFrontMainTour
  14 +
13 15
14 16
15 ## 17 ##
@@ -290,3 +292,64 @@ code为200即为成功，否则是失败。 响应JSON格式如下所示: @@ -290,3 +292,64 @@ code为200即为成功，否则是失败。 响应JSON格式如下所示:
290 "parentName": null 292 "parentName": null
291 } 293 }
292 } 294 }
  295 +
  296 +
  297 +##
  298 +# 五、获取有效的一条潮流之旅信息（潮流之旅首页） #
  299 +
  300 +入口：MenuConfigController/getFrontMainTour
  301 +##
  302 +# 请求参数 #
  303 +
  304 +| 参数名称 | 参数类型| 长度 |可否为空 |示例 |默认值 | 备注 |
  305 +| ---------|:--------:| --------:|-----:|------:|------:|------:|
  306 +|storeId |int | 11 |否 | | |门店id|
  307 +|isFront |int | 1 |是 | | |是否前台表 |
  308 +
  309 +
  310 +**请求示例**
  311 +注意，通用的头部没有列出。
  312 +
  313 +http://192.168.102.210:8080/portal-gateway/MenuConfigController/getFrontMainTour?debug=XYZ&storeId=1&isFront=1
  314 +
  315 +参数含义：
  316 +
  317 +id： 该潮流之旅id；
  318 +
  319 +tourName：潮流之旅名称
  320 +
  321 +isAppointment： 是否需要预约1-需要 2-不需要
  322 +
  323 +tourDetail：图文详情
  324 +
  325 +
  326 +**响应**
  327 +
  328 +code为200即为成功，否则是失败。 响应JSON格式如下所示:
  329 +
  330 + {
  331 + "code": 200,
  332 + "message": "success",
  333 + "data": {
  334 + "page": 1,
  335 + "rows": 10,
  336 + "sort": null,
  337 + "order": "ASC",
  338 + "startIndex": 0,
  339 + "id": 4,
  340 + "tourName": "131321",
  341 + "isAppointment": 2,
  342 + "tourImage": "http://img10.static.yhbimg.com/yhb-img01/2016/12/20/11/01d98f82db837da5f9d5167e64ae9a5125.jpg",
  343 + "price": 11,
  344 + "status": 1,
  345 + "isDeploy": null,
  346 + "createTime": 1482203667,
  347 + "updateTime": 1486534709,
  348 + "createUserId": 542,
  349 + "storeId": 66,
  350 + "tourDetail": "<p>fafafa</p>",
  351 + "sortNumber": 11,
  352 + "activityTimeStr": null,
  353 + "menuId": 58
  354 + }
  355 + }
@@ -256,6 +256,8 @@ @@ -256,6 +256,8 @@
256 }, 256 },
257 "order_code": "309557854", 257 "order_code": "309557854",
258 "province": "北京市", 258 "province": "北京市",
  259 + "street":"xx大街",
  260 + "delivery_area" : "北京市 北京市 朝阳区 xx大街",
259 "source_order_code": 308550118, 261 "source_order_code": 308550118,
260 "status": 40, 262 "status": 40,
261 "statusList": [ 263 "statusList": [
@@ -122,6 +122,7 @@ @@ -122,6 +122,7 @@
122 "area_code": "320115", 122 "area_code": "320115",
123 "address": "江宁经济技术开发区苏源大道87号（有货物流中心订单组）", 123 "address": "江宁经济技术开发区苏源大道87号（有货物流中心订单组）",
124 "consignee_name": "测试", 124 "consignee_name": "测试",
  125 + "street": "东山街道"
125 "county": "江宁区", 126 "county": "江宁区",
126 "delivery_tpye": 10, 127 "delivery_tpye": 10,
127 "email": "", 128 "email": "",
@@ -412,6 +413,7 @@ @@ -412,6 +413,7 @@
412 "area_code": 330225, 413 "area_code": 330225,
413 "city": "宁波市", 414 "city": "宁波市",
414 "district": "象山县", 415 "district": "象山县",
  416 + "street": "xx街道"
415 "email": "canvas220@sina.com", 417 "email": "canvas220@sina.com",
416 "mobile": "15258109727", 418 "mobile": "15258109727",
417 "order_code": 1607472719, 419 "order_code": 1607472719,