修改字段

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -349,16 +349,16 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_BONUS_ABBR',
                     ],
                 ],
-                'AMOUNT_ABBR' => [
+                'BONUS_ABBR' => [
                     'header' => '蓝星业绩奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['AMOUNT_ABBR'],
+                            'value' => $row['BONUS_ABBR'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'AMOUNT_ABBR',
+                        'prop'=>'BONUS_ABBR',
                     ],
                 ],
 
@@ -374,16 +374,16 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_BONUS_MNT',
                     ],
                 ],
-                'AMOUNT_MNT' => [
+                'BONUS_MNT' => [
                     'header' => '蓝星管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['AMOUNT_MNT'],
+                            'value' => $row['BONUS_MNT'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'AMOUNT_MNT',
+                        'prop'=>'BONUS_MNT',
                     ],
                 ],
 

common/helpers/bonus/BonusCalc.php

@@ -1714,15 +1714,13 @@ class BonusCalc extends BaseObject {
                     //扣除相应的复消积分和管理费
                     $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_MNT']);
                     // 把对碰后的奖金存入缓存中
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_MNT']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_MNT', $user['ORI_BONUS_MNT']);
                     $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                     $manageTax = $deductData['manageTax']; // 管理费
                     $point = $deductData['reConsumePoints'];// 复消积分
-                    //管理奖管理费存入缓存
-                //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GLKC', $manageTax);
                 } else {
                     // 如果未满足月消费,则不扣除管理费和复消积分了
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_MNT']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_MNT', $user['ORI_BONUS_MNT']);
                     $realBonusBs = $user['ORI_BONUS_MNT'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
@@ -1761,25 +1759,18 @@ class BonusCalc extends BaseObject {
             ->all();
         if ($allData) {
             foreach ($allData as $user) {
-                // 添加到有奖励信息的数据中
-                //CalcCache::addHasBonusUsers($user['USER_ID'], $this->_periodNum);
-                //CalcCache::addHasMonthBonusUsers($user['USER_ID'], $this->_periodNum);
-
-
                 $fxStatus = $this->_isMonthPerfLimit($user['USER_ID']);
                 if ($fxStatus) {
                     //扣除相应的复消积分和管理费
                     $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_ABBR']);
                     // 把对碰后的奖金存入缓存中
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_ABBR']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_ABBR', $user['ORI_BONUS_ABBR']);
                     $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                     $manageTax = $deductData['manageTax']; // 管理费
                     $point = $deductData['reConsumePoints'];// 复消积分
-                    //管理奖管理费存入缓存
-                    //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJKC', $manageTax);
                 } else {
                     // 如果未满足月消费,则不扣除管理费和复消积分了
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_ABBR']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_ABBR', $user['ORI_BONUS_ABBR']);
                     $realBonusBs = $user['ORI_BONUS_ABBR'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
@@ -3514,11 +3505,11 @@ class BonusCalc extends BaseObject {
             'ORI_BONUS_VIP' => $bonus['ORI_BONUS_VIP'],
             'ORI_BONUS_STANDARD' => $standardBonus,
 
-            'AMOUNT_MNT' => $blueBonusGLSF,
+            'BONUS_MNT' => $blueBonusGLSF,
             'ORI_BONUS_MNT' => $blueBonusGL,
 
             'ORI_BONUS_ABBR' => $blueBonusYJ,
-            'AMOUNT_ABBR' => $blueBonusYJSF,
+            'BONUS_ABBR' => $blueBonusYJSF,
 
             //以下没有用
             'BONUS_FW' => 0,

common/helpers/bonus/CalcCache.php

@@ -1435,12 +1435,12 @@ class CalcCache {
             'BONUS_VIP' => 0,
             'BONUS_BS' => 0,
 
-            'BONUS_BU_GL'=>0,  //蓝星管理奖实发
-            'BONUS_BU_YJ'=>0,  // 蓝星业绩奖实发
+            'BONUS_MNT'=>0,  //蓝星管理奖实发
+            'BONUS_ABBR'=>0,  // 蓝星业绩奖实发
             'ORI_BONUS_MNT'=>0, //蓝星管理奖原奖金
             'ORI_BONUS_ABBR'=>0, //蓝星业绩奖原奖金
-            'BONUS_BU_GLKC'=>0, //蓝星管理奖，管理费
-            'BONUS_BU_YJKC'=>0, //蓝星业绩奖，管理费
+            'MANAGE_TAX_MNT'=>0, //蓝星管理奖，管理费
+            'MANAGE_TAX_ABBR'=>0, //蓝星业绩奖，管理费
 
 
             'BONUS_YC_EXTRA' => 0,

common/models/CalcBonus.php

@@ -237,11 +237,10 @@ class CalcBonus extends \common\components\ActiveRecord
 
             'ORI_BONUS_MNT'=>'蓝星管理奖原奖金',
             'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
-            'AMOUNT_MNT'=>'蓝星管理奖实发',
-            'ORI_BONUS_BU_YJ'=>'蓝星业绩奖原奖金',
-            'ORI_BONUS_BU_YJKC'=>'蓝星业绩奖管理费',
-            'ORI_BONUS_BU_YJSF'=>'蓝星业绩奖实发'
-
+            'BONUS_MNT'=>'蓝星管理奖实发',
+            'ORI_BONUS_ABBR'=>'蓝星业绩奖原奖金',
+            'MANAGE_TAX_ABBR'=>'蓝星业绩奖管理费',
+            'BONUS_ABBR'=>'蓝星业绩奖实发'
         ];
     }
 

common/models/CalcBonusBS.php

@@ -73,9 +73,9 @@ 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_ABBR'=>'蓝星业绩原奖金',
+            'MANAGE_TAX_ABBR'=>'蓝星业绩管理费',
+            'AMOUNT_ABBR'=>'蓝星业绩实发',
             'ORI_BONUS_MNT'=>'蓝星管理原奖金',
             'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
             'AMOUNT_MNT'=>'蓝星管理奖实发'

common/models/CalcBonusBsDetail.php

@@ -72,9 +72,9 @@ 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_ABBR'=>'蓝星业绩原奖金',
+            'MANAGE_TAX_ABBR'=>'蓝星业绩管理费',
+            'AMOUNT_ABBR'=>'蓝星业绩实发',
             'ORI_BONUS_MNT'=>'蓝星管理原奖金',
             'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
             'AMOUNT_MNT'=>'蓝星管理奖实发'