修复bug

2024-11-13 15:16:20 +08:00
parent 64ce01bb91
commit 7e26a985b2
6 changed files with 192 additions and 102 deletions
--- a/admin/controllers/base/FinanceController.php
+++ b/admin/controllers/base/FinanceController.php
@@ -544,54 +544,53 @@ class FinanceController extends BaseAdminController
     */
    public function actionSaleMoney()
    {
+        $get = \Yii::$app->request->get();
        $admin = \Yii::$app->user->identity;
        $role = $admin->role;
        $timeType = \Yii::$app->request->get('time_type');
-        $month = [];
-        $week = [];
-        $day = [];

-        switch ($timeType) {
-            case 1:
-                $startTime = strtotime(date('Y-m-1 00:00:00'));
-                $endTime = strtotime(date('Y-m-d H:i:s'));
-                $week = $this->getWeekList($startTime, $endTime);
-                $day = $this->getDayList($startTime, $endTime);
-                break;
-            case 2:
-                $startTime = strtotime(date('Y-1-1 00:00:00'));
-                $endTime = strtotime(date('Y-m-d H:i:s'));
-                $month = $this->getMonthsList($startTime, $endTime);
-                break;
-            case 3:
-                $thisYear = date('Y');
-                $lastYear = $thisYear - 1;
-                $startTime = strtotime($lastYear . '-01-01 00:00:00');
-                $endTime = strtotime($lastYear . '-12-31 23:59:59');
-                $month = $this->getMonthsList($startTime, $endTime);
-                break;
-            case 4:
-                $startTime = strtotime('2023-01-01 00:00:00');
-                $endTime = time();
-                $month = $this->getMonthsList($startTime, $endTime);
-                break;
-            default:
-                throw new Exception('参数错误');
+        $startTime = strtotime($get['start_time']. ' 00:00:00');
+        $endTime = strtotime($get['end_time']. ' 23:59:59');
+        $day = $this->getDayList($startTime, $endTime);
+        $month = $this->getMonthsList($startTime, $endTime);
+        if (count($day) > 60) {
+            $day = [];
        }
+//        switch ($timeType) {
+//            case 1:
+//                $startTime = strtotime(date('Y-m-1 00:00:00'));
+//                $endTime = strtotime(date('Y-m-d H:i:s'));
+//                $week = $this->getWeekList($startTime, $endTime);
+//                $day = $this->getDayList($startTime, $endTime);
+//                break;
+//            case 2:
+//                $startTime = strtotime(date('Y-1-1 00:00:00'));
+//                $endTime = strtotime(date('Y-m-d H:i:s'));
+//                $month = $this->getMonthsList($startTime, $endTime);
+//                break;
+//            case 3:
+//                $thisYear = date('Y');
+//                $lastYear = $thisYear - 1;
+//                $startTime = strtotime($lastYear . '-01-01 00:00:00');
+//                $endTime = strtotime($lastYear . '-12-31 23:59:59');
+//                $month = $this->getMonthsList($startTime, $endTime);
+//                break;
+//            case 4:
+//                $startTime = strtotime('2023-01-01 00:00:00');
+//                $endTime = time();
+//                $month = $this->getMonthsList($startTime, $endTime);
+//                break;
+//            default:
+//                throw new Exception('参数错误');
+//        }
        $where = $this->getFinanceWhere($role, $admin);
-        $result = $this->getSleMoney($startTime, $endTime, $month, $week, $day, $where);
+        $result = $this->getSleMoney($startTime, $endTime, $month, [], $day, $where);

-//        $year = date('Y');
-//        $week = array_map(function ($v) use($year) {
-//            return $year.'-第' . $v . '周';
-//        }, $week);
        return [
            'line' => [
-//                'month' => !empty($month) ? $month : $week,
-                'month' => !empty($month) ? $month : $day,
+                'month' => !empty($day) ? $day : $month,
                'sale_money' => $result['sale_money'],
                'legend' => $result['line_legend'],
-//            'buy_money' => $result['buy_money'],
            ],
            'drug' => [
                'data' => $result['drug_data']
@@ -685,10 +684,7 @@ class FinanceController extends BaseAdminController
        // 总金额
        $totalMoney = 0;
        // TODO 暂时不统计供货价
-//        $buyMoney = [];
        // 判断获取时间方法
-//        $dateStr = !empty($week) ? 'W' :  'Y-m';
-//        $dateArr = !empty($week) ? $week : $month;
        $dateStr = !empty($day) ? 'm-d' :  'Y-m';
        $dateArr = !empty($day) ? $day : $month;

@@ -696,7 +692,6 @@ class FinanceController extends BaseAdminController
            $thisMonth = date($dateStr, $v['created_at']);
            $saleMoney[$thisMonth] = bcadd($saleMoney[$thisMonth] ?? '0', $v['total_price'], 2);
            $totalMoney = bcadd($totalMoney, $v['total_price'], 2);
-//                $buyMoney[$thisMonth] = bcadd($buyMoney[$thisMonth]?? '0', $v['total_buy_price'], 3);

            // 药品
            if (!isset($drugSaleMoney[$v['drug_type']])) {
@@ -710,16 +705,13 @@ class FinanceController extends BaseAdminController
        }
        foreach ($dateArr as $v) {
            if (!isset($saleMoney[$v])) $saleMoney[$v] = '0.00';
-//                if (!isset($buyMoney[$v]))  $buyMoney[$v] = '0.00';
        }


        return [
            'sale_money' => $this->getArrValues($saleMoney),
-//            'buy_money' => $this->getArrValues($buyMoney),
            'total_money' => $totalMoney,
            'line_legend' => ['销售金额'],
-            // 药品类型统计
            'drug_data' => $this->getArrValues($drugSaleMoney),
        ];
    }
--- a/admin/controllers/base/HomeController.php
+++ b/admin/controllers/base/HomeController.php
@@ -33,17 +33,19 @@ class HomeController extends BaseAdminController
     */
    public function actionHomeCount()
    {
-        $storeCount = Store::find()->where(['is_delete' => 0]);
-        $userCount = User::find();
-        $orderCount = ProductOrder::find()->where(['is_pay' => 1]);
-        $totalPrice = Reconciliation::find()->where(['status' => 1]);
-        $drugCount = Drug::find();
-        $inventoryWarning = DrugStoreDrug::find()->where(['<', 'stock', 100]);
-        $inventoryWarningByStore = DrugStoreRelations::find()->where(['<', 'stock', 100]);
+        $get = \Yii::$app->request->get();
+        $whereTime = $this->getWhereTime($get['start_time'], $get['end_time']);
+        $storeCount = Store::find()->where(['is_delete' => 0])->andWhere($whereTime);
+        $userCount = \common\models\User::find()->where($whereTime);
+        $orderCount = ProductOrder::find()->where(['is_pay' => 1])->andWhere($whereTime);
+        $totalPrice = Reconciliation::find()->where(['status' => 1])->andWhere($whereTime);
+        $drugCount = Drug::find()->where($whereTime);
+        $inventoryWarning = DrugStoreDrug::find()->where(['<', 'stock', 100])->andWhere($whereTime);
+        $inventoryWarningByStore = DrugStoreRelations::find()->where(['<', 'stock', 100])->andWhere($whereTime);
        // 处方订单
-        $prescriptionCount = Prescription::find()->where(['status' => 1]);
+        $prescriptionCount = Prescription::find()->where(['status' => 1])->andWhere($whereTime);
        // 挂号人数
-        $registerCount = Register::find()->where(['in', 'status', [2,3]]);
+        $registerCount = Register::find()->where(['in', 'status', [2,3]])->andWhere($whereTime);
        return [
            'store' => intval($storeCount->count()),
            'user' => intval($userCount->count()),
@@ -66,6 +68,8 @@ class HomeController extends BaseAdminController
     */
    public function actionHomeCountByStore()
    {
+        $get = \Yii::$app->request->get();
+        $whereTime = $this->getWhereTime($get['start_time'], $get['end_time']);
        $admin = \Yii::$app->user->identity;
        $orderCount = ProductOrder::find()->where(['is_pay' => 1]);
        $totalPrice = Reconciliation::find()->where(['status' => 1]);
@@ -105,12 +109,12 @@ class HomeController extends BaseAdminController
                break;
        }
        if (!empty($where)) {
-            $orderCount->andWhere($where);
-            $totalPrice->andWhere($where);
-            $inventoryWarning->andWhere($where);
-            $drug->where($where);
-            $registerCount->andWhere($where);
-            $prescriptionCount->andWhere($where);
+            $orderCount->andWhere($where)->andWhere($whereTime);
+            $totalPrice->andWhere($where)->andWhere($whereTime);
+            $inventoryWarning->andWhere($where)->andWhere($whereTime);
+            $drug->where($where)->andWhere($whereTime);
+            $registerCount->andWhere($where)->andWhere($whereTime);
+            $prescriptionCount->andWhere($where)->andWhere($whereTime);
        }
        $totalPriceArr = 0;
        $totalPriceSum = $totalPrice->select(['total_price'])->asArray()->all();
@@ -129,6 +133,24 @@ class HomeController extends BaseAdminController
        ];
    }

+    /**
+     * 获取时间筛选条件
+     * @param $startTime
+     * @param $endTime
+     * @return array
+     */
+    public function getWhereTime($startTime, $endTime, $field = 'created_at')
+    {
+        if (!empty($startTime) && !empty($endTime)) {
+            $where = ['between', $field, strtotime(date('Y-m-d 00:00:00', strtotime($startTime))), strtotime(date('Y-m-d 23:59:59', strtotime($endTime)))];
+        } else {
+            $time = time();
+            $where = ['between', $field, $time - 86400 * 7, $time];
+        }
+        return $where;
+
+    }
+
    /**
     * 获取销售量Top10的药品
     * @return array|ActiveRecord[]
@@ -136,11 +158,15 @@ class HomeController extends BaseAdminController
     */
    public function actionTopDrugs()
    {
+        $get = \Yii::$app->request->get();
+        $whereTime = $this->getWhereTime($get['start_time'], $get['end_time'], 'rec.created_at');
        // 通过yii_reconciliation表统计出前10的药品
        $query = Reconciliation::find()
+            ->alias('rec')
            ->with(['drug' => function ($query) {
                $query->select(['id', 'drug_name', 'drug_number', 'type', 'image']);
            }])
+            ->where($whereTime)
            ->select(['drug_id', 'sum(number) as number', 'sum(total_price) as total_price'])
            ->groupBy('drug_id')
            ->orderBy(['total_price' => SORT_DESC])
@@ -234,6 +260,7 @@ class HomeController extends BaseAdminController
     */
    public function storeLowStock()
    {
+        return [];
        $selectStore = $this->request->get('store_id');
        $query = DrugStoreRelations::find()
            ->with(['drug' => function ($query) {
@@ -294,11 +321,14 @@ class HomeController extends BaseAdminController
     */
    public function actionTopStore()
    {
+        $get = \Yii::$app->request->get();
+        $whereTime = $this->getWhereTime($get['start_time'], $get['end_time']);
        return CashAccount::find()
            ->with(['store' => function ($query) {
                $query->select(['id', 'name']);
            }])
            ->where(['user_type' => 1])
+            ->andWhere($whereTime)
            ->select(['user_id', 'total_cash'])
            ->orderBy(['total_cash' => SORT_DESC])
            ->limit(5)
@@ -323,7 +353,7 @@ class HomeController extends BaseAdminController
                },
            ])
            ->where(['between', 'por.created_at', strtotime('-7 day'), time()])
-            ->andWhere(['status' => 0])
+            ->andWhere(['por.status' => 0])
 //            ->where(['por.status' => 0])
            ->orderBy(['id' => SORT_DESC])
            ->asArray();