蓝星拆分代码端完成

backendApi/modules/v1/controllers/ShopController.php

@@ -17,6 +17,7 @@ use backendApi\modules\v1\models\lists\shop\OrderList;
 use backendApi\modules\v1\models\lists\shop\OrderShopList;
 use backendApi\modules\v1\models\lists\shop\OrderStandardList;
 use backendApi\modules\v1\models\lists\shop\PackageList;
+use common\helpers\bonus\CalcCache;
 use common\helpers\Cache;
 use common\helpers\Date;
 use common\helpers\Form;
@@ -53,6 +54,7 @@ class ShopController extends BaseController {
      * @throws \yii\web\HttpException
      */
     public function actionIndex() {
+
         $filter = $this->filterCondition([
             'TYPE'=> 'TYPE',
             'GIFT_TYPE'=> 'GIFT_TYPE',

common/helpers/bonus/BonusCalc.php

@@ -1627,7 +1627,7 @@ class BonusCalc extends BaseObject {
         }
         // 从缓存获取分页有收入的会员信息
         $allData = CalcBonusBS::findUseDbCalc()
-            ->where('PERIOD_NUM=:PERIOD_NUM AND ORI_BONUS_BU_GL > 0', [':PERIOD_NUM' => $this->_periodNum])
+            ->where('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $this->_periodNum])
             ->groupBy('USER_ID')
             ->offset($offset)
             ->limit($this->_limit)
@@ -1670,7 +1670,7 @@ class BonusCalc extends BaseObject {
         }
         // 从缓存获取分页有收入的会员信息
         $allData = CalcBonusBS::findUseDbCalc()
-            ->where('PERIOD_NUM=:PERIOD_NUM AND ORI_BONUS_BU_YJ > 0', [':PERIOD_NUM' => $this->_periodNum])
+            ->where('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM' => $this->_periodNum])
             ->groupBy('USER_ID')
             ->offset($offset)
             ->limit($this->_limit)
@@ -1693,7 +1693,7 @@ class BonusCalc extends BaseObject {
                     'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',
                     [':USER_ID' => $user['USER_ID'], ':PERIOD_NUM' => $this->_periodNum]);
             }
-            return $this->calcBonusBsGL($offset + $this->_limit);
+            return $this->calcBonusBsYJ($offset + $this->_limit);
         }
         unset($allData);
         return true;
@@ -3064,18 +3064,23 @@ class BonusCalc extends BaseObject {
         }
 
         $allData = CalcMonthBonusUser::findUseDbCalc()->where('CALC_MONTH=:CALC_MONTH', [':CALC_MONTH' => $this->_calcYearMonth])->offset($offset)->limit($this->_limit)->asArray()->all();
+
         if ( $allData ) {
             foreach ($allData as $everyData) {
+
                 CalcCache::addHasBonusUsers($everyData['USER_ID'], $this->_periodNum);
 
                 unset($everyData);
+
             }
 
             unset($allData);
+
             $this->loopMonthBonusUserFromDbToCache($offset + $this->_limit);
         }
 
         unset($allData);
+
         return true;
     }
 
@@ -3283,11 +3288,8 @@ class BonusCalc extends BaseObject {
         $buleStartManageTax = 0;
         $exchangePoints = 0; // 蓝星奖管理奖. 产生的兑换积分
 
-        $realBonusBsMnt = 0; // 蓝星管理奖实发
-        $blueStartOriBonusMnt = 0;
-
-        $realBonusBsAbbr = 0; // 蓝星业绩奖实发
-        $blueStartOriBonusAbbr = 0;
+        $buleManageTaxGL = 0; //拆分后蓝星管理奖，管理费
+        $buleManageTaxYJ = 0; //拆分后蓝星业绩奖，管理费
 
         if( $this->_isCalcMonth ) {
             // 查看是否复消300
@@ -3337,10 +3339,8 @@ class BonusCalc extends BaseObject {
                 $buleStartOriBonus = isset($userBS['ORI_BONUS']) && !empty($userBS['ORI_BONUS']) ? $userBS['ORI_BONUS'] : 0; // 原奖金
                 // $buleStartManageTax = isset($userBS['MANAGE_TAX']) && !empty($userBS['MANAGE_TAX']) ? $userBS['MANAGE_TAX'] : 0; // 管理费
 
-                $realBonusBsMnt = $userBS['ORI_BONUS_BU_GLSF'] ?? 0;
-                $blueStartOriBonusMnt = $userBS['ORI_BONUS_BU_GL'] ?? 0;
-                $realBonusBsAbbr = $userBS['ORI_BONUS_BU_YJSF'] ?? 0;
-                $blueStartOriBonusAbbr = $userBS['ORI_BONUS_BU_YJ'] ?? 0;
+                $buleManageTaxYJ = isset($userBS['ORI_BONUS_BU_YJKC']) && !empty($userBS['ORI_BONUS_BU_YJKC']) ? $userBS['ORI_BONUS_BU_YJKC'] : 0; //业绩奖 管理费
+                $buleManageTaxGL = isset($userBS['ORI_BONUS_BU_GLKC']) && !empty($userBS['ORI_BONUS_BU_GLKC']) ? $userBS['ORI_BONUS_BU_GLKC'] : 0; //管理奖 管理费
 
 
                 $monthSumData = CalcBonus::findUseSlaves()
@@ -3468,10 +3468,12 @@ class BonusCalc extends BaseObject {
             'ORI_BONUS_STANDARD' => $standardBonus,
 
 
-            'ORI_BONUS_BU_GL' => $bonus['BONUS_BU_GL'],
+            'ORI_BONUS_BU_GL' => $bonus['ORI_BONUS_BU_GL'],
             'ORI_BONUS_BU_GLSF' => $bonus['BONUS_BU_GL'],
-            'ORI_BONUS_BU_YJ' => $bonus['BONUS_BU_YJ'],
+            'ORI_BONUS_BU_GLKC' => $buleManageTaxGL,
+            'ORI_BONUS_BU_YJ' => $bonus['ORI_BONUS_BU_YJ'],
             'ORI_BONUS_BU_YJSF' => $bonus['BONUS_BU_YJ'],
+            'ORI_BONUS_BU_YJKC' => $buleManageTaxYJ,
 
             //以下没有用
             'BONUS_FW' => 0,

common/helpers/bonus/CalcCache.php

@@ -1431,10 +1431,10 @@ class CalcCache {
             'BONUS_VIP' => 0,
             'BONUS_BS' => 0,
 
-            'BONUS_BU_GL'=>0,
-            'BONUS_BU_YL'=>0,
-            'ORI_BONUS_BU_GL'=>0,
-            'ORI_BONUS_BU_YJ'=>0,
+            'BONUS_BU_GL'=>0,  //蓝星管理奖实发
+            'BONUS_BU_YJ'=>0,  // 蓝星业绩奖实发
+            'ORI_BONUS_BU_GL'=>0, //蓝星管理奖原奖金
+            'ORI_BONUS_BU_YJ'=>0, //蓝星业绩奖原奖金
 
             'BONUS_YC_EXTRA' => 0,
             'ORI_BONUS_BD' => 0,
@@ -1513,6 +1513,8 @@ class CalcCache {
             self::addHasBonusUsers($userId, $periodNum);
         }
         unset($userId, $periodNum, $bonusType, $oriBonus, $deductData, $cacheKey);
+//        echo json_encode($value);
+//        exit();
         return $value;
     }
 

common/models/CalcBonusBS.php

@@ -73,6 +73,12 @@ class CalcBonusBS extends \common\components\ActiveRecord
             'LOGS' => '日志',
             'ORI_BONUS' => '原奖金',
             'MANAGE_TAX' => '管理费',
+            'ORI_BONUS_BU_YJ'=>'蓝星业绩原奖金',
+            'ORI_BONUS_BU_YJKC'=>'蓝星业绩管理费',
+            'ORI_BONUS_BU_YJSF'=>'蓝星业绩实发',
+            'ORI_BONUS_BU_GL'=>'蓝星管理原奖金',
+            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
+            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发'
         ];
     }
 }

common/models/CalcBonusBsDetail.php

@@ -72,6 +72,12 @@ class CalcBonusBsDetail extends \common\components\ActiveRecord
             'BONUS90' => 'BONUS90',
             'BONUS100' => 'BONUS100',
             'BONUS110' => 'BONUS110',
+            'ORI_BONUS_BU_YJ'=>'蓝星业绩原奖金',
+            'ORI_BONUS_BU_YJKC'=>'蓝星业绩管理费',
+            'ORI_BONUS_BU_YJSF'=>'蓝星业绩实发',
+            'ORI_BONUS_BU_GL'=>'蓝星管理原奖金',
+            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
+            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发'
         ];
     }