拆分完毕

backendApi/modules/v1/controllers/BonusController.php

@@ -1024,6 +1024,7 @@ class BonusController extends BaseController {
             'BONUS_QY_MONTH' => 'CB.BONUS_QY_MONTH',
 
 
+
         ]);
         $period = Period::instance();
         $yearMonth = $period->getYearMonth($periodNum);

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

@@ -335,30 +335,104 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_BONUS_QY_BD',
                     ],
                 ],
-                'BONUS_BS' => [
-                    'header' => '蓝星管理奖',
+                'ORI_BONUS_BU_YJ' => [
+                    'header' => '蓝星业绩奖(原奖金)',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_BS'],
+                            'value' => $row['ORI_BONUS_BU_YJ'],
                         ]))->result();
                     },
                     'headerOther' => [
-                        'width' => '120',
-                        'prop'=>'BONUS_BS',
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_YJ',
                     ],
                 ],
-                'ORI_BONUS_BS' => [
-                    'header' => '蓝星管理奖原金额',
+                'ORI_BONUS_BU_YJKC' => [
+                    'header' => '蓝星业绩奖(管理费)',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BS'],
+                            'value' => $row['ORI_BONUS_BU_YJKC'],
                         ]))->result();
                     },
                     'headerOther' => [
-                        'width' => '120',
-                        'prop'=>'ORI_BONUS_BS',
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_YJKC',
+                    ],
+                ],
+                'ORI_BONUS_BU_YJSF' => [
+                    'header' => '蓝星业绩奖(实发)',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BU_YJSF'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_YJSF',
+                    ],
+                ],
+
+                'ORI_BONUS_BU_GL' => [
+                    'header' => '蓝星管理奖(原奖金)',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BU_GL'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_GL',
+                    ],
+                ],
+                'ORI_BONUS_BU_GLKC' => [
+                    'header' => '蓝星管理奖(管理费)',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BU_GLKC'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_GLKC',
+                    ],
+                ],
+                'ORI_BONUS_BU_GLSF' => [
+                    'header' => '蓝星管理奖(实发)',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BU_GLSF'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '150',
+                        'prop'=>'ORI_BONUS_BU_GLSF',
                     ],
                 ],
+
+//                'BONUS_BS' => [
+//                    'header' => '蓝星管理奖',
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['BONUS_BS'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '120',
+//                        'prop'=>'BONUS_BS',
+//                    ],
+//                ],
+//                'ORI_BONUS_BS' => [
+//                    'header' => '蓝星管理奖原金额',
+//                    'value' => function($row) {
+//                        return (new Price([
+//                            'value' => $row['ORI_BONUS_BS'],
+//                        ]))->result();
+//                    },
+//                    'headerOther' => [
+//                        'width' => '120',
+//                        'prop'=>'ORI_BONUS_BS',
+//                    ],
+//                ],
                 // 'REAL_BONUS_BS' => [
                 //     'header' => '实发蓝星管理奖',
                 //     'value' => function($row) {

common/helpers/bonus/BonusCalc.php

@@ -278,7 +278,6 @@ class BonusCalc extends BaseObject {
 
             // 蓝星奖入库,实际上是插入有奖金会员数据缓存中.
             // 调用存储过程,计算蓝星管理奖金
-            echo '蓝星修改的方法-------------';
             $this->calcBsProcedure();
             // 将有蓝星管理奖金的用户加入到有奖金缓存用户中
 
@@ -1645,6 +1644,8 @@ class BonusCalc extends BaseObject {
                 $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                 $manageTax = $deductData['manageTax']; // 管理费
                 $point = $deductData['reConsumePoints'];// 复消积分
+                //管理奖管理费存入缓存
+                CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GLKC', $manageTax);
                 // 更新蓝星奖金存储过程的实发金额数据
                 CalcBonusBS::updateAll(['ORI_BONUS_BU_GLSF' => $realBonusBs, 'ORI_BONUS_BU_GLKC' => $manageTax, 'RECONSUME_POINTS' => $point],
                 'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', 
@@ -1688,6 +1689,7 @@ class BonusCalc extends BaseObject {
                 $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                 $manageTax = $deductData['manageTax']; // 管理费
                 $point = $deductData['reConsumePoints'];// 复消积分
+                CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJKC', $manageTax);
                 // 更新蓝星奖金存储过程的实发金额数据
                 CalcBonusBS::updateAll(['ORI_BONUS_BU_YJSF' => $realBonusBs, 'ORI_BONUS_BU_YJKC' => $manageTax, 'RECONSUME_POINTS' => $point],
                     'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',
@@ -3288,8 +3290,7 @@ class BonusCalc extends BaseObject {
         $buleStartManageTax = 0;
         $exchangePoints = 0; // 蓝星奖管理奖. 产生的兑换积分
 
-        $buleManageTaxGL = 0; //拆分后蓝星管理奖，管理费
-        $buleManageTaxYJ = 0; //拆分后蓝星业绩奖，管理费
+
 
         if( $this->_isCalcMonth ) {
             // 查看是否复消300
@@ -3339,10 +3340,6 @@ 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; // 管理费
 
-                $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()
                 ->select('SUM(BONUS_GX) AS BONUS_GX_SUM, SUM(BONUS_GL) AS BONUS_GL_SUM')
                 ->where('USER_ID=:USER_ID AND CALC_MONTH=:CALC_MONTH', 
@@ -3470,10 +3467,11 @@ class BonusCalc extends BaseObject {
 
             'ORI_BONUS_BU_GL' => $bonus['ORI_BONUS_BU_GL'],
             'ORI_BONUS_BU_GLSF' => $bonus['BONUS_BU_GL'],
-            'ORI_BONUS_BU_GLKC' => $buleManageTaxGL,
+            'ORI_BONUS_BU_GLKC' =>$bonus['BONUS_BU_GLKC'],
+
             'ORI_BONUS_BU_YJ' => $bonus['ORI_BONUS_BU_YJ'],
             'ORI_BONUS_BU_YJSF' => $bonus['BONUS_BU_YJ'],
-            'ORI_BONUS_BU_YJKC' => $buleManageTaxYJ,
+            'ORI_BONUS_BU_YJKC' =>$bonus['BONUS_BU_YJKC'],
 
             //以下没有用
             'BONUS_FW' => 0,

common/helpers/bonus/CalcCache.php

@@ -1435,6 +1435,9 @@ class CalcCache {
             'BONUS_BU_YJ'=>0,  // 蓝星业绩奖实发
             'ORI_BONUS_BU_GL'=>0, //蓝星管理奖原奖金
             'ORI_BONUS_BU_YJ'=>0, //蓝星业绩奖原奖金
+            'BONUS_BU_GLKC'=>0, //蓝星管理奖，管理费
+            'BONUS_BU_YJKC'=>0, //蓝星业绩奖，管理费
+
 
             'BONUS_YC_EXTRA' => 0,
             'ORI_BONUS_BD' => 0,

frontendEle/config/index.js:Zone.Identifier

@@ -1,4 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=https://teams.microsoft.com/_
-HostUrl=https://ek2021-my.sharepoint.com/personal/frank_ek2021_onmicrosoft_com/_layouts/15/download.aspx?UniqueId=b3ea5293-b73c-4849-84db-78d78e6e80a5&Translate=false&tempauth=eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJhdWQiOiIwMDAwMDAwMy0wMDAwLTBmZjEtY2UwMC0wMDAwMDAwMDAwMDAvZWsyMDIxLW15LnNoYXJlcG9pbnQuY29tQDEyYWQwYzUyLTY1NTQtNDIzNy05NWU4LTFkYzdlYjAzZjAxYSIsImlzcyI6IjAwMDAwMDAzLTAwMDAtMGZmMS1jZTAwLTAwMDAwMDAwMDAwMCIsIm5iZiI6IjE2NDU2NjM3MjgiLCJleHAiOiIxNjQ1NjY0MDI4IiwiZW5kcG9pbnR1cmwiOiI4aTJNR2ZaQnlnaFpoTURtNExyNXpCTlV2dDR6eGZCMFUrc3pETVJhYXE4PSIsImVuZHBvaW50dXJsTGVuZ3RoIjoiMTU4IiwiaXNsb29wYmFjayI6IlRydWUiLCJjaWQiOiJNRGhpTmpJellUQXRZekJoWmkwd01EQXdMV1UzWlRVdFkyUm1PR1ZqTWpNNVpHWXciLCJ2ZXIiOiJoYXNoZWRwcm9vZnRva2VuIiwic2l0ZWlkIjoiTkRjek4yRTJZak10TnpVd09TMDBaall5TFRrM05UTXROekZsTWpnMFkySXdZVFZoIiwiYXBwX2Rpc3BsYXluYW1lIjoiTWljcm9zb2Z0IFRlYW1zIiwiYXBwaWQiOiIxZmVjOGU3OC1iY2U0LTRhYWYtYWIxYi01NDUxY2MzODcyNjQiLCJ0aWQiOiIxMmFkMGM1Mi02NTU0LTQyMzctOTVlOC0xZGM3ZWIwM2YwMWEiLCJ1cG4iOiJ5b3JrQGVrMjAyMS5vbm1pY3Jvc29mdC5jb20iLCJwdWlkIjoiMTAwMzIwMDFEOEJDRjMzRCIsImNhY2hla2V5IjoiMGguZnxtZW1iZXJzaGlwfDEwMDMyMDAxZDhiY2YzM2RAbGl2ZS5jb20iLCJzY3AiOiJteWZpbGVzLndyaXRlIGFsbHNpdGVzLmZ1bGxjb250cm9sIGFsbHNpdGVzLm1hbmFnZSBhbGxwcm9maWxlcy53cml0ZSIsInR0IjoiMiIsInVzZVBlcnNpc3RlbnRDb29raWUiOm51bGwsImlwYWRkciI6IjQyLjgwLjIxNy4xNyJ9.aW5CY3VEYS9abk5WZ0dnMDJiMTNlTzQ0UW9nSU9rZnpLTEdLSm14NUtRWT0&ApiVersion=2.0