WIN-2308041133\Administrator il y a 1 mois
Parent
commit
8745381f8a
2 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 2 1
      app/dao/order/StoreOrderDao.php
  2. 5 5
      app/services/order/StoreOrderServices.php

+ 2 - 1
app/dao/order/StoreOrderDao.php

@@ -474,7 +474,8 @@ class StoreOrderDao extends BaseDao
  */
  */
     public function totalLbSales($time)
     public function totalLbSales($time)
     {
     {
-        return $this->search(['paid' => 1, 'refund_status' => 0, 'time' => $time ?: 'today', 'timekey' => 'pay_time', 'pid' => 0,'is_lb'=>1])->sum('pay_price');
+//        return $this->search(['paid' => 1, 'refund_status' => 0, 'time' => $time ?: 'today', 'timekey' => 'pay_time', 'pid' => 0,'is_lb'=>1])->sum('pay_price');
+        return $this->search(['paid' => 1, 'refund_status' => 0, 'timekey' => 'pay_time', 'pid' => 0,'is_lb'=>1])->sum('pay_price');
     }
     }
     /**
     /**
      * 获取订单详情
      * 获取订单详情

+ 5 - 5
app/services/order/StoreOrderServices.php

@@ -1614,15 +1614,15 @@ HTML;
         ];
         ];
         //TODO 老积分
         //TODO 老积分
         $points_radio = sys_config('gift_points',5);
         $points_radio = sys_config('gift_points',5);
-        //今日礼包产品
+        //今日老积分
         $today_points = $this->dao->todayLbSales('today');
         $today_points = $this->dao->todayLbSales('today');
         $today_points = bcmul($today_points,bcdiv($points_radio,100,2),2);
         $today_points = bcmul($today_points,bcdiv($points_radio,100,2),2);
-        //昨日礼包产品
+        //昨日老积分
         $yesterday_points = $this->dao->todayLbSales('yesterday');
         $yesterday_points = $this->dao->todayLbSales('yesterday');
         $yesterday_points = bcmul($yesterday_points,bcdiv($points_radio,100,2),2);
         $yesterday_points = bcmul($yesterday_points,bcdiv($points_radio,100,2),2);
         //日同比
         //日同比
         $points_today__ratio = $this->growth($today_sales, $yesterday_sales);
         $points_today__ratio = $this->growth($today_sales, $yesterday_sales);
-        //总礼包产品
+        //总老积分
         $total_points = $this->dao->totalLbSales('month');
         $total_points = $this->dao->totalLbSales('month');
         $total_points = bcmul($total_points,bcdiv($points_radio,100,2),2);
         $total_points = bcmul($total_points,bcdiv($points_radio,100,2),2);
         $points = [
         $points = [
@@ -1643,8 +1643,8 @@ HTML;
         $info[1]['total_name'] = '本月访问量';
         $info[1]['total_name'] = '本月访问量';
         $info[2]['total_name'] = '本月订单量';
         $info[2]['total_name'] = '本月订单量';
         $info[3]['total_name'] = '本月新增用户';
         $info[3]['total_name'] = '本月新增用户';
-        $info[4]['total_name'] = '本月礼包产品绩效';
-        $info[5]['total_name'] = '本月老积分';
+        $info[4]['total_name'] = '礼包产品绩效';
+        $info[5]['total_name'] = '老积分';
         return $info;
         return $info;
     }
     }