Merge branch 'bugfix/2035-remain-not-minus' into dev

common/helpers/bonus/BonusSend.php

@@ -281,17 +281,19 @@ class BonusSend extends BaseObject {
      *
      */
     private function _calcRemainPv(){
-        $orders = Order::find()->where('PERIOD_NUM=:PERIOD_NUM AND REMAIN_PV>0',[':PERIOD_NUM'=>$this->_periodNum])->asArray()->all();
+        $sysConfig = Cache::getSystemConfig();
+        $mesureUpCondition =  $sysConfig['monthPcsPvFxCondition']['VALUE']; // 月达标条件 NG默认30
+        $orders = Order::find()->where('PERIOD_NUM=:PERIOD_NUM AND REMAIN_PV>:MESURE_UP AND IS_DELETE=0',[':PERIOD_NUM'=>$this->_periodNum,':MESURE_UP'=>$mesureUpCondition])->asArray()->all();
         foreach($orders as $order){
             $oRemainPv = RemainPv::find()->where(['USER_ID' => $order['USER_ID']])->one();
-
+            $myRemainPv = $oRemainPv?$oRemainPv['REMAIN_PV']:0;
             $transactionRemain = \Yii::$app->db->beginTransaction();
             try{
                 $flowRemainPvModel = new FlowRemainPv();
                 $flowRemainPvModel->ID = $this->_generateSn();
                 $flowRemainPvModel->USER_ID = $order['USER_ID'];
                 $flowRemainPvModel->REMAIN_PV_FLOW = $order['REMAIN_PV'];
-                $flowRemainPvModel->REMAIN_PV_TOTAL = $oRemainPv['REMAIN_PV'] + $order['REMAIN_PV'];
+                $flowRemainPvModel->REMAIN_PV_TOTAL = $myRemainPv + $order['REMAIN_PV'];
                 $flowRemainPvModel->PERIOD_NUM = $this->_periodNum;
                 $flowRemainPvModel->UPDATED_AT = Date::nowTime();
                 $flowRemainPvModel->ORDER_SN = $order['SN'];

common/helpers/bonus/PerfCalc.php

@@ -190,7 +190,9 @@ class PerfCalc {
      */
     public static function _createFakeOrder($periodNum){
         echo('假假假'.$periodNum. PHP_EOL);
-        $userHaveRemain = RemainPv::findAllAsArray('REMAIN_PV >0');
+        $sysConfig = Cache::getSystemConfig();
+        $mesureUpCondition =  $sysConfig['monthPcsPvFxCondition']['VALUE']; // 月达标条件 NG默认30
+        $userHaveRemain = RemainPv::findAllAsArray('REMAIN_PV >:MESURE_UP',[':MESURE_UP'=>$mesureUpCondition]);
         $currentPeriod = Period::getInfoByPeriodNum($periodNum);
         $sysConfig = Cache::getSystemConfig();
         $mesureUpCondition =  $sysConfig['monthPcsPvFxCondition']['VALUE']; // 月达标条件 NG默认30