root 3 лет назад
Родитель
Сommit
7228fd4da5
2 измененных файлов с 33 добавлено и 11 удалено
  1. 33 0
      ALTER TABLE AR_CALC_BONUS_BS CHANGE COLU.sql
  2. 0 11
      common/helpers/bonus/BonusCalc.php

+ 33 - 0
ALTER TABLE AR_CALC_BONUS_BS CHANGE COLU.sql

@@ -18,3 +18,36 @@ ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_YJ  ORI_BONUS_ABBR decimal(
 ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_YJSF  BONUS_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖,实发奖金";
 ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_GL  ORI_BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖,原奖金";
 ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_GLSF  BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖,实发奖金";
+
+
+
+
+
+存储过程需改: 
+CALCKEEP 
+    32到39行修改 为: 
+        ORI_BONUS_ABBR,
+        MANAGE_TAX_ABBR,
+        AMOUNT_ABBR,
+        ABBR_RECONSUME_POINTS,
+        ORI_BONUS_MNT,
+        MANAGE_TAX_MNT,
+        AMOUNT_MNT,
+        MNT_RECONSUME_POINTS
+    110到115行 修改为: 
+        ORI_BONUS_ABBR,
+
+        AMOUNT_ABBR,
+        ORI_BONUS_MNT,
+
+        AMOUNT_MNT
+
+CALCSTAT
+    31到34行修改
+        BONUS_ABBR,
+		BONUS_ABBR_PERCENT,
+		BONUS_MNT,
+		BONUS_MNT_PERCENT
+    82到83行修改
+        BONUS_ABBR_PERCENT = BONUS_ABBR / TOTAL_PV,
+	    BONUS_MNT_PERCENT = BONUS_MNT /TOTAL_PV

+ 0 - 11
common/helpers/bonus/BonusCalc.php

@@ -1652,7 +1652,6 @@ class BonusCalc extends BaseObject {
             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) {
                     //扣除相应的复消积分和管理费
@@ -1703,12 +1702,6 @@ 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) {
                     //扣除相应的复消积分和管理费
@@ -3220,10 +3213,6 @@ class BonusCalc extends BaseObject {
     public function loopBonusUsers($offset = 0) {
         echo sprintf("时间:[%s]缓存奖金数据入库,当前offset为:【%s】" . PHP_EOL, date('Y-m-d H:i:s', time()) , $offset);
         // 从缓存列表里面从底层往上倒序获取会员
-
-        // 这里有问题,因为蓝星奖,是存储过程计算的,并没有加入缓存,这里需要修改.
-        // 给用户发送兑换积分,也需要进行调整查看。
-        // CalcCache::addHasBonusUsers($everyData['USER_ID'], $this->_periodNum);
         $allData = CalcCache::getHasBonusUsers($this->_periodNum, $offset, $this->_limit);
 
         if($allData){