Merge branch 'order_received_statistics' into dev

xx-order/xx-order-server/src/main/resources/mapper/OrderReceivedStatisticsMapper.xml

@@ -136,6 +136,7 @@
         `count_date`
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_date = ors.date
+        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
     </select>
 
     <!--按月统计-->
@@ -217,6 +218,7 @@
         `count_month`
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_month = ors.month
+        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
     </select>
 
     <!--按周统计-->
@@ -298,6 +300,7 @@
         `count_week`
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_week = ors.weekOfYear
+        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -132,8 +132,9 @@ public class ServiceTest {
         LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
         LocalDate endLocalDate = LocalDate.of(2019,11,29);
         while (startLocalDate.isBefore(endLocalDate)){
-            startLocalDate.format(DateTimeFormatter.ofPattern("yyyy"));
-            orderReceivedStatisticsJobHandler.execute("");
+            String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            startLocalDate = startLocalDate.plusDays(1);
+            orderReceivedStatisticsJobHandler.execute(dateStr);
         }