车辆服务次数统计

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleServiceStatisticsBiz.java

@@ -124,6 +124,15 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 			if (oldValue == null) {
 				insertSelectiveRe(orderVehicleServiceStatistics);
 			} else {
+				if (orderVehicleServiceStatistics.getArrivalNum() != null) {
+					orderVehicleServiceStatistics.setArrivalNum(orderVehicleServiceStatistics.getArrivalNum() + oldValue.getArrivalNum());
+				}
+				if (orderVehicleServiceStatistics.getDepartureNum() != null) {
+					orderVehicleServiceStatistics.setDepartureNum(orderVehicleServiceStatistics.getDepartureNum() + oldValue.getDepartureNum());
+				}
+				if (orderVehicleServiceStatistics.getRentNum() != null) {
+					orderVehicleServiceStatistics.setRentNum(orderVehicleServiceStatistics.getRentNum() + oldValue.getRentNum());
+				}
 				BeanUtil.copyProperties(orderVehicleServiceStatistics, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 				updateSelectiveByIdRe(oldValue);
 			}
@@ -156,6 +165,6 @@ public class OrderVehicleServiceStatisticsBiz extends BaseBiz<OrderVehicleServic
 				}
 			}
 		}
-
+		mapMap.clear();
 	}
 }

xx-order/xx-order-server/src/test/java/ServiceTest.java

-import cn.hutool.core.date.DateUtil;
 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderMemberReceivedStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleReceivedStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.jobhandler.BaseOrderStatisticsJobHandler;
 import com.xxfc.platform.order.jobhandler.OrderReceivedStatisticsJobHandler;
+import com.xxfc.platform.order.pojo.HomePageOrderData;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import lombok.SneakyThrows;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,7 +17,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * @author libin
@@ -32,6 +31,9 @@ public class ServiceTest {
     @Autowired
     private DailyOrderStatisticsBiz dailyOrderStatisticsBiz;
 
+    @Autowired
+    private OrderStatisticsBiz statisticsBiz;
+
     @Autowired
     private BaseOrderStatisticsJobHandler handler;
 
@@ -51,34 +53,8 @@ public class ServiceTest {
          dailyOrderStatisticsBiz.statisticalOrder(1);
     }
 
-
-    @Test
-    public void testMemberStatisticsInsert(){
-        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
-        Date date = cn.hutool.core.date.DateTime.of("2019-11-15", "yyyy-MM-dd").toJdkDate();
-        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
-        Date endDate = DateUtil.endOfDay(date).toJdkDate();
-        orderMemberReceivedStatisticsBiz.orderMemberReceivedStatistics(startDate,endDate,companyMap);
-    }
-
-    @Test
-    public void testRentvehicleStatistics(){
-        Map<Integer, String> companyMap = vehicleFeign.findCompanyMap();
-        Date date = cn.hutool.core.date.DateTime.of("2019-11-15", "yyyy-MM-dd").toJdkDate();
-        Date startDate = DateUtil.beginOfDay(date).toJdkDate();
-        Date endDate = DateUtil.endOfDay(date).toJdkDate();
-        orderRentVehicleReceivedStatisticsBiz.orderRentVehicleReceivedStatistics(startDate,endDate,companyMap);
-    }
-
-    @Test
-    @SneakyThrows
-    public void testReceivedStatistics(){
-        orderReceivedStatisticsJobHandler.execute("2019-11-21");
-    }
-
-
     @Test
-    public void test() throws ParseException {
+    public void test() throws  ParseException {
         String d="2019-09-01";
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date parse = dateFormat.parse(d);
@@ -103,6 +79,12 @@ public class ServiceTest {
         System.out.println(date.after(date1));
     }
 
+    @Test
+    public void test4(){
+        HomePageOrderData totalOrder = statisticsBiz.getTotalOrder(null,null);
+        System.out.println(totalOrder);
+
+    }
 
     @Test
     public void handlerTeset()  {