优化首页统计

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

@@ -329,8 +329,8 @@ public class TbCfOrderController extends AbstractController {
 
     @GetMapping("/getDayOrderNum")
     @ResponseBody
-    public R getDayOrderNum() {
-        int dayOrderNum = tbCfOrderService.getDayOrderNum();
+    public R getDayOrderNum(@RequestParam(value = "status",required = false) String status) {
+        int dayOrderNum = tbCfOrderService.getDayOrderNum(status);
         return R.ok().put("dayOrderNum", dayOrderNum);
     }
 

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

@@ -97,7 +97,7 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
 
     BigDecimal getOrderSumAmount();
 
-    int getDayOrderNum();
+    int getDayOrderNum(@Param("status") String status);
 
     BigDecimal getWeekAmount();
 

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

@@ -121,7 +121,7 @@ public interface TbCfOrderService {
 
     BigDecimal getOrderSumAmount();
 
-    int getDayOrderNum();
+    int getDayOrderNum(String status);
 
     BigDecimal getWeekCompared();
 

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

@@ -199,9 +199,9 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     }
 
     @Override
-    public int getDayOrderNum() {
+    public int getDayOrderNum(String status) {
 
-        return tbCfOrderDao.getDayOrderNum();
+        return tbCfOrderDao.getDayOrderNum(status);
     }
 
     @Override

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

@@ -329,6 +329,9 @@
         count(DISTINCT user_id)
         FROM
         tb_cf_order where DATE_FORMAT(order_time,'%Y-%m-%d')=CURDATE()
+        <if test="status!=null">
+            and pay_status=#{status}
+        </if>
    </select>
 
     <insert id="save" parameterType="com.platform.entity.TbCfOrderEntity">

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

@@ -315,7 +315,7 @@ let app = new Vue({
                 this.initEchartsMiddleData[0].data = []
                 let objList = JSON.parse(res).list
                 objList.map(res => {
-                    console.log('date', res.date)
+                    // console.log('date', res.date)
                     this.initEchartsMiddleData[0].data.push([res.date, res.num])
                 })
                 this.initEchartsMiddle();
@@ -325,7 +325,7 @@ let app = new Vue({
             $.get(url, res => {
                 this.initEchartsMiddleData[0].data = []
                 res.list.map(res => {
-                    console.log('date', res.date)
+                    // console.log('date', res.date)
                     this.initEchartsMiddleData[0].data.push([res.date, res.num])
                 })
                 this.initEchartsMiddle();
@@ -432,12 +432,12 @@ let app = new Vue({
         getDayRate() {
             $.get('../tbcforder/getDaysFrom', res => {
                 this.dayRate = res.dayRate
-                console.log('dayRate', res.dayRate)
+                // console.log('dayRate', res.dayRate)
             })
         },
         getUserDayRate() {
             $.get('../tbcfuserinfo/getDayRate', res => {
-                console.log('rate', JSON.parse(res).rate)
+                // console.log('rate', JSON.parse(res).rate)
                 this.rate = JSON.parse(res).rate
             })
         },
@@ -797,14 +797,17 @@ let app = new Vue({
 
         },
         getOrderNum() {
-            $.get('../tbcforder/getOrderSumAmount', res => {
-                TweenLite.to(this.$data, 1, {ForturnoverNumber: res.amount});
+            $.get('../tbcforder/getDayOrderNum', res => {
+                console.log("dayOrderNum",res)
+                TweenLite.to(this.$data, 1, {ForturnoverNumber: res.dayOrderNum});
             })
         },
         getOrderPaidNum() {
-            $.get('../tbcforder/getOrderNum?status=20', res => {
-                TweenLite.to(this.$data, 1, {FrequencyOfPaymentNumber: res.count});
+            $.get('../tbcforder/getDayOrderNum?status=20', res => {
+                console.log("dayOrderNum2",res)
+                TweenLite.to(this.$data, 1, {FrequencyOfPaymentNumber: res.dayOrderNum});
             })
+
         },
         getOrderRate() {
             let orderNum = 0;
@@ -831,7 +834,7 @@ let app = new Vue({
         getSearchKeywords() {
             $.get('../tbcfsearch/getSearchKeywords?page=1&limit=10&sidx=&order=', res => {
                 let list = JSON.parse(res);
-                console.log('123455', list.page.list)
+                // console.log('123455', list.page.list)
                 this.searchList = list.page.list;
             })
             // let url = '../tbcfsearch/getSearchKeywords';
@@ -871,7 +874,7 @@ let app = new Vue({
         getCategory() {
             $.get('../tbcfgoodstype/queryAll', res => {
                 this.categoryList = res.list;
-                console.log(this.categoryList)
+                // console.log(this.categoryList)
             })
         }
     },