Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/webapp/WEB-INF/page/sys/main.html

@@ -281,10 +281,28 @@
         },
         created: function () {
             let vue = this;
-            $.getJSON("../order/queryMainTotal", function (r) {
+            $.getJSON("../order/queryMainTotal", function (r) {//所有订单
                 vue.orderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=1", function (r) {
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=300", function (r) {//已发货
+                vue.yfOrderSum = r.sum;
+            });
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0", function (r) {//待付款
+                vue.yfkOrderSum = r.sum;
+            });
+            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {//已完成
+                vue.ywcOrderSum = r.sum;
+            });
+           $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=401", function (r) {//退款订单
+               vue.thcOrderSum = r.sum;
+           });
+            $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {//消费记录总数
+                vue.userSum = r.userSum;
+            });
+            $.getJSON("../goods/queryTotal", function (r) {//所有商品数
+                vue.goodsSum = r.goodsSum;
+            });
+            $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=1", function (r) {//待发货
                 vue.dfOrderSum = r.sum;
                 if (r.sum > 0) {
                     iview.Notice.info({
@@ -307,18 +325,7 @@
                     iN.setTitle(true).player();
                 }
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&shippingStatus=1", function (r) {
-                vue.yfOrderSum = r.sum;
-            });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0", function (r) {
-                vue.yfkOrderSum = r.sum;
-            });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {
-                vue.ywcOrderSum = r.sum;
-            });
-           $.getJSON("../orderrefund/queryMainTotal", function (r) {
-               vue.thcOrderSum = r.sum;
-           });
+
             $.get("../orderrefund/queryTotal?isOnfflineOrder=1&refundStatus=1", function (r) {
                 // vue.thcOrderSum = r.sum;
                 if (r.sum > 0) {
@@ -342,12 +349,6 @@
                     iN.setTitle(true).player();
                 }
             });
-            $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {
-                vue.userSum = r.userSum;
-            });
-            $.getJSON("../goods/queryTotal", function (r) {
-                vue.goodsSum = r.goodsSum;
-            });
 
             $.getJSON("../order/getUserOrderInfo?type=yfkOrderUserSum", function (r) {
                 vue.yfkOrderUserSum = r.result;