发奖,增加新字段

common/helpers/bonus/BonusCalc.php

@@ -1028,15 +1028,12 @@ class BonusCalc extends BaseObject {
                 $isActive = $this->_isMonthPerfLimit($userId);
                 if (!$isActive) continue;
                 $surplus = $storeBonus;
-                $manageTax = $reConsumePoints = '0.000';
                 //扣除相应的复消积分和管理费
                 $deductData = $this->deduct($userId, $storeBonus);
-                // 把对碰后的奖金存入缓存中
                 CalcCache::bonus($userId, $this->_periodNum, 'BONUS_STORE', $storeBonus, $deductData);
                 $surplus = $deductData['surplus'];
                 $manageTax = $deductData['manageTax'];
                 $reConsumePoints = $deductData['reConsumePoints'];
-                
 
                 //店服务奖流水
                 $insertBonusData[] = [

common/helpers/bonus/BonusSend.php

@@ -320,6 +320,7 @@ class BonusSend extends BaseObject {
                             'GX' => $data['REAL_BONUS_GX'],
                             'GL' => $data['BONUS_GL'],
                             'BS' => $data['BONUS_BS'],
+                            'ST' => $data['BONUS_ST'],
 
                             'ORI_QY' => $data['ORI_BONUS_QY'],
                             'ORI_YC' => $data['ORI_BONUS_YC'],
@@ -331,6 +332,7 @@ class BonusSend extends BaseObject {
                             'ORI_GX' => $data['ORI_BONUS_GX'],
                             'ORI_GL' => $data['ORI_BONUS_GL'],
                             'ORI_BS' => $data['ORI_BONUS_BS'],
+                            'ORI_ST' => $data['ORI_BONUS_ST'],
 
                             //'RECONSUME_POINTS_TOTAL' => $data['RECONSUME_POINTS'], 2022/05/17 复消积分,直接发放到余额账户
                             'RECONSUME_POINTS_TOTAL' => $data['RECONSUME_POINTS'],

common/helpers/user/Balance.php

@@ -276,6 +276,9 @@ class Balance {
                     $paramData['BS_TOTAL'] = new Expression('BS_TOTAL + '.$params['BS']);
                     //$oneUserBonusModel->GL_TOTAL += $params['GL'];
                 }
+                if (isset($params['ST'])) {
+                    $paramData['STORE_TOTAL'] = new Expression('STORE_TOTAL + '.$params['ST']);
+                }
                 if (isset($params['RECONSUME_POINTS_TOTAL'])) {
                     $paramData['RECONSUME_POINTS_TOTAL'] = new Expression('RECONSUME_POINTS_TOTAL + '.$params['RECONSUME_POINTS_TOTAL']);
                     //$oneUserBonusModel->RECONSUME_POINTS_TOTAL += $params['RECONSUME_POINTS_TOTAL'];
@@ -329,6 +332,9 @@ class Balance {
                     $paramData['ORI_BS_TOTAL'] = new Expression('ORI_BS_TOTAL + '.$params['ORI_BS']);
                     //$oneUserBonusModel->ORI_GL_TOTAL += $params['ORI_GL'];
                 }
+                if (isset($params['ORI_ST'])) {
+                    $paramData['ORI_STORE_TOTAL'] = new Expression('ORI_STORE_TOTAL + '.$params['ORI_ST']);
+                }
 
                 if (isset($params['BONUS_TOTAL'])) {
                     $paramData['BONUS_TOTAL'] = new Expression('BONUS_TOTAL + '.$params['BONUS_TOTAL']);

common/models/UserBonus.php

@@ -15,6 +15,8 @@ use common\libs\logging\operate\valueType\Config as ValueTypeConfig;
  * @property string $BONUS_FREEZE 奖金冻结部分
  * @property string $CF 车房养老奖
  * @property string $LX 领袖分红奖
+ * @property string $STORE_TOTAL 店服务奖累计
+ * @property string $ORI_STORE_TOTAL 店服务奖原奖金累计
  * @property string $QY_TOTAL 区域津贴累计
  * @property string $YC_TOTAL 育成津贴累计
  * @property string $VIP_TOTAL VIP奖金累计
@@ -87,6 +89,7 @@ class UserBonus extends \common\components\ActiveRecord
             'BONUS_FREEZE' => '奖金冻结部分',
             'CF' => '车房养老奖',
             'LX' => '领袖分红奖',
+            'STORE_TOTAL' => '店服务奖累计',
             'QY_TOTAL' => '区域津贴累计',
             'YC_TOTAL' => '育成津贴累计',
             'VIP_TOTAL' => 'VIP奖金累计',
@@ -107,6 +110,7 @@ class UserBonus extends \common\components\ActiveRecord
             'YJ_TOTAL'=> '业绩奖累计',
             'GX_TOTAL'=> '共享奖累计',
             'GL_TOTAL'=> '管理奖累计',
+            'ORI_STORE_TOTAL' => '店服务奖原奖金累计',
             'ORI_QY_TOTAL' => '团队奖原奖金累计',
             'ORI_YC_TOTAL' => '荣衔奖原奖金累计',
             'ORI_VIP_TOTAL' => 'VIP奖原奖金累计',