root пре 3 година
родитељ
комит
56e5cd9996
2 измењених фајлова са 6 додато и 21 уклоњено
  1. 0 1
      common/helpers/bonus/CalcServePerfCalc.php
  2. 6 20
      common/models/UserPerf.php

+ 0 - 1
common/helpers/bonus/CalcServePerfCalc.php

@@ -299,7 +299,6 @@ class CalcServePerfCalc {
         PerfPeriod::pageDeleteAll('PERIOD_NUM='.$this->_periodNum);// 周业绩
         if ($this->_isCalcMonth) {
             PerfMonth::pageDeleteAll("CALC_MONTH='{$this->_calcYearMonth}'");// 月业绩表
-            PerfPeriod::pageDeleteAll('CALC_MONTH='.$this->_calcYearMonth);// 其他期的周业绩也要删除
         }
     }
 

+ 6 - 20
common/models/UserPerf.php

@@ -37,11 +37,6 @@ use Yii;
  * @property string $SURPLUS_5L 五市场结余业绩
  * @property string $SURPLUS_5L_ZC 五市场首购结余业绩
  * @property string $SURPLUS_5L_FX 五市场复消结余业绩
- * @property string $VIP_SURPLUS_1L_ZC VIP一市场剩余报单业绩
- * @property string $VIP_SURPLUS_2L_ZC VIP二市场剩余报单业绩
- * @property string $VIP_SURPLUS_3L_ZC VIP三市场剩余报单业绩
- * @property string $VIP_SURPLUS_4L_ZC VIP四市场剩余报单业绩
- * @property string $VIP_SURPLUS_5L_ZC VIP五市场剩余报单业绩
  * @property string $PV_PSS_TOTAL 推荐团队累计业绩
  */
 class UserPerf extends \common\components\ActiveRecord
@@ -61,7 +56,7 @@ class UserPerf extends \common\components\ActiveRecord
     {
         return [
             [['USER_ID', 'CREATED_AT'], 'required'],
-            [['PV_PCS_ZC', 'PV_PCS_YH', 'PV_PCS_ZG', 'PV_PCS_LS', 'PV_PCS_FX', 'PV_1L', 'PV_2L', 'PV_3L', 'PV_4L', 'PV_5L', 'PV_PSS', 'SURPLUS_1L', 'SURPLUS_1L_ZC', 'SURPLUS_1L_FX', 'SURPLUS_2L', 'SURPLUS_2L_ZC', 'SURPLUS_2L_FX', 'SURPLUS_3L', 'SURPLUS_3L_ZC', 'SURPLUS_3L_FX', 'SURPLUS_4L', 'SURPLUS_4L_ZC', 'SURPLUS_4L_FX', 'SURPLUS_5L', 'SURPLUS_5L_ZC', 'SURPLUS_5L_FX', 'VIP_SURPLUS_1L_ZC', 'VIP_SURPLUS_2L_ZC', 'VIP_SURPLUS_3L_ZC', 'VIP_SURPLUS_4L_ZC', 'VIP_SURPLUS_5L_ZC', 'PV_PSS_TOTAL'], 'number'],
+            [['PV_PCS_ZC', 'PV_PCS_FX', 'PV_1L', 'PV_2L', 'PV_3L', 'PV_4L', 'PV_5L', 'PV_PSS', 'SURPLUS_1L', 'SURPLUS_1L_ZC', 'SURPLUS_1L_FX', 'SURPLUS_2L', 'SURPLUS_2L_ZC', 'SURPLUS_2L_FX', 'SURPLUS_3L', 'SURPLUS_3L_ZC', 'SURPLUS_3L_FX', 'SURPLUS_4L', 'SURPLUS_4L_ZC', 'SURPLUS_4L_FX', 'SURPLUS_5L', 'SURPLUS_5L_ZC', 'SURPLUS_5L_FX', 'PV_PSS_TOTAL'], 'number'],
             [['CREATED_AT'], 'integer'],
             [['USER_ID', 'ID'], 'string', 'max' => 32],
             [['USER_ID'], 'unique'],
@@ -77,9 +72,6 @@ class UserPerf extends \common\components\ActiveRecord
             'ID' => 'ID',
             'USER_ID' => '会员ID',
             'PV_PCS_ZC' => '个人注册单累计',
-            'PV_PCS_YH' => '个人优惠单累计',
-            'PV_PCS_ZG' => '个人增购单累计',
-            'PV_PCS_LS' => '个人零售单累计',
             'PV_PCS_FX' => '个人复销单累计',
             'PV_1L' => '一市场累计业绩',
             'PV_2L' => '二市场累计业绩',
@@ -103,11 +95,6 @@ class UserPerf extends \common\components\ActiveRecord
             'SURPLUS_5L' => '五市场结余业绩',
             'SURPLUS_5L_ZC' => '五市场首购结余业绩',
             'SURPLUS_5L_FX' => '五市场复消结余业绩',
-            'VIP_SURPLUS_1L_ZC' => 'VIP一市场剩余报单业绩',
-            'VIP_SURPLUS_2L_ZC' => 'VIP二市场剩余报单业绩',
-            'VIP_SURPLUS_3L_ZC' => 'VIP三市场剩余报单业绩',
-            'VIP_SURPLUS_4L_ZC' => 'VIP四市场剩余报单业绩',
-            'VIP_SURPLUS_5L_ZC' => 'VIP五市场剩余报单业绩',
             'PV_PSS_TOTAL' => '推荐团队累计业绩',
         ];
     }
@@ -120,7 +107,11 @@ class UserPerf extends \common\components\ActiveRecord
      * @return array|null|\yii\db\ActiveRecord
      */
     public static function getOneUserPerf($userId, $db = 'db', $isSlaves = false){
-        $data = static::find($isSlaves, $db)->select('USER_ID,PV_PCS_ZC,PV_PCS_FX,PV_PSS,PV_1L,PV_2L,PV_3L,PV_4L,PV_5L,SURPLUS_1L,SURPLUS_2L,SURPLUS_3L,SURPLUS_4L,SURPLUS_5L,SURPLUS_1L_ZC,SURPLUS_2L_ZC,SURPLUS_3L_ZC,SURPLUS_4L_ZC,SURPLUS_5L_ZC,SURPLUS_1L_FX,SURPLUS_2L_FX,SURPLUS_3L_FX,SURPLUS_4L_FX,SURPLUS_5L_FX,VIP_SURPLUS_1L_ZC,VIP_SURPLUS_2L_ZC,VIP_SURPLUS_3L_ZC,VIP_SURPLUS_4L_ZC,VIP_SURPLUS_5L_ZC,PV_PSS_TOTAL')->where('USER_ID=:USER_ID', [':USER_ID'=>$userId])->asArray()->one();
+        $data = static::find($isSlaves, $db)
+        ->select('USER_ID,PV_PCS_ZC,PV_PCS_FX,PV_PSS,PV_1L,PV_2L,PV_3L,PV_4L,PV_5L,SURPLUS_1L,SURPLUS_2L,SURPLUS_3L,SURPLUS_4L,SURPLUS_5L,SURPLUS_1L_ZC,SURPLUS_2L_ZC,SURPLUS_3L_ZC,SURPLUS_4L_ZC,SURPLUS_5L_ZC,SURPLUS_1L_FX,SURPLUS_2L_FX,SURPLUS_3L_FX,SURPLUS_4L_FX,SURPLUS_5L_FX,PV_PSS_TOTAL')
+        ->where('USER_ID=:USER_ID', [':USER_ID'=>$userId])
+        ->asArray()
+        ->one();
         if(!$data){
             $data = [
                 'USER_ID' => $userId,
@@ -147,11 +138,6 @@ class UserPerf extends \common\components\ActiveRecord
                 'SURPLUS_3L_FX' => 0,
                 'SURPLUS_4L_FX' => 0,
                 'SURPLUS_5L_FX' => 0,
-                'VIP_SURPLUS_1L_ZC' => 0,
-                'VIP_SURPLUS_2L_ZC' => 0,
-                'VIP_SURPLUS_3L_ZC' => 0,
-                'VIP_SURPLUS_4L_ZC' => 0,
-                'VIP_SURPLUS_5L_ZC' => 0,
                 'PV_PSS_TOTAL' => 0,
             ];
         }