Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/HomePageOrderData.java

 package com.xxfc.platform.order.pojo;
 
 import lombok.Data;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 
@@ -20,4 +21,13 @@ public class HomePageOrderData {
      */
     private BigDecimal additionalIndemnity;
 
+
+    @Override
+    public String toString() {
+        return "HomePageOrderData{" +
+                "totalOrders=" + totalOrders +
+                ", totalOutstandingDeposit=" + totalOutstandingDeposit +
+                ", additionalIndemnity=" + additionalIndemnity +
+                '}';
+    }
 }

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

@@ -445,8 +445,4 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         return zero;
     }
 
-    public static void main(String[] args) {
-        StringBuffer stringBuffer = new StringBuffer("We Are Happy");
-    }
-
 }

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

+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderStatisticsBiz;
+import com.xxfc.platform.order.pojo.HomePageOrderData;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +26,9 @@ public class ServiceTest {
     @Autowired
     private DailyOrderStatisticsBiz dailyOrderStatisticsBiz;
 
+    @Autowired
+    private OrderStatisticsBiz statisticsBiz;
+
 
     @Test
     public void testSchedu(){
@@ -26,4 +36,10 @@ public class ServiceTest {
          dailyOrderStatisticsBiz.statisticalOrder();
     }
 
+    @Test
+    public void test(){
+        HomePageOrderData totalOrder = statisticsBiz.getTotalOrder(1);
+        System.out.println(totalOrder);
+
+    }
 }