欢迎页数据源更换

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -1500,4 +1500,15 @@ public class OrderController {
         return orderService.resendOrderHkMall(orderSn);
     }
 
+    /**
+     * 总计
+     */
+    @RequestMapping("/queryMainTotal")
+    public R queryMainTotal(@RequestParam Map<String, Object> params) {
+        int sum = orderService.queryOrderMainTotal();
+
+        return R.ok().put("sum", sum);
+    }
+
+
 }

kmall-admin/src/main/java/com/kmall/admin/controller/OrderRefundController.java

@@ -128,4 +128,15 @@ public class OrderRefundController {
 
         return R.ok().put("list", list);
     }
+
+    /**
+     * 总计
+     */
+    @RequestMapping("/queryMainTotal")
+    @ResponseBody
+    public R queryMainTotal(@RequestParam Map<String, Object> params) {
+        int total = orderRefundService.queryMainTotal();
+
+        return R.ok().put("sum", total);
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/controller/vip/Mall2MemberConsumptionRecordsController.java

@@ -3,6 +3,7 @@ package com.kmall.admin.controller.vip;
 import java.util.List;
 import java.util.Map;
 
+import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
@@ -104,4 +105,18 @@ public class Mall2MemberConsumptionRecordsController {
 
         return R.ok().put("list", list);
     }
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/queryTotal")
+    @ResponseBody
+    public R queryTotal() {
+        //查询列表数据
+
+        int sum = mall2MemberConsumptionRecordsService.queryMainTotal();
+        return R.ok().put("userSum", sum);
+    }
+
+
 }

kmall-admin/src/main/java/com/kmall/admin/dao/OrderDao.java

@@ -192,4 +192,6 @@ public interface OrderDao extends BaseDao<OrderEntity> {
      * @return      结果
      */
     int updateBuyerPayCheck(Map<String, Object> wxMap);
+
+    int queryOrderMainTotal();
 }

kmall-admin/src/main/java/com/kmall/admin/dao/OrderRefundDao.java

@@ -12,4 +12,6 @@ import com.kmall.manager.dao.BaseDao;
  */
 public interface OrderRefundDao extends BaseDao<OrderRefundEntity> {
     OrderRefundEntity queryObjectByOrderId(Long orderId);
+
+    int queryMainTotal();
 }

kmall-admin/src/main/java/com/kmall/admin/dao/vip/Mall2MemberConsumptionRecordsDao.java

@@ -22,4 +22,5 @@ public interface Mall2MemberConsumptionRecordsDao extends BaseDao<Mall2MemberCon
      */
     Mall2MemberConsumptionRecordsEntity queryObjectByOrderSn(@Param("orderSn") String orderSn);
 
+    int queryMainTotal();
 }

kmall-admin/src/main/java/com/kmall/admin/service/OrderRefundService.java

@@ -71,4 +71,6 @@ public interface OrderRefundService {
     int deleteBatch(Integer[] ids);
 
     OrderRefundEntity queryObjectByOrderId(Long orderId);
+
+    int queryMainTotal();
 }

kmall-admin/src/main/java/com/kmall/admin/service/OrderService.java

@@ -256,4 +256,6 @@ public interface OrderService {
      * 重推退款积分，最多五次
      */
     void integralTask();
+
+    int queryOrderMainTotal();
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderRefundServiceImpl.java

@@ -81,4 +81,9 @@ public class OrderRefundServiceImpl implements OrderRefundService {
     public OrderRefundEntity queryObjectByOrderId(Long orderId) {
         return orderRefundDao.queryObjectByOrderId(orderId);
     }
+
+    @Override
+    public int queryMainTotal() {
+        return orderRefundDao.queryMainTotal();
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -5384,4 +5384,9 @@ public class OrderServiceImpl implements OrderService {
         }
 
     }
+
+    @Override
+    public int queryOrderMainTotal() {
+        return orderDao.queryOrderMainTotal();
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/vip/Mall2MemberConsumptionRecordsServiceImpl.java

@@ -56,4 +56,9 @@ public class Mall2MemberConsumptionRecordsServiceImpl implements Mall2MemberCons
     public int deleteBatch(Integer[]mmcrIds) {
         return mall2MemberConsumptionRecordsDao.deleteBatch(mmcrIds);
     }
+
+    @Override
+    public int queryMainTotal() {
+        return mall2MemberConsumptionRecordsDao.queryMainTotal();
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/service/vip/Mall2MemberConsumptionRecordsService.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.service.vip;
 
 import com.kmall.admin.entity.vip.Mall2MemberConsumptionRecordsEntity;
+import com.kmall.common.utils.Query;
 
 import java.util.List;
 import java.util.Map;
@@ -69,4 +70,6 @@ public interface Mall2MemberConsumptionRecordsService {
      * @return 删除条数
      */
     int deleteBatch(Integer[] mmcrIds);
+
+    int queryMainTotal();
 }

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

@@ -2460,4 +2460,8 @@
         where order_sn = #{orderSn,jdbcType=VARCHAR}
     </update>
 
+    <select id="queryOrderMainTotal" resultType="java.lang.Integer">
+        select count(*) from mall_order
+    </select>
+
 </mapper>

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

@@ -300,4 +300,10 @@
         select * from mall_order_refund
         where order_id = #{orderId}
     </select>
+
+    <select id="queryMainTotal" resultType="java.lang.Integer">
+        select count(*) from mall_order_refund
+    </select>
+
+
 </mapper>

kmall-admin/src/main/resources/mybatis/mapper/vip/Mall2MemberConsumptionRecordsDao.xml

@@ -219,4 +219,9 @@
 		</foreach>
 	</delete>
 
+
+	<select id="queryMainTotal" resultType="int">
+		select count(*) from mall2_member_consumption_records
+	</select>
+
 </mapper>

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

@@ -16,8 +16,9 @@
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByShipStatus()" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toOrderByShipStatus()" 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">
@@ -29,8 +30,9 @@
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByShipStatus(0)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toOrderByShipStatus(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">
@@ -42,8 +44,9 @@
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByShipStatus(1)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toOrderByShipStatus(1)" 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">
@@ -55,21 +58,23 @@
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByPayStatus(0)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <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">
                     <h3>{{thcOrderSum}}</h3>
-                    <p>申请退款订单</p>
+                    <p>退款订单</p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByRefundStatus(1)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toOrderByRefundStatus(1)" 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">
@@ -81,20 +86,22 @@
                 <div class="icon">
                     <i class="fa fa-shopping-bag"></i>
                 </div>
-                <a onclick="vm.toOrderByOrderStatus(402)" class="small-box-footer">详情 <i
-                        class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toOrderByOrderStatus(402)" 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-red">
                 <div class="inner">
                     <h3>{{userSum}}</h3>
-                    <p>所有会员</p>
+                    <p>消费记录总数</p>
                 </div>
                 <div class="icon">
                     <i class="fa fa-user-md"></i>
                 </div>
-                <a onclick="vm.toUser()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toUser()" 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">
@@ -106,7 +113,8 @@
                 <div class="icon">
                     <i class="fa fa-ship"></i>
                 </div>
-                <a onclick="vm.toGoods()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>
+                <a class="small-box-footer"></a>
+<!--                <a onclick="vm.toGoods()" class="small-box-footer">详情 <i class="fa fa-arrow-circle-right"></i></a>-->
             </div>
         </div>
     </div>
@@ -115,7 +123,7 @@
             <th colspan="5">会员购买率：<span style="color: red;">{{hygml}}%</span>（会员购买率=已付款订单会员数÷会员总数）</th>
         </tr>
         <tr style='text-align: center;'>
-            <th style="text-align: center;">会员总数</th>
+            <th style="text-align: center;">消费记录总数</th>
             <th style="text-align: center;">已付款订单会员数</th>
             <th style="text-align: center;">有订单会员数</th>
             <th style="text-align: center;">今日订单数</th>
@@ -162,7 +170,7 @@
             yfkOrderSum: 0,//待付款
             ywcOrderSum: 0,//已完成
             thcOrderSum: 0,//退款
-            userSum: 0,//所有会员数
+            userSum: 0,//消费记录总数
             goodsSum: 0,//所有商品数
             yfkOrderUserSum: 0,//已付款订单会员数
             oderUserSum: 0,//有订单会员数
@@ -216,7 +224,7 @@
                 });
             },
             toOrderByRefundStatus: function (refundStatus) {
-                let url = '../shop/orderrefund.html?refundStatus=' + refundStatus;
+                let url = '../shop/offilineOrderList.html?orderType=1';
                 if (vm.thcOrderSum == 0) {
                     iview.Message.error('没有数据！');
                     return;
@@ -272,7 +280,7 @@
         },
         created: function () {
             let vue = this;
-            $.getJSON("../order/queryTotal?isOnfiilineOrder=0", function (r) {
+            $.getJSON("../order/queryMainTotal", function (r) {
                 vue.orderSum = r.sum;
             });
             $.getJSON("../order/queryTotal?orderStatus=201&payStatus=2&isOnfiilineOrder=0", function (r) {
@@ -307,10 +315,10 @@
             $.getJSON("../order/queryTotal?isOnfiilineOrder=0&orderStatus=402", function (r) {
                 vue.ywcOrderSum = r.sum;
             });
-//            $.getJSON("../orderrefund/queryTotal?isOnfflineOrder=0&refundStatus=1", function (r) {
-//                console.log(r.sum)
-//                vue.thcOrderSum = r.sum;
-//            });
+           $.getJSON("../orderrefund/queryMainTotal", function (r) {
+               console.log(r.sum)
+               vue.thcOrderSum = r.sum;
+           });
             $.get("../orderrefund/queryTotal?isOnfflineOrder=0&refundStatus=1", function (r) {
                 vue.thcOrderSum = r.sum;
                 if (r.sum > 0) {
@@ -322,7 +330,7 @@
                     let iN = new iNotify({
                         effect: 'flash',
                         interval: 500,
-                        message: "申请退款订单",
+                        message: "退款订单",
                         audio: {
                             file: ['../statics/audio/dforder.mp3']
                         },
@@ -356,7 +364,7 @@
                 vue.hitCount = r.hitCount;
             });
 
-            $.getJSON("../user/queryTotal", function (r) {
+            $.getJSON("../mall2memberconsumptionrecords/queryTotal", function (r) {
                 vue.userSum = r.userSum;
             });
             $.getJSON("../goods/queryTotal", function (r) {