Merge branch 'master' of ssh://16.162.42.175:8013/guanli/ngds

common/models/Order.php

@@ -154,4 +154,12 @@ class Order extends \common\components\ActiveRecord
         $orders = Order::find()->where("USER_ID = :USER_ID AND PERIOD_NUM IN ($periodsStr)", [':USER_ID' => $userId]);
         return $orders;
     }
+    /*
+     * 通过 期数和用户ID
+     * 查询当期订单
+     */
+    public static function fetchOrderCurrentPeriod($periodNum, $userId){
+        $orders = Order::find()->where("USER_ID = :USER_ID AND PERIOD_NUM = :PERIOD_NUM", [':USER_ID' => $userId,':PERIOD_NUM' => $periodNum]);
+        return $orders;
+    }
 }

frontendApi/modules/v1/controllers/DashboardController.php

@@ -99,8 +99,9 @@ class DashboardController extends BaseController
         $myRemainPv = RemainPv::findOne(['USER_ID'=>$baseInfo['ID']])->REMAIN_PV ?? 0;
         // 找到当月的所有订单，计算总PV及总REMAIN_PV
         $myOrders = Order::fetchOrderCurrentMonth($periodNum, $baseInfo['ID']);
+        $myCurrentOrders = Order::fetchOrderCurrentPeriod($periodNum, $baseInfo['ID']);
         $currentPv = $myOrders->SUM('PV');
-        $currentRemainPv = $myOrders->SUM('REMAIN_PV');
+        $currentRemainPv = $myCurrentOrders->SUM('REMAIN_PV');
 
         $totalRemainPv = $myRemainPv + $currentRemainPv;
         $remainMonth = $totalRemainPv / 30;