Commit 9d321d67 authored by 吕雯燕's avatar 吕雯燕

lv

parent 943253c7
......@@ -304,6 +304,7 @@ public class 兑吧老优惠券_兑换流程测试_ExchangeTest extends CheckTem
@Test(description = "兑吧优惠券审核通过测试")
public void 优惠券审核通过测试() throws Exception{
//开发者账号:15833333333
int uid = 6569;
String appItemId = "191878";
String itemId = "32383";
......@@ -335,7 +336,7 @@ public class 兑吧老优惠券_兑换流程测试_ExchangeTest extends CheckTem
i--;
}
Response auditResponse = dsOrderService.submitAudit(orderId,"pass");
Response auditResponse = dsOrderService.submitAudit("22542",orderId,"pass",authorization.hdLoginCommonNew("15833333333"));
auditResponse.prettyPrint();
//判断订单是否审核成功,如果订单没有成功则继续审核
......
......@@ -84,8 +84,13 @@ public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
@Test
public void 实物审核不通过测试() throws Exception{
//开发者账号:15833333333
int uid = 6569;
String appItemId = "191894";
String itemId = "32384";
//获取当前库存和积分
Map<String,Object> mapStock = jdbc.findSimpleResult("SELECT * FROM stock.tb_stock WHERE stock_id =683671791616420831");
Map<String,Object> mapStock = jdbc.findSimpleResult("SELECT * FROM stock.tb_stock WHERE stock_id =933830612522620640");
String stock = String.valueOf(mapStock.get("stock"));
logger.info("当前商品库存:" + stock);
......@@ -95,32 +100,32 @@ public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
logger.info("当前用户积分: " + userCredits);
//实物兑换
String orderId = this.实物兑换订单(uid,"167007","28479");
String orderId = this.实物兑换订单(uid,appItemId,itemId);
logger.info("订单号:" + orderId);
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
//订单审核
Response auditResponse = dsOrderService.submitAudit(orderId,"reject");
Response auditResponse = dsOrderService.submitAudit("22542",orderId,"reject",authorization.hdLoginCommonNew("15833333333"));
auditResponse.prettyPrint();
//判断订单是否审核失败
int j =10;
while (j > 0 && !flowWork.equals("Fail-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"reject");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
auditResponse = dsOrderService.submitAudit("22542",orderId,"reject",authorization.hdLoginCommonNew("15833333333"));
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("当前订单节点:" + flowWork);
j--;
......@@ -130,7 +135,7 @@ public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
//再次获取当前库存和积分
Thread.sleep(1000);
mapStock = jdbc.findSimpleResult("SELECT * FROM stock.tb_stock WHERE stock_id =683671791616420831");
mapStock = jdbc.findSimpleResult("SELECT * FROM stock.tb_stock WHERE stock_id =933830612522620640");
String stockNew = String.valueOf(mapStock.get("stock"));
mapCredits = jdbc.findSimpleResult("SELECT user.id,user.credits,consumer.credits FROM dafuweng.`user` as user , new_consumer.consumer_0010 as consumer WHERE consumer.partner_user_id=user.id and user.id="+uid);
......@@ -280,20 +285,22 @@ public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
}
//@Test
@Test
public void 支付宝审核不通过测试() throws Exception{
//查询兑换前的开发者账户余额
// Response accountResponse = developerAccountService.accountInfo();
// String remainMoney = accountResponse.jsonPath().getString("data.remainMoney");
// logger.info("兑换前的开发者账户余额:" + remainMoney);
//开发者账号:15833333333
int uid = 6569;
String aliPay = "peeulk6392@sandbox.com";
String realName = "沙箱环境";
String degreeId = "10";
//支付宝兑换
String orderId = this.支付宝兑换订单(uid,"peeulk6392@sandbox.com","沙箱环境","10");
String orderId = this.支付宝兑换订单(uid,aliPay,realName,degreeId);
logger.info("订单号:" + orderId);
//订单审核,判断是否在待审核节点
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
Map<String,Object> mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
String flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
String orderIdmain = String.valueOf(mapOrder.get("order_num"));
......@@ -301,35 +308,30 @@ public class 商品订单失败测试_ExchangeTest extends CheckTemplet {
int i =10;
while (i > 0 && !flowWork.equals("Audit-started")) {
Thread.sleep(300);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("数据库订单节点:" + flowWork);
i--;
}
//订单审核
Response auditResponse = dsOrderService.submitAudit(orderId,"reject");
Response auditResponse = dsOrderService.submitAudit("22542",orderId,"reject",authorization.hdLoginCommonNew("15833333333"));
auditResponse.prettyPrint();
//判断订单是否审核失败
int j =10;
while (j > 0 && !flowWork.equals("Fail-complete")) {
Thread.sleep(1000);
auditResponse = dsOrderService.submitAudit(orderId,"reject");
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders5+" WHERE id = " + orderId);
auditResponse = dsOrderService.submitAudit("22542",orderId,"reject",authorization.hdLoginCommonNew("15833333333"));
mapOrder = jdbc.findSimpleResult("SELECT * FROM "+Database.orders_consumer+"."+Database.orders9+" WHERE id = " + orderId);
flowWork = String.valueOf(mapOrder.get("flowwork_stage"));
logger.info("当前订单节点:" + flowWork);
j--;
}
String status = String.valueOf(mapOrder.get("status"));
//兑换后的开发者账户余额
// accountResponse = developerAccountService.accountInfo();
// String remainMoneyNew = accountResponse.jsonPath().getString("data.remainMoney");
// logger.info("兑换后的开发者账户余额:" + remainMoneyNew);
//校验开发者账户余额变动
Response accountResponse = developerAccountService.cashDetail(orderIdmain);
Response accountResponse = developerAccountService.cashDetail(authorization.hdLoginCommonNew("15833333333"),orderIdmain);
String remainMoney = String.valueOf(Integer.valueOf(accountResponse.jsonPath().getString("data.list[1].balance"))+Integer.valueOf(accountResponse.jsonPath().getString("data.list[1].moneyChange")));
logger.info("兑换前的开发者账户余额:" + remainMoney);
String remainMoneyNew = accountResponse.jsonPath().getString("data.list[0].balance");
......
......@@ -185,7 +185,7 @@ public class 开发者账户余额校验测试_ExchangeTest extends CheckTemplet
}
@Test
// @Test 在Qb兑换流程测试中覆盖
public void Qb兑换审核不通过测试() throws Exception{
//查询兑换前的开发者账户余额
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment