Merge remote-tracking branch 'origin/master'

src/test/java/http/cases/ExchangeTest/Database.java

@@ -14,4 +14,6 @@ public class Database {
     public static String orders7 = "orders_0211";
     public static String orders8 = "orders_0090";
     public static String orders9 = "orders_0203";
+    public static String orders10 = "orders_0411";
+
 }

src/test/java/http/service/app/gawService.java

@@ -120,4 +120,49 @@ public class gawService {
     }
 
 
+    //sku兑换
+    public Response objectExchange(Map cookies, String appItemId,String itemId,String skuId) throws Exception {
+
+        Map<String,Object> map = new HashMap<>();
+        Map<String,Object> mapList = new HashMap<>();
+        List<Map> list = new ArrayList<>();
+        mapList.put("itemId",itemId);
+        mapList.put("skuId",skuId);
+        mapList.put("appItemId",appItemId);
+        mapList.put("credits","100");
+        mapList.put("price",0);
+        list.add(mapList);
+
+
+        map.put("remark","");   //买家留言
+        map.put("degreeId","");
+        map.put("actualPrice","0");   //总金额
+        map.put("actualCredits","100");  //总积分
+        map.put("itemParam",list.toArray());
+        map.put("payType","3");
+        map.put("expressPrice","0");
+        map.put("validate","");
+        map.put("token","yrJRr7Cddp2YeQd");
+
+        JSONObject jsonParam = JSONObject.parseObject(JSON.toJSONString(map));
+
+        logger.info("请求实物兑换接口:"+ "/gaw/objectExchange/create");
+        Response response = given().contentType("application/json; charset=UTF-8").cookies(cookies).body(jsonParam).post("http://"+goodsHost+"/gaw/objectExchange/create");
+
+//        Response saveResponse = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.dafuwengLogin(uid)).params(map).post("http://"+goodsHost+"/gaw/objectExchange/create");
+
+//        response.prettyPrint();
+
+        try{
+            Assert.assertEquals(response.jsonPath().getString("success"),"true");
+
+        }catch(Exception e){
+            throw new Exception("/gaw/objectExchange/create接口返回异常,返回信息："+response.asString());
+        }catch(Error er){
+            throw new Exception("/gaw/objectExchange/create接口返回异常,返回信息："+response.asString());
+
+        }
+        return response;
+
+    }
 }