Merge branch 'dev' of ssh://16.162.42.175:8013/guanli/ngds into dev

common/components/SwooleAsyncTimer.php

@@ -71,9 +71,9 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 初始化备份历史奖金数据表
 //            TaskFunc::initAutoBakBalance();
             // 初始化自动发送钉钉推送消息
-//            if (YII_ENV == YII_ENV_PROD) {
+            if (YII_ENV == YII_ENV_PROD) {
 //                TaskFunc::initAutoSendDingTalk();
-//            }
+            }
         }
     }
 
@@ -236,4 +236,4 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 忽略错误
         }
     }
-}
+}

common/config/params.php

@@ -354,8 +354,7 @@ return [
     ],
     // 钉钉消息
     'DingTalk' => [
-//        'accessToken' => 'f6b61da1e4cef364298cbac4cad0af23f19a0b34a113ee4d39986d1f796c51b0',
-        'accessToken' => '39e7dc7860296bb47daf0bf4d06395c9a1ec19783f655a0aa2985b02780141d7',
+        'accessToken' => 'f6b61da1e4cef364298cbac4cad0af23f19a0b34a113ee4d39986d1f796c51b0',
         'atMobiles'   => [],
         'atUserIds'   => ['rob9muw'],
         'isAtAll'     => false,

common/helpers/DingTalk.php

@@ -38,7 +38,7 @@ class DingTalk
         ];
 
         // 正式环境才发送
-//        if (in_array($_SERVER['HTTP_HOST'], ['ng-frontend-api.elken.com', 'ng-backend-api.elken.com'])) {
+        if (in_array($_SERVER['HTTP_HOST'], ['ng-frontend-api.elken.com', 'ng-backend-api.elken.com'])) {
             $result = self::request_by_curl(json_encode($data));
             if ($result['errcode'] > 0) {
                 // 重新推送一次,如果失败,写错误日志
@@ -47,6 +47,6 @@ class DingTalk
                     LoggerTool::error([$result, $message]);
                 }
             }
-//        }
+        }
     }
 }

common/models/Order.php

@@ -154,6 +154,14 @@ 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;
+    }
 
     public function getRecName()
     {

console/controllers/ToolController.php

@@ -216,4 +216,4 @@ class ToolController extends BaseController
             curl_close($curl);
         }
     }
-}
+}

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;