匡佳华 / API-Interfaces · Commits

Go to a project

Authored by lingmin
Commit d7064d2dad9476ff386bbd09a302f08867ededde 2 parents c4a643db e1fec7ca

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

Inline Side-by-side
Showing 5 changed files with 204 additions and 110 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 - {  
232 - "alg": "SALT_MD5",  
233 - "code": 200,  
234 - "data":  
235 - {  
236 - "lastedTime": 1508922386060,  
237 - "list":  
238 - [  
239 - {  
240 - "authorInfo": 231 +{
  232 + "alg": "SALT_MD5",
  233 + "code": 200,
  234 + "data": {
  235 + "lastedTime": 1516176688370,
  236 + "list": [
  237 + {
  238 + "authorInfo": {
  239 + "bgPic": "",
  240 + "uid": 123
  241 + },
  242 + "blocks": [
241 { 243 {
242 - "bgPic": "",  
243 - "uid": 21189956 244 + "contentData": "123123",
  245 + "order": 1,
  246 + "postsId": 108822,
  247 + "templateKey": "text"
244 }, 248 },
245 - "blocks":  
246 - [ 249 + {
  250 + "contentData": "http://img11.static.yhbimg.com/yhb-img01/2017/02/04/18/01385744720200ad56364517345c2cfab1.jpg?imageMogr2/auto-orient/thumbnail/!{width}x{height}r",
  251 + "order": 2,
  252 + "postsId": 108822,
  253 + "size": "1024x768",
  254 + "templateKey": "image"
  255 + },
  256 + {
  257 + "contentData": "http://img11.static.yhbimg.com/yhb-img01/2017/02/04/18/0152bd635f35f862aafabb39058e6f85b5.jpg?imageMogr2/auto-orient/thumbnail/!{width}x{height}r",
  258 + "order": 3,
  259 + "postsId": 108822,
  260 + "size": "1024x768",
  261 + "templateKey": "image"
  262 + }
  263 + ],
  264 + "browse": 0,
  265 + "comment": 2,
  266 + "createTime": 1486203158096,
  267 + "forumCode": 10002,
  268 + "forumName": "聚焦潮鞋",
  269 + "hasPraise": "N",
  270 + "id": 108822,
  271 + "indexTopTime": 1517988262626,
  272 + "isForumTop": 0,
  273 + "isHot": 0,
  274 + "isIndexTop": 1,
  275 + "postsTitle": "123123",
  276 + "praise": 3,
  277 + "revieweState": 0,
  278 + "revieweTime": 0,
  279 + "status": 0,
  280 + "updateTime": 1486740421615,
  281 + "voteInfo": {
  282 + "counts": 737,
  283 + "deadline": 8,
  284 + "hasVoted": "N",
  285 + "options": [
247 { 286 {
248 - "contentData": "http://img11.static.yhbimg.com\yhb-img01/2016/10/25/17/01aa61097d57575eabdd26775b5dc09d2e.jpg?imageView/{mode}/w/{width}/h/{height}",  
249 - "order": 1,  
250 - "postsId": 4042,  
251 - "size": "334x220",  
252 - "templateKey": "image" 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
253 }, 293 },
254 { 294 {
255 - "contentData": "http://img10.static.yhbimg.com\yhb-img01/2016/10/25/17/01c39d6d3219ecce8053c12d5bfb11c4b3.jpg?imageView/{mode}/w/{width}/h/{height}",  
256 - "order": 2,  
257 - "postsId": 4042,  
258 - "size": "207x220",  
259 - "templateKey": "image" 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
260 }, 301 },
261 { 302 {
262 - "contentData": "http://img10.static.yhbimg.com\yhb-img01/2016/10/25/17/0179ef13be85b750a64176bb7e8df0c536.jpg?imageView/{mode}/w/{width}/h/{height}",  
263 - "order": 3,  
264 - "postsId": 4042,  
265 - "size": "155x220",  
266 - "templateKey": "image" 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
267 }, 309 },
268 { 310 {
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",  
273 - "templateKey": "image"  
274 - }  
275 - ],  
276 - "browse": 0,  
277 - "comment": 38,  
278 - "createTime": 1477386733903,  
279 - "forumCode": 10001,  
280 - "forumName": "潮流风向",  
281 - "hasPraise": "N",  
282 - "id": 4042,  
283 - "indexTopTime": 1509016257343,  
284 - "isForumTop": 1,  
285 - "isHot": 1,  
286 - "isIndexTop": 1,  
287 - "postsTitle": "这是一个主题",  
288 - "praise": 0,  
289 - "revieweState": 0,  
290 - "revieweTime": 0,  
291 - "status": 0,  
292 - "updateTime": 1509507947838  
293 - },  
294 - {  
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  
302 - },  
303 - "blocks":  
304 - [  
305 - {  
306 - "contentData": "You'd usurer",  
307 - "order": 1,  
308 - "postsId": 822,  
309 - "templateKey": "text" 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
310 }, 317 },
311 { 318 {
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" 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
316 }, 325 },
317 { 326 {
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" 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
322 }, 333 },
323 { 334 {
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" 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 + }
  345 + },
  346 + {
  347 + "authorInfo": {
  348 + "bgPic": "",
  349 + "uid": 21191634
  350 + },
  351 + "blocks": [
  352 + {
  353 + "contentData": "吃吧",
  354 + "order": 1,
  355 + "postsId": 4508,
  356 + "templateKey": "text"
  357 + }
  358 + ],
  359 + "browse": 0,
  360 + "comment": 4,
  361 + "createTime": 1484640367689,
  362 + "forumCode": 10001,
  363 + "forumName": "潮流风向",
  364 + "hasPraise": "N",
  365 + "id": 4508,
  366 + "indexTopTime": 1516176688370,
  367 + "isForumTop": 0,
  368 + "isHot": 0,
  369 + "isIndexTop": 1,
  370 + "postsTitle": "我去？",
  371 + "praise": 9,
  372 + "revieweState": 0,
  373 + "revieweTime": 0,
  374 + "status": 0,
  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
328 }, 388 },
329 { 389 {
330 - "contentData": "",  
331 - "order": 5,  
332 - "postsId": 822,  
333 - "templateKey": "image" 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
334 } 396 }
335 ], 397 ],
336 - "browse": 0,  
337 - "comment": 4,  
338 - "createTime": 1468667954679,  
339 - "forumCode": 10003,  
340 - "forumName": "爱享潮物",  
341 - "hasPraise": "N",  
342 - "id": 822,  
343 - "indexTopTime": 1508922386060,  
344 - "isForumTop": 1,  
345 - "isHot": 1,  
346 - "isIndexTop": 1,  
347 - "praise": 11,  
348 - "revieweState": 0,  
349 - "revieweTime": 0,  
350 - "status": 0,  
351 - "updateTime": 1508922388636 398 + "type": 1
352 } 399 }
353 - ],  
354 - "pageSize": 2,  
355 - "total": 51  
356 - },  
357 - "md5": "7623197d7c4375ffe693de7f96f31b47",  
358 - "message": "社区最热帖子列表"  
359 - } 400 + }
  401 + ],
  402 + "pageSize": 2,
  403 + "total": 69
  404 + },
  405 + "md5": "eb188c13a8b02e48b86fafc246361fe2",
  406 + "message": "社区最热帖子列表"
  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
@@ -873,4 +875,42 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointTimeF @@ -873,4 +875,42 @@ http://172.16.6.207:8080/portal-gateway/ActivityConfigController/getAppointTimeF
873 } 875 }
874 } 876 }
875 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 +
876 916
@@ -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,