接口修改优化

src/main/java/com/xiaomai/cases/polar/finance/salary/TestSettleSubmitOrUpdateOrDelete.java

@@ -65,7 +65,7 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl {
         jsonObject.put("payWay",payWay);
         jsonObject.put("payWay",payWay);
 
 
         xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
         xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
-        Thread.sleep(6000);
+        Thread.sleep(8000);
 
 
         String searchContext = "{\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"current\":0,\"size\":20,\"startOfPayDate\":"+TimeUtils.getTodayTime()+",\"endOfPayDate\":"+TimeUtils.getTodayEndTime()+",\"startOfCreated\":"+TimeUtils.getTodayTime()+",\"endOfCreated\":"+TimeUtils.getTodayEndTime()+",\"settleStateList\":[\"FINISHED\"],\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
         String searchContext = "{\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"current\":0,\"size\":20,\"startOfPayDate\":"+TimeUtils.getTodayTime()+",\"endOfPayDate\":"+TimeUtils.getTodayEndTime()+",\"startOfCreated\":"+TimeUtils.getTodayTime()+",\"endOfCreated\":"+TimeUtils.getTodayEndTime()+",\"settleStateList\":[\"FINISHED\"],\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
 
 
@@ -134,8 +134,6 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl {
 
 
     @Test(priority = 1,dataProvider = "dataProvider")
     @Test(priority = 1,dataProvider = "dataProvider")
     public void testUpdateSettleResult(double num,int type) throws InterruptedException {
     public void testUpdateSettleResult(double num,int type) throws InterruptedException {
-        if (id.equals(""))
-            return;
         if (settleDetailId.equals("")){
         if (settleDetailId.equals("")){
             JSONArray fetchSettleResult = salaryTools.fetchSettleResult(id);
             JSONArray fetchSettleResult = salaryTools.fetchSettleResult(id);
             for (int i = 0; i < fetchSettleResult.size(); i++){
             for (int i = 0; i < fetchSettleResult.size(); i++){
@@ -174,8 +172,6 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl {
 
 
     @Test(description = "确认结算",priority = 2)
     @Test(description = "确认结算",priority = 2)
     public void testSettleConfirm() throws InterruptedException {
     public void testSettleConfirm() throws InterruptedException {
-        if (id.equals(""))
-            return;
         // 确认结算前查询发放工资的收支明细有多少条
         // 确认结算前查询发放工资的收支明细有多少条
         JSONObject revenue = revenueAndExpenditureTools.pageNormalIncomeExpense(payWay,"EXPENSE","SALARY",xmAppApi.getLoginInfo().getStudioId());
         JSONObject revenue = revenueAndExpenditureTools.pageNormalIncomeExpense(payWay,"EXPENSE","SALARY",xmAppApi.getLoginInfo().getStudioId());
         int beforeTotal = Integer.parseInt(revenue.getJSONObject("result").getString("total"));
         int beforeTotal = Integer.parseInt(revenue.getJSONObject("result").getString("total"));
@@ -195,8 +191,6 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl {
 
 
     @Test(description = "删除结算单",priority = 3)
     @Test(description = "删除结算单",priority = 3)
     public void testSettleDelete() throws InterruptedException {
     public void testSettleDelete() throws InterruptedException {
-        if (id.equals(""))
-            return;
         // 确认结算前查询发放工资的收支明细有多少条
         // 确认结算前查询发放工资的收支明细有多少条
         JSONObject revenue = revenueAndExpenditureTools.pageNormalIncomeExpense(payWay,"EXPENSE","SALARY",xmAppApi.getLoginInfo().getStudioId());
         JSONObject revenue = revenueAndExpenditureTools.pageNormalIncomeExpense(payWay,"EXPENSE","SALARY",xmAppApi.getLoginInfo().getStudioId());
         int beforeTotal = Integer.parseInt(revenue.getJSONObject("result").getString("total"));
         int beforeTotal = Integer.parseInt(revenue.getJSONObject("result").getString("total"));