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

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -2061,9 +2061,8 @@
         g.goods_id,
         o.order_sn as receiptNo,
         u.username as cashRegisterNo,
-
-        o.create_time as timeStampDetails,
         u.username as staffID,
+        o.create_time as timeStampDetails,
         u.username as staffName,
         gs.hs_code as hsCode,
         gs.hs_code_name as hsCodeName,
@@ -2085,7 +2084,7 @@
         gs.goods_rate as taxRate,
         '专柜单品' as productCategory,
         sup.child_supplier_name as supplierName,
-        o.order_status as orderStatus,
+        '300' as orderStatus,
         g.tax_price as taxPrice,
         s.store_name as storeName,
         o.pay_flag as payFlag,
@@ -2103,6 +2102,7 @@
         left join mall_brand b on b.id=sr.brand_id
         left join mall_supplier sup on gs.supplier_id = sup.id
         WHERE 1=1
+        AND g.number>0
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
@@ -2127,15 +2127,15 @@
             AND s.store_name LIKE concat('%',#{storeName},'%')
         </if>
 
-         union
+        union
 
         SELECT distinct
         o.id,
         g.goods_id,
         o.order_sn as receiptNo,
         u.username as cashRegisterNo,
-        mor.create_time as timeStampDetails,
         u.username as staffID,
+        mor.create_time as timeStampDetails,
         u.username as staffName,
         gs.hs_code as hsCode,
         gs.hs_code_name as hsCodeName,
@@ -2177,6 +2177,7 @@
         left join mall_supplier sup on gs.supplier_id = sup.id
         left join mall_order_refund mor on mor.out_refund_no = o.order_sn
         WHERE 1=1
+        AND g.number>0
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
@@ -2201,7 +2202,6 @@
             AND s.store_name LIKE concat('%',#{storeName},'%')
         </if>
 
-
     </select>
 
     <update id="updateOrderInfo" parameterType="map">

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

@@ -49,20 +49,20 @@
                         class="fa fa-arrow-circle-right"></i></a>
             </div>
         </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            <div class="small-box bg-light-blue">
-                <div class="inner">
-                    <h3>{{yfkOrderSum}}</h3>
-                    <p>待付款</p>
-                </div>
-                <div class="icon">
-                    <i class="fa fa-shopping-bag"></i>
-                </div>
-                <a class="small-box-footer"></a>
-                <a onclick="vm.toOrderByPayStatus(0)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
-            </div>
-        </div>
+<!--        <div class="col-md-3 col-sm-6 col-xs-12">-->
+<!--            <div class="small-box bg-light-blue">-->
+<!--                <div class="inner">-->
+<!--                    <h3>{{yfkOrderSum}}</h3>-->
+<!--                    <p>待付款</p>-->
+<!--                </div>-->
+<!--                <div class="icon">-->
+<!--                    <i class="fa fa-shopping-bag"></i>-->
+<!--                </div>-->
+<!--                <a class="small-box-footer"></a>-->
+<!--                <a onclick="vm.toOrderByPayStatus(0)" class="small-box-footer">详情 <i-->
+<!--                        class="fa fa-arrow-circle-right"></i></a>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="col-md-3 col-sm-6 col-xs-12">
             <div class="small-box bg-fuchsia">
                 <div class="inner">
@@ -287,9 +287,9 @@
             $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=300&orderType=1", function (r) {//已发货
                 vue.yfOrderSum = r.sum;
             });
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0&orderType=1", function (r) {//待付款
-                vue.yfkOrderSum = r.sum;
-            });
+            // $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=0&orderType=1", function (r) {//待付款
+            //     vue.yfkOrderSum = r.sum;
+            // });
             // $.getJSON("../order/queryTotal?isOnfiilineOrder=1&orderStatus=402", function (r) {//已完成
             //     vue.ywcOrderSum = r.sum;
             // });