首页统计

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

@@ -292,16 +292,18 @@ public class TbCfOrderController extends AbstractController {
     @GetMapping("/getOrderByDate")
     @ResponseBody
     public R getOrderByDate(@RequestParam(value = "start", required = false) String start,
-                            @RequestParam(value = "end", required = false) String end) {
-        List<StatisticalVo> orderList = tbCfOrderListService.getOrderByDate(start, end);
+                            @RequestParam(value = "end", required = false) String end,
+                            @RequestParam(value = "flag", required = false) String flag) {
+        List<StatisticalVo> orderList = tbCfOrderListService.getOrderByDate(start, end,flag);
         return R.ok().put("list", orderList);
     }
 
     @GetMapping("/getOrderPaidByDate")
     @ResponseBody
     public R getOrderPaidByDate(@RequestParam(value = "start", required = false) String start,
-                                @RequestParam(value = "end", required = false) String end) {
-        List<StatisticalVo> orderList = tbCfOrderListService.getOrderPaidByDate(start, end);
+                                @RequestParam(value = "end", required = false) String end,
+                                @RequestParam(value = "flag", required = false) String flag) {
+        List<StatisticalVo> orderList = tbCfOrderListService.getOrderPaidByDate(start, end,flag);
         return R.ok().put("list", orderList);
     }
 

platform-admin/src/main/java/com/platform/controller/TbCfSearchController.java

@@ -114,11 +114,13 @@ public class TbCfSearchController {
      */
     @RequestMapping("/getSearchKeywords")
     @ResponseBody
-    public R getSearchKeywords() {
-
-        List<SearchKeywords> searchList = tbCfSearchService.getSearchKeywords();
+    public R getSearchKeywords(@RequestParam Map<String, Object> params) {
+        Query query = new Query(params);
+        List<SearchKeywords> searchList = tbCfSearchService.getSearchKeywords(query);
+        int total = tbCfSearchService.getTotal();
+        PageUtils pageUtil = new PageUtils(searchList, total, query.getLimit(), query.getPage());
 
-        return R.ok().put("list", searchList);
+        return R.ok().put("page", pageUtil);
     }
 
     /**
@@ -128,7 +130,7 @@ public class TbCfSearchController {
      */
     @RequestMapping("/getTopSearch")
     @ResponseBody
-    public R getTopSearch(@RequestParam Map<String, Object> params) {
+    public R getTopSearch() {
 
         TopSearch topSearch = tbCfSearchService.getTopSearch();
 

platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java

@@ -117,8 +117,8 @@ public class TbCfUserInfoController {
      */
     @ResponseBody
     @GetMapping("/getDailyRegistered")
-    public R getDailyRegistered() {
-        List<StatisticalVo> userList = tbCfUserInfoService.getDailyRegistered();
+    public R getDailyRegistered(@RequestParam(value = "flag",required = false) String flag) {
+        List<StatisticalVo> userList = tbCfUserInfoService.getDailyRegistered(flag);
         return R.ok().put("list", userList);
     }
 

platform-admin/src/main/java/com/platform/dao/TbCfOrderDao.java

@@ -86,9 +86,9 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
     //根据订单付款状态查询订单数量
     int queryPayCount(String payStatus);
 
-    List<StatisticalVo> getOrderByDate(@Param("start") String start, @Param("end") String end);
+    List<StatisticalVo> getOrderByDate(@Param("start") String start, @Param("end") String end,@Param("flag") String flag);
 
-    List<StatisticalVo> getOrderPaidByDate(@Param("start") String start, @Param("end") String end);
+    List<StatisticalVo> getOrderPaidByDate(@Param("start") String start, @Param("end") String end,@Param("flag") String flag);
 
     Long getOrderNum(@Param("status") String status);
 

platform-admin/src/main/java/com/platform/dao/TbCfSearchDao.java

@@ -5,6 +5,7 @@ import com.platform.vo.SearchKeywords;
 import com.platform.vo.TopSearch;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Dao
@@ -14,7 +15,7 @@ import java.util.List;
  */
 public interface TbCfSearchDao extends BaseDao<TbCfSearchEntity> {
 
-    List<SearchKeywords> getSearchKeywords();
+    List<SearchKeywords> getSearchKeywords(Map<String, Object> params);
 
     TopSearch getTopSearch();
 

platform-admin/src/main/java/com/platform/dao/TbCfUserInfoDao.java

@@ -23,7 +23,7 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
 
     List<String> getUserIds(String name);
 
-    List<StatisticalVo> getDailyRegistered();
+    List<StatisticalVo> getDailyRegistered(@Param("flag") String flag);
 
     List<StatisticalVo> getDayRegistered();
 

platform-admin/src/main/java/com/platform/service/TbCfOrderListService.java

@@ -54,9 +54,9 @@ public interface TbCfOrderListService {
 
     int queryPayCount(String payStatus);
 
-    List<StatisticalVo> getOrderByDate(String start, String end);
+    List<StatisticalVo> getOrderByDate(String start, String end,String flag);
 
-    List<StatisticalVo> getOrderPaidByDate(String start, String end);
+    List<StatisticalVo> getOrderPaidByDate(String start, String end,String flag);
 
     Long getOrderNum(String status);
 }

platform-admin/src/main/java/com/platform/service/TbCfSearchService.java

@@ -71,7 +71,9 @@ public interface TbCfSearchService {
      */
     int deleteBatch(String[] ids);
 
-    List<SearchKeywords> getSearchKeywords();
+    List<SearchKeywords> getSearchKeywords(Map<String, Object> params);
 
     TopSearch getTopSearch();
+
+    int getTotal();
 }

platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java

@@ -77,7 +77,7 @@ public interface TbCfUserInfoService {
 
     String queryByAccount(String account);
 
-    List<StatisticalVo> getDailyRegistered();
+    List<StatisticalVo> getDailyRegistered(String flag);
 
     List<StatisticalVo> getDayRegistered();
 

platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java

@@ -104,15 +104,15 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
     }
 
     @Override
-    public List<StatisticalVo> getOrderByDate(String start, String end) {
+    public List<StatisticalVo> getOrderByDate(String start, String end,String flag) {
 
-        return tbCfOrderDao.getOrderByDate(start, end);
+        return tbCfOrderDao.getOrderByDate(start, end,flag);
     }
 
     @Override
-    public List<StatisticalVo> getOrderPaidByDate(String start, String end) {
+    public List<StatisticalVo> getOrderPaidByDate(String start, String end,String flag) {
 
-        return tbCfOrderDao.getOrderPaidByDate(start, end);
+        return tbCfOrderDao.getOrderPaidByDate(start, end,flag);
     }
 
     @Override

platform-admin/src/main/java/com/platform/service/impl/TbCfSearchServiceImpl.java

@@ -60,12 +60,17 @@ public class TbCfSearchServiceImpl implements TbCfSearchService {
     }
 
     @Override
-    public List<SearchKeywords> getSearchKeywords() {
-        return tbCfSearchDao.getSearchKeywords();
+    public List<SearchKeywords> getSearchKeywords(Map<String, Object> params) {
+        return tbCfSearchDao.getSearchKeywords(params);
     }
 
     @Override
     public TopSearch getTopSearch() {
         return tbCfSearchDao.getTopSearch();
     }
+
+    @Override
+    public int getTotal() {
+        return tbCfSearchDao.getTotal();
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java

@@ -75,9 +75,9 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
     }
 
     @Override
-    public List<StatisticalVo> getDailyRegistered() {
+    public List<StatisticalVo> getDailyRegistered(String flag) {
 
-        return tbCfUserInfoDao.getDailyRegistered();
+        return tbCfUserInfoDao.getDailyRegistered(flag);
     }
 
     @Override

platform-admin/src/main/resources/com/platform/dao/TbCfOrderDao.xml

@@ -73,7 +73,14 @@
 	</select>
     <select id="getOrderByDate" resultType="com.platform.vo.StatisticalVo">
         SELECT
-        DATE_FORMAT( order_time, '%Y-%m-%d' ) date,
+        <choose>
+            <when test="flag != null and flag.trim() != ''">
+                DATE_FORMAT( order_time, '%Y-%m' ) date,
+            </when>
+            <otherwise>
+                DATE_FORMAT( order_time, '%Y-%m-%d' ) date,
+            </otherwise>
+        </choose>
         count( 1 ) num
         FROM
         tb_cf_order
@@ -91,7 +98,14 @@
 
     <select id="getOrderPaidByDate" resultType="com.platform.vo.StatisticalVo">
         SELECT
-        DATE_FORMAT( order_time, '%Y-%m-%d' ) date,
+        <choose>
+            <when test="flag != null and flag.trim() != ''">
+                DATE_FORMAT( order_time, '%Y-%m' ) date,
+            </when>
+            <otherwise>
+                DATE_FORMAT( order_time, '%Y-%m-%d' ) date,
+            </otherwise>
+        </choose>
         count( 1 ) num
         FROM
         tb_cf_order
@@ -243,7 +257,7 @@
 		left join tb_cf_item_detail d on d.item_id=i.item_id
 		WHERE 1=1 and i.enable_flag=1 and o.enable_flag=1
 	</select>
-   <select id="getDayOrderNum" resultType="int">
+    <select id="getDayOrderNum" resultType="int">
         SELECT
         count(DISTINCT user_id)
         FROM

platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml

@@ -56,7 +56,14 @@
     <!--查询每日注册量-->
     <select id="getDailyRegistered" resultType="com.platform.vo.StatisticalVo">
         SELECT
-        DATE_FORMAT( create_time, '%Y-%m-%d' ) date,
+        <choose>
+            <when test="flag != null and flag.trim() != ''">
+                DATE_FORMAT( create_time, '%Y-%m' ) date,
+            </when>
+            <otherwise>
+                DATE_FORMAT( create_time, '%Y-%m-%d' ) date,
+            </otherwise>
+        </choose>
         count( 1 ) num
         FROM
         tb_cf_user_info
@@ -100,7 +107,7 @@
     <!--查询今年注册量-->
     <select id="getYearRegistered" resultType="com.platform.vo.StatisticalVo">
         SELECT
-        DATE_FORMAT( create_time, '%Y-%m-%d' ) date,
+        DATE_FORMAT( create_time, '%Y-%m' ) date,
         count( 1 ) num
         FROM
         tb_cf_user_info

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

@@ -559,7 +559,19 @@
             </div>
         </nav>
         <section class="middleEcharts-container">
-            <h3 ref='middleEachrtsTitle'>注册量趋势</h3>
+            <div>
+                <div v-show="show" style="float: right">
+                    <span>显示方式</span>
+                    <i-Select
+                            style="width:70px" placeholder="请选择" @on-change="choose" ref="serviceStatusClear" clearable>
+                        <i-Option v-for="item in showList" :value="item.value"
+                                  :key="item.value">{{ item.label }}
+                        </i-Option>
+                    </i-Select>
+                </div>
+                <h3 ref='middleEachrtsTitle'>注册量趋势</h3>
+
+            </div>
             <div id="middleEcharts-in"></div>
         </section>
     </section>

platform-admin/src/main/webapp/js/sys/main.js

@@ -2,6 +2,8 @@ let app = new Vue({
     el: '#app',
     data() {
         return {
+            flag: false,
+            show: false,
             total: 0,
             average: 0,
             category2: null,
@@ -13,6 +15,16 @@ let app = new Vue({
             PVNumber: 0,
             FrequencyOfPaymentNumber: 0,
             searchList: [],
+            showList: [
+                {
+                    value: 0,
+                    label: '日'
+                },
+                {
+                    value: 1,
+                    label: '月'
+                }
+            ],
             datePicker: {
                 shortcuts: [
                     {
@@ -317,6 +329,7 @@ let app = new Vue({
             })
         },
         getDayRegistered() {
+            this.show = false;
             let endDate = this.getEndDate();
             // console.log(endDate)
             if (this.middleOption[0].isActive) {
@@ -325,17 +338,15 @@ let app = new Vue({
             } else if (this.middleOption[1].isActive) {
 
             } else if (this.middleOption[2].isActive) {
-                // this.initEchartsMiddleData[0].name='订单量'
-                console.log(123345455, this.initEchartsMiddleData[0].name)
                 let url = '../tbcforder/getOrderByDate?start=' + endDate;
                 this.templateMethod1(url);
             } else if (this.middleOption[3].isActive) {
-                this.initEchartsMiddleData[0].name = '成交量'
                 let url = '../tbcforder/getOrderPaidByDate?start=' + endDate;
                 this.templateMethod1(url);
             }
         },
         getWeekRegistered() {
+            this.show = false;
             const now = new Date();
             let start = new Date();
             let end = new Date();
@@ -360,6 +371,7 @@ let app = new Vue({
             }
         },
         getMonthRegistered() {
+            this.show = false;
             let end = this.getEndDate()
             let start = end.substr(0, end.lastIndexOf("-")) + '-01'
             // console.log('start', start)
@@ -378,6 +390,7 @@ let app = new Vue({
             }
         },
         getYearRegistered() {
+            this.show = false;
             let end = this.getEndDate();
             let start = end.substr(0, end.indexOf('-')) + '-01-01';
             // console.log('start', start)
@@ -388,10 +401,10 @@ let app = new Vue({
             } else if (this.middleOption[1].isActive) {
 
             } else if (this.middleOption[2].isActive) {
-                let url = '../tbcforder/getOrderByDate?start=' + start + '&end' + end;
+                let url = '../tbcforder/getOrderByDate?start=' + start + '&end' + end + '&flag=y';
                 this.templateMethod1(url);
             } else if (this.middleOption[3].isActive) {
-                let url = '../tbcforder/getOrderPaidByDate?start=' + start + '&end' + end;
+                let url = '../tbcforder/getOrderPaidByDate?start=' + start + '&end' + end + '&flag=y';
                 this.templateMethod1(url);
             }
         },
@@ -668,6 +681,8 @@ let app = new Vue({
             app.setOption(option);
         },
         changeMiddelActive(element, index) {
+            this.$refs.serviceStatusClear.clearSingleSelect();
+            this.show = true;
             this.middleOption.forEach(item => {
                 item.isActive = false;
             })
@@ -683,12 +698,10 @@ let app = new Vue({
                 this.initEchartsMiddleData[0].data = []
             } else if (index === 2) {
                 this.initEchartsMiddleData[0].name = '订单笔数'
-                console.log(123345455, this.initEchartsMiddleData[0].name)
                 let url = '../tbcforder/getOrderByDate';
                 this.templateMethod1(url);
             } else if (index === 3) {
                 this.initEchartsMiddleData[0].name = '成交量'
-                console.log(123345455, this.initEchartsMiddleData[0].name)
                 let url = '../tbcforder/getOrderPaidByDate';
                 this.templateMethod1(url);
             }
@@ -710,6 +723,7 @@ let app = new Vue({
         },
         /* 中间模块日期 */
         changeDate(e) {
+            this.show = false;
             //注册量
             if (this.middleOption[0].isActive) {
                 let url = '../tbcfuserinfo/getRegisteredByDate?start=' + e[0] + '&end=' + e[1];
@@ -738,6 +752,28 @@ let app = new Vue({
                 })
             }
         },
+        choose(e) {
+            let flag = '';
+            //注册量
+            if (e === 1) {
+                flag = 'y';
+            }
+            let endDate = this.getEndDate();
+            if (this.middleOption[0].isActive) {
+                this.initEchartsMiddleData[0].name = '注册量'
+                let url = '../tbcfuserinfo/getDailyRegistered?flag=' + flag;
+                this.templateMethod(url);
+            } else if (this.middleOption[1].isActive) {
+
+            } else if (this.middleOption[2].isActive) {
+                let url = '../tbcforder/getOrderByDate?flag=' + flag;
+                this.templateMethod1(url);
+            } else if (this.middleOption[3].isActive) {
+                let url = '../tbcforder/getOrderPaidByDate?flag=' + flag;
+                this.templateMethod1(url);
+            }
+
+        },
         getOrderNum() {
             $.get('../tbcforder/getOrderSumAmount', res => {
                 TweenLite.to(this.$data, 1, {ForturnoverNumber: res.amount});
@@ -765,11 +801,27 @@ let app = new Vue({
             })
         },
         getSearchKeywords() {
-            $.get('../tbcfsearch/getSearchKeywords', res => {
-                let list = JSON.parse(res).list;
-                console.log('123455', list)
-                this.searchList = list;
+            $.get('../tbcfsearch/getSearchKeywords?page=1&limit=10&sidx=&order=', res => {
+                let list = JSON.parse(res);
+                console.log('123455', list.page.list)
+                this.searchList = list.page.list;
             })
+            // let url = '../tbcfsearch/getSearchKeywords';
+            // Ajax.request({
+            //     url: url,
+            //     type: "GET",
+            //     data: {
+            //         page: 1,
+            //         limit: 5,
+            //         sidx: null,
+            //         order: null
+            //     },
+            //     contentType: "application/json",
+            //     successCallback: function (r) {
+            //         console.log('456566855',r)
+            //         this.searchList = r.page.list;
+            //     }
+            // });
         },
         Percentage(num, total) {
             if (num == 0 || total == 0) {