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

@@ -135,8 +135,100 @@
 | :--        | --:        | --:      | --:         | --:   |
 | method	   | String     | true     |app.promotion.queryCouponCenter| 请求方法|
 | uid	     | String        | false   | 7893817        |用户ID |
-| code	     | String        | true   |1112     |券和资源位关联的code|
-| couponId	     | String        | true   |23121,11759,45213     |券id列表|
+| contentCode	     | String        | true   |b38b9c4f1c76f89533e9214629b458e4     |资源位内容码|
+
+
+#### 响应内容
+```json
+成功响应：
+{
+  "alg": "SALT_MD5",
+  "code": 200,
+  "data": [
+    {
+      "data": {
+        "list": [
+          {
+            "src": "http://img11.static.yhbimg.com/yhb-img01/2016/04/13/06/019bd2c1581f881c8ea22daf0e39a4a9ab.png?imageView/{mode}/w/{width}/h/{height}",
+            "url": []
+          },
+          {
+            "src": "http://img12.static.yhbimg.com/yhb-img01/2016/04/13/06/02576fa876ccfbfe0648b4e2dabb989b6f.png?imageView/{mode}/w/{width}/h/{height}",
+            "url": []
+          },
+          {
+            "src": "http://img11.static.yhbimg.com/yhb-img01/2016/04/13/06/01362e8c56fd6ac56ad3852b6a192e5336.png?imageView/{mode}/w/{width}/h/{height}",
+            "url": []
+          }
+        ],
+        "speed": "3"
+      },
+      "template_id": 1111253,
+      "template_intro": "轮播banner",
+      "template_name": "carousel_banner"
+    },
+    {
+      "data": {
+	    "list": [
+		  {
+            "couponID": "2516,2376",
+		    "status": 1,
+            "goShopping": "http://item.m.yohobuy.com/product/pro_325933_419711/XiongJiaYouPin619081838990XiongJiaYouPinChuangYiLanRenTanZhuTuiKuan.html",
+            "image": {
+              "src": "http://img12.static.yhbimg.com/yhb-img01/2016/01/19/01/02f639de49d79ece0cf86a2f214be781da.jpg?imageView/{mode}/w/{width}/h/{height}",
+              "url": "http://2percent.yohobuy.com/?gender=2,3\n"
+          },
+		  {
+            "couponID": "1565",
+		    "status": 2,
+            "goShopping": "http://item.m.yohobuy.com/product/pro_325933_419711/XiongJiaYouPin619081838990XiongJiaYouPinChuangYiLanRenTanZhuTuiKuan.html",
+            "image": {
+              "src": "http://img12.static.yhbimg.com/yhb-img01/2016/01/19/01/02f639de49d79ece0cf86a2f214be781da.jpg?imageView/{mode}/w/{width}/h/{height}",
+              "url": "http://2percent.yohobuy.com/?gender=2,3\n"
+          },
+		],
+        "isShow": "YES",
+        "title": "标题内容"
+      },
+      "template_id": 1111255,
+      "template_name": "getCoupon"
+    },
+    {
+      "data": {
+	    "list": [
+		  {
+           "couponID": "200",
+		   "status": 3,
+           "goShopping": "http://item.m.yohobuy.com/product/pro_325933_419711/XiongJiaYouPin619081838990XiongJiaYouPinChuangYiLanRenTanZhuTuiKuan.html",
+           "image": {
+               "src": "http://img12.static.yhbimg.com/yhb-img01/2016/01/19/01/02f639de49d79ece0cf86a2f214be781da.jpg?imageView/{mode}/w/{width}/h/{height}",
+               "url": "http://2percent.yohobuy.com/?gender=2,3\n"
+            },
+		  }
+		],
+           "isShow": "YES",
+           "title": "标题内容"
+      },
+      "template_id": 1111257,
+      "template_name": "getCoupon"
+    }
+  ],
+  "md5": "8febf00780011298f4a0530b6441827b",
+  "message": "请求成功"
+}
+
+备注：status 1:可领取 2：已抢光 3：已领取
+
+```
+
+### 5、用户批量领券(app.promotion.getBatchCoupon)
+
+#### 请求参数
+| Param Name | Param Type | Required | Param Value | Desc  |
+| :--        | --:        | --:      | --:         | --:   |
+| method	   | String     | true     |app.promotion.getCoupon| 请求方法|
+| uid	     | String        | true   | 7893817        |用户ID |
+| couponIds	     | int        | true   |23121,45231     |券id列表|
 
 
 #### 响应内容
@@ -146,15 +238,26 @@
     "alg": "SALT_MD5",
     "code": 200,
     "data": {
-      "code": "1112",
-      "status": 1,
-      "hasNum":99999
     },
     "md5": "50d19f5f5098c34607018f144baec14a",
     "message": "操作成功"
 }
 
-备注：status 1:可领取 2：已抢光 3：已领取
+错误响应：
+{
+  "code": 402,
+  "message": "优惠券不存在"
+}
+
+{
+  "code": 306,
+  "message": "很抱歉！您的用户身份类型不可使用该券"
+}
+
+{
+  "code": 401,
+  "message": "优惠券已经领取"
+}
 
 ```