修改

src/main/java/com/xiaomai/cases/polar/data/salesData/TestCenterData.java

@@ -263,22 +263,20 @@ public class TestCenterData extends XMBaseTest {
             //3.校验销售数据-按照来源为无筛选数据明细-上述签单实收金额应不变
             JSONObject afterResourceDataDetail1 = salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "-1", "DAY", "NEW_MEMBER_COUNT_DESC");
             BigDecimal afterResourceDataDetailActualAmount1 = new BigDecimal(afterResourceDataDetail1.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterResourceDataDetailActualAmount1, actualAmount, "退单订单之后，销售数据明细来源为无的签单实收金额不应有变动");
+            Assert.assertEquals(afterResourceDataDetailActualAmount1, resourceDataDetailActualAmount, "退单订单之后，销售数据明细来源为无的签单实收金额不应有变动");
 
 
             //4.校验销售数据-按照添加人是当前人筛选数据明细-上述签单实收金额应不变
 
             JSONObject afterCreatorDataDetail1 = salesDataTools.creatorDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), xmAppApi.getLoginInfo().getAdminId(), "DAY", "NEW_MEMBER_COUNT_DESC");
             BigDecimal afterCreatorDataDetailActualAmount1 = new BigDecimal(afterCreatorDataDetail1.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterCreatorDataDetailActualAmount1, actualAmount, "退单订单之后，销售数据明细筛选添加人是当前人的签单实收金额不应有变动");
+            Assert.assertEquals(afterCreatorDataDetailActualAmount1, creatorDataDetailActualAmount, "退单订单之后，销售数据明细筛选添加人是当前人的签单实收金额不应有变动");
 
 
             //5.校验销售数据-按照跟进销售为无筛选数据明细-上述签单实收金额应不变
             JSONObject afterSalesDataDetail1 = salesDataTools.salesDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "-1", "DAY", "NEW_MEMBER_COUNT_DESC");
             BigDecimal afterSalesDataDetailActualAmount1 = new BigDecimal(afterSalesDataDetail1.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterSalesDataDetailActualAmount1, actualAmount, "退单订单之后，销售数据明细筛选跟进销售为无的签单实收金额不应有变动");
-
-
+            Assert.assertEquals(afterSalesDataDetailActualAmount1, salesDataDetailActualAmount, "退单订单之后，销售数据明细筛选跟进销售为无的签单实收金额不应有变动");
 
 
             //作废退单订单，为了下述流程可以作废签单订单
@@ -296,9 +294,6 @@ public class TestCenterData extends XMBaseTest {
                 JSONObject refundDiscardResult = orderTools.discard(refundOrderGetDetailId, "重复录入", "已作废退单订单" + RandomStringUtil.randomString(10));
 
             }
-        }
-
-
 
 
             //③作废签单--校验签单实收金额减少
@@ -325,37 +320,36 @@ public class TestCenterData extends XMBaseTest {
 
                 //校验：
                 //1.校验作废签单订单之后销售数据-数据分析汇总的签单实收金额是否减少
-            JSONObject afterAnalysis=salesDataTools.centerData("DAY",TimeUtils.getTodayEndTime(),TimeUtils.getTodayTime());
-            BigDecimal afterActualAmount=new BigDecimal(afterAnalysis.getJSONObject("result").getString("actualAmount"));//签单实收金额
-            Assert.assertEquals(afterActualAmount,actualAmount.subtract(BigDecimal.valueOf(paidAmount)),"作废签单订单之后，销售数据数据分析的签单实收金额未减少对应的签单实收金额");
+                JSONObject afterAnalysis = salesDataTools.centerData("DAY", TimeUtils.getTodayEndTime(), TimeUtils.getTodayTime());
+                BigDecimal afterActualAmount = new BigDecimal(afterAnalysis.getJSONObject("result").getString("actualAmount"));//签单实收金额
+                Assert.assertEquals(afterActualAmount, actualAmount.subtract(BigDecimal.valueOf(paidAmount)), "作废签单订单之后，销售数据数据分析的签单实收金额未减少对应的签单实收金额");
 
 
                 //2.校验销售数据-趋势图的签单实收金额是否减少
-            JSONObject afterTrendResult=salesDataTools.trend("DAY","SIGN_ORDER_ACTUAL_AMOUNT",TimeUtils.getTodayEndTime(),TimeUtils.getTodayTime());
-            BigDecimal afterValue=new BigDecimal(afterTrendResult.getJSONArray("result").getJSONObject(0).getJSONArray("items").getJSONObject(0).getString("value"));
-            Assert.assertEquals(afterValue,actualAmount.subtract(BigDecimal.valueOf(paidAmount)),"作废签单订单之后，销售数据趋势图的签单实收金额未减少对应的签单实收金额");
-
+                JSONObject afterTrendResult = salesDataTools.trend("DAY", "SIGN_ORDER_ACTUAL_AMOUNT", TimeUtils.getTodayEndTime(), TimeUtils.getTodayTime());
+                BigDecimal afterValue = new BigDecimal(afterTrendResult.getJSONArray("result").getJSONObject(0).getJSONArray("items").getJSONObject(0).getString("value"));
+                Assert.assertEquals(afterValue, actualAmount.subtract(BigDecimal.valueOf(paidAmount)), "作废签单订单之后，销售数据趋势图的签单实收金额未减少对应的签单实收金额");
 
 
                 //3.校验销售数据-按照来源为无筛选数据明细-上述签单实收金额是否减少
-            JSONObject afterResourceDataDetail=salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-            BigDecimal afterResourceDataDetailActualAmount=new BigDecimal(afterResourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterResourceDataDetailActualAmount,actualAmount.subtract(BigDecimal.valueOf(paidAmount)),"作废签单订单之后，销售数据明细来源为无的签单实收金额未减少对应的签单实收金额");
+                JSONObject afterResourceDataDetail = salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "-1", "DAY", "NEW_MEMBER_COUNT_DESC");
+                BigDecimal afterResourceDataDetailActualAmount = new BigDecimal(afterResourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
+                Assert.assertEquals(afterResourceDataDetailActualAmount, afterResourceDataDetailActualAmount1.subtract(BigDecimal.valueOf(paidAmount)), "作废签单订单之后，销售数据明细来源为无的签单实收金额未减少对应的签单实收金额");
 
 
                 //4.校验销售数据-按照添加人是当前人筛选数据明细-上述签单实收金额是否减少
 
-            JSONObject afterCreatorDataDetail=salesDataTools.creatorDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),xmAppApi.getLoginInfo().getAdminId(),"DAY","NEW_MEMBER_COUNT_DESC");
-            BigDecimal afterCreatorDataDetailActualAmount=new BigDecimal(afterCreatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterCreatorDataDetailActualAmount,actualAmount.subtract(BigDecimal.valueOf(paidAmount)),"作废签单订单之后，销售数据明细筛选添加人是当前人的签单实收金额未减少对应的签单实收金额");
-
+                JSONObject afterCreatorDataDetail = salesDataTools.creatorDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), xmAppApi.getLoginInfo().getAdminId(), "DAY", "NEW_MEMBER_COUNT_DESC");
+                BigDecimal afterCreatorDataDetailActualAmount = new BigDecimal(afterCreatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
+                Assert.assertEquals(afterCreatorDataDetailActualAmount, afterCreatorDataDetailActualAmount1.subtract(BigDecimal.valueOf(paidAmount)), "作废签单订单之后，销售数据明细筛选添加人是当前人的签单实收金额未减少对应的签单实收金额");
 
 
                 //5.校验销售数据-按照跟进销售为无筛选数据明细-上述签单实收金额是否减少
-            JSONObject afterSalesDataDetail=salesDataTools.salesDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-            BigDecimal afterSalesDataDetailActualAmount=new BigDecimal(afterSalesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
-            Assert.assertEquals(afterSalesDataDetailActualAmount,actualAmount.subtract(BigDecimal.valueOf(paidAmount)),"作废签单订单之后，销售数据明细筛选跟进销售为无的签单实收金额未减少对应的签单实收金额");
+                JSONObject afterSalesDataDetail = salesDataTools.salesDataDetail(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "-1", "DAY", "NEW_MEMBER_COUNT_DESC");
+                BigDecimal afterSalesDataDetailActualAmount = new BigDecimal(afterSalesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
+                Assert.assertEquals(afterSalesDataDetailActualAmount, afterSalesDataDetailActualAmount1.subtract(BigDecimal.valueOf(paidAmount)), "作废签单订单之后，销售数据明细筛选跟进销售为无的签单实收金额未减少对应的签单实收金额");
 
             }
         }
+    }
 }