Merge branch 'feature/dd-1839-1172' into feature/dd-1935-lastemlv

backendApi/modules/v1/controllers/ShopController.php

@@ -140,9 +140,7 @@ class ShopController extends BaseController {
         $data = ShopGoods::findOneAsArray('ID=:ID', [':ID' => $id]);
         $data['SELL_TYPE'] = explode(',',$data['SELL_TYPE']);
         $data['GIFT_TYPE'] = explode(',',$data['GIFT_TYPE']);
-        if ($data['TYPE'] == 1 || $data['TYPE'] == 2) {
-            $data['SELL_DISCOUNT'] = ShopGoods::GOODS_TYPE[$data['TYPE']]['discount']/100;
-        }
+        
         return static::notice(['goodsInfo'=>$data,'sellType' => ShopGoods::SALE_TYPE, 'goodsType' => ShopGoods::GOODS_TYPE, 'giftType' => ShopGoods::GIFT_TYPE]);
     }
 

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

@@ -337,77 +337,53 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 ],
 
 
-                'ORI_BONUS_BU_YJ' => [
+                'ORI_BONUS_ABBR' => [
                     'header' => '蓝星业绩奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_YJ'],
+                            'value' => $row['ORI_BONUS_ABBR'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_YJ',
+                        'prop'=>'ORI_BONUS_ABBR',
                     ],
                 ],
-//                'ORI_BONUS_BU_YJKC' => [
-//                    'header' => '蓝星业绩奖(管理费)',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BU_YJKC'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '150',
-//                        'prop'=>'ORI_BONUS_BU_YJKC',
-//                    ],
-//                ],
-                'ORI_BONUS_BU_YJSF' => [
+                'BONUS_ABBR' => [
                     'header' => '蓝星业绩奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_YJSF'],
+                            'value' => $row['BONUS_ABBR'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_YJSF',
+                        'prop'=>'BONUS_ABBR',
                     ],
                 ],
 
-                'ORI_BONUS_BU_GL' => [
+                'ORI_BONUS_MNT' => [
                     'header' => '蓝星管理奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_GL'],
+                            'value' => $row['ORI_BONUS_MNT'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_GL',
+                        'prop'=>'ORI_BONUS_MNT',
                     ],
                 ],
-//                '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' => [
+                'BONUS_MNT' => [
                     'header' => '蓝星管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_GLSF'],
+                            'value' => $row['BONUS_MNT'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_GLSF',
+                        'prop'=>'BONUS_MNT',
                     ],
                 ],
 

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -57,15 +57,7 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 'SELL_DISCOUNT' => [
                     'header' => '商品折扣',
                     'value' => function($row) {
-                        $discount = 0;
-                        if ($row['TYPE'] == 1) {
-                            $discount = '0.5';
-                        } else if($row['TYPE'] == 2) {
-                            $discount = '0.6';
-                        } else {
-                            $discount = $row['SELL_DISCOUNT'];
-                        }
-
+                        $discount = $row['SELL_DISCOUNT'];
                         return $discount;
                     },
                     'headerOther' => ['width' => '150'],

common/helpers/bonus/BonusCalc.php

@@ -1824,7 +1824,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) {
                     //扣除相应的复消积分和管理费
@@ -1875,35 +1874,26 @@ 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_BU_GL']);
+                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_MNT']);
                     // 把对碰后的奖金存入缓存中
-                    //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_BU_GL'], $deductData);
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_BU_GL']);
+                    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_BU_GL']);
-                    $realBonusBs = $user['ORI_BONUS_BU_GL'];
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_MNT', $user['ORI_BONUS_MNT']);
+                    $realBonusBs = $user['ORI_BONUS_MNT'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
                 }
                 
 
                 // 更新蓝星奖金存储过程的实发金额数据
-                CalcBonusBS::updateAll(['ORI_BONUS_BU_GLSF' => $realBonusBs, 'ORI_BONUS_BU_GLKC' => $manageTax, 'ORI_BONUS_BU_GLFX' => $point],
+                CalcBonusBS::updateAll(['AMOUNT_MNT' => $realBonusBs, 'MANAGE_TAX_MNT' => $manageTax, 'MNT_RECONSUME_POINTS' => $point],
                 'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', 
                 [':USER_ID' => $user['USER_ID'], ':PERIOD_NUM' => $this->_periodNum]);
             }
@@ -1934,34 +1924,26 @@ 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_BU_YJ']);
+                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_ABBR']);
                     // 把对碰后的奖金存入缓存中
-                    //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_BU_YJ'], $deductData);
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_BU_YJ']);
+                    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_BU_YJ']);
-                    $realBonusBs = $user['ORI_BONUS_BU_YJ'];
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_ABBR', $user['ORI_BONUS_ABBR']);
+                    $realBonusBs = $user['ORI_BONUS_ABBR'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
                 }
 
 
                 // 更新蓝星奖金存储过程的实发金额数据
-                CalcBonusBS::updateAll(['ORI_BONUS_BU_YJSF' => $realBonusBs, 'ORI_BONUS_BU_YJKC' => $manageTax, 'ORI_BONUS_BU_YJFX' => $point],
+                CalcBonusBS::updateAll(['AMOUNT_ABBR' => $realBonusBs, 'MANAGE_TAX_ABBR' => $manageTax, 'ABBR_RECONSUME_POINTS' => $point],
                     'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',
                     [':USER_ID' => $user['USER_ID'], ':PERIOD_NUM' => $this->_periodNum]);
             }
@@ -3403,10 +3385,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){
@@ -3586,7 +3564,7 @@ class BonusCalc extends BaseObject {
                         ':USER_ID' => $userId
                     ]
                 )
-                ->select('AMOUNT,ORI_BONUS,MANAGE_TAX,LEVEL_ID,PRODUCT_POINT,ORI_BONUS_BU_YJ,ORI_BONUS_BU_YJSF,ORI_BONUS_BU_GL,ORI_BONUS_BU_GLSF')
+                ->select('AMOUNT,ORI_BONUS,MANAGE_TAX,LEVEL_ID,PRODUCT_POINT,ORI_BONUS_ABBR,AMOUNT_ABBR,ORI_BONUS_MNT,AMOUNT_MNT')
                 ->limit(1)
                 ->orderBy('CREATED_AT DESC')
                 ->asArray()
@@ -3595,11 +3573,11 @@ class BonusCalc extends BaseObject {
                 $blueStartAmount = isset($userBS['AMOUNT']) && !empty($userBS['AMOUNT']) ? $userBS['AMOUNT'] : 0; // 奖金
                 $buleStartOriBonus = isset($userBS['ORI_BONUS']) && !empty($userBS['ORI_BONUS']) ? $userBS['ORI_BONUS'] : 0; // 原奖金
 
-                $blueBonusGL = isset($userBS['ORI_BONUS_BU_GL']) && !empty($userBS['ORI_BONUS_BU_GL']) ? $userBS['ORI_BONUS_BU_GL'] : 0; // 拆分管理奖原奖金
-                $blueBonusYJ = isset($userBS['ORI_BONUS_BU_YJ']) && !empty($userBS['ORI_BONUS_BU_YJ']) ? $userBS['ORI_BONUS_BU_YJ'] : 0; // 拆分业绩奖原奖金
+                $blueBonusGL = isset($userBS['ORI_BONUS_MNT']) && !empty($userBS['ORI_BONUS_MNT']) ? $userBS['ORI_BONUS_MNT'] : 0; // 拆分管理奖原奖金
+                $blueBonusYJ = isset($userBS['ORI_BONUS_ABBR']) && !empty($userBS['ORI_BONUS_ABBR']) ? $userBS['ORI_BONUS_ABBR'] : 0; // 拆分业绩奖原奖金
 
-                $blueBonusGLSF = isset($userBS['ORI_BONUS_BU_GLSF']) && !empty($userBS['ORI_BONUS_BU_GLSF']) ? $userBS['ORI_BONUS_BU_GLSF'] : 0; // 拆分管理奖 实发
-                $blueBonusYJSF = isset($userBS['ORI_BONUS_BU_YJSF']) && !empty($userBS['ORI_BONUS_BU_YJSF']) ? $userBS['ORI_BONUS_BU_YJSF'] : 0; // 拆分业绩奖 实发
+                $blueBonusGLSF = isset($userBS['AMOUNT_MNT']) && !empty($userBS['AMOUNT_MNT']) ? $userBS['AMOUNT_MNT'] : 0; // 拆分管理奖 实发
+                $blueBonusYJSF = isset($userBS['AMOUNT_ABBR']) && !empty($userBS['AMOUNT_ABBR']) ? $userBS['AMOUNT_ABBR'] : 0; // 拆分业绩奖 实发
 
                 //$blueStartAmount = $blueBonusGLSF + $blueBonusYJSF; // 总实发，管理奖实发+业绩奖实发
                 #rm1820 共享奖金月节点合起来原奖金一起扣除管理费和复消积分
@@ -3641,8 +3619,8 @@ class BonusCalc extends BaseObject {
                 // 蓝星奖原奖金在扣管理费的时候被加入到了BONUS_TOTAL,需要再减去原奖金
                 $oriBonusBs = isset($bonus['ORI_BONUS_BS']) && $bonus['ORI_BONUS_BS'] > 0 ? $bonus['ORI_BONUS_BS'] : 0;
                 // 如果未满足,则复消积分,应该不能发放
-                $oriBonusBsYJCF = isset($bonus['ORI_BONUS_BU_YJ']) && $bonus['ORI_BONUS_BU_YJ'] > 0 ? $bonus['ORI_BONUS_BU_YJ'] : 0;
-                $oriBonusBsGLCF = isset($bonus['ORI_BONUS_BU_GL']) && $bonus['ORI_BONUS_BU_GL'] > 0 ? $bonus['ORI_BONUS_BU_GL'] : 0;
+                $oriBonusBsYJCF = isset($bonus['ORI_BONUS_ABBR']) && $bonus['ORI_BONUS_ABBR'] > 0 ? $bonus['ORI_BONUS_ABBR'] : 0;
+                $oriBonusBsGLCF = isset($bonus['ORI_BONUS_MNT']) && $bonus['ORI_BONUS_MNT'] > 0 ? $bonus['ORI_BONUS_MNT'] : 0;
                 $bonus['BONUS_TOTAL'] = $bonus['BONUS_TOTAL'] - $oriBonusBs - $oriBonusBsYJCF - $oriBonusBsGLCF;
             }
         }
@@ -3712,16 +3690,11 @@ class BonusCalc extends BaseObject {
             'BONUS_ST' => $bonus['BONUS_STORE'], // 店服务奖实发
             'ORI_BONUS_ST' => $bonus['ORI_BONUS_STORE'], // 店服务奖原奖金
 
+            'BONUS_MNT' => $blueBonusGLSF,
+            'ORI_BONUS_MNT' => $blueBonusGL,
 
-
-           // 'ORI_BONUS_BU_GLSF' => $bonus['BONUS_BU_GL'],
-            'ORI_BONUS_BU_GLSF' => $blueBonusGLSF,
-            'ORI_BONUS_BU_GL' => $blueBonusGL,
-
-
-            'ORI_BONUS_BU_YJ' => $blueBonusYJ,
-           // 'ORI_BONUS_BU_YJSF' => $bonus['BONUS_BU_YJ'],
-            'ORI_BONUS_BU_YJSF' => $blueBonusYJSF,
+            'ORI_BONUS_ABBR' => $blueBonusYJ,
+            'BONUS_ABBR' => $blueBonusYJSF,
 
             //以下没有用
             'BONUS_FW' => 0,

common/helpers/bonus/CalcCache.php

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

common/models/CalcBonus.php

@@ -235,13 +235,12 @@ class CalcBonus extends \common\components\ActiveRecord
             'BONUS_BS' => '蓝星奖',
             'ORI_BONUS_BS' => '蓝星原奖金',
 
-            'ORI_BONUS_BU_GL'=>'蓝星管理奖原奖金',
-            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
-            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发',
-            'ORI_BONUS_BU_YJ'=>'蓝星业绩奖原奖金',
-            'ORI_BONUS_BU_YJKC'=>'蓝星业绩奖管理费',
-            'ORI_BONUS_BU_YJSF'=>'蓝星业绩奖实发'
-
+            'ORI_BONUS_MNT'=>'蓝星管理奖原奖金',
+            'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
+            'BONUS_MNT'=>'蓝星管理奖实发',
+            'ORI_BONUS_ABBR'=>'蓝星业绩奖原奖金',
+            'MANAGE_TAX_ABBR'=>'蓝星业绩奖管理费',
+            'BONUS_ABBR'=>'蓝星业绩奖实发'
         ];
     }
 

common/models/CalcBonusBS.php

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

common/models/CalcBonusBsDetail.php

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

common/models/forms/OrderForm.php

@@ -283,20 +283,13 @@ class OrderForm extends Model
         $ids = $this->goodsId;
         $totalAmount = 0;
         $totalPv = 0;
-        $goodsType = ShopGoods::GOODS_TYPE;
         foreach ($this->goodsNum as $k => $v) {
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                 if($goods['STORE_NUMS']>0){
-                    if ($goods['TYPE'] == 1 || $goods['TYPE'] == 2) {
-                        $discount = $goodsType[$goods['TYPE']]['discount'];
-                        $realPrice = $goods['SELL_PRICE'] * $discount/100;
-                        $realPv = $goods['PRICE_PV'] * $discount/100;
-                    } else {
-                        $discount = $goods['SELL_DISCOUNT'];
-                        $realPrice = $goods['SELL_PRICE'] * $discount;
-                        $realPv = $goods['PRICE_PV'] * $discount;
-                    }
+                    $discount = $goods['SELL_DISCOUNT'];
+                    $realPrice = $goods['SELL_PRICE'] * $discount;
+                    $realPv = $goods['PRICE_PV'] * $discount;
                     $totalAmount += $realPrice * intval($v);
                     $totalPv += $realPv * intval($v);
 //                    if($this->payType=='cash') {
@@ -475,20 +468,13 @@ class OrderForm extends Model
         $ids = $this->goodsId;
         $totalAmount = 0;
         $totalPv = 0;
-        $goodsType = ShopGoods::GOODS_TYPE;
         foreach ($this->goodsNum as $k => $v) {
             if ($v) {
                 $goods = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1',[':ID'=> $ids[$k]]);
                 if($goods['STORE_NUMS']>0){
-                    if ($goods['TYPE'] == 1 || $goods['TYPE'] == 2) {
-                        $discount = $goodsType[$goods['TYPE']]['discount'];
-                        $realPrice = $goods['SELL_PRICE'] * $discount/100;
-                        $realPv = $goods['PRICE_PV'] * $discount/100;
-                    } else {
-                        $discount = $goods['SELL_DISCOUNT'];
-                        $realPrice = $goods['SELL_PRICE'] * $discount;
-                        $realPv = $goods['PRICE_PV'] * $discount;
-                    }
+                    $discount = $goods['SELL_DISCOUNT'];
+                    $realPrice = $goods['SELL_PRICE'] * $discount;
+                    $realPv = $goods['PRICE_PV'] * $discount;
                     $totalAmount += $realPrice * intval($v);
                     $totalPv += $realPv * intval($v);
                     $this->_orderGoods[] = [

frontendApi/modules/v1/controllers/BonusController.php

@@ -404,10 +404,6 @@ class BonusController extends BaseController {
             }
             // 管理奖金 就是新的蓝星奖
             $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
-            // //蓝星业绩奖
-            // $data[] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_YJ'])];
-            // //蓝星管理奖
-            // $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_GL'])];
 
             if ($sysConfig['openGX']['VALUE']) {
                 $data[] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
@@ -453,7 +449,7 @@ class BonusController extends BaseController {
         $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
         ->select('ORI_BONUS_ST,USER_ID,PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
         ORI_BONUS_XF,BONUS_TOTAL,MANAGE_TAX,BONUS_REAL,BONUS_INCOME,ORI_BONUS_YJ,ORI_BONUS_GX,ORI_MONTH_GX_BONUS,ORI_BONUS_GL,RECONSUME_POINTS,
-        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BU_GL,ORI_BONUS_BU_YJ')
+        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_MNT,ORI_BONUS_ABBR')
         ->limit($showBonusPeriodNum)
         ->orderBy('PERIOD_NUM DESC')
         ->asArray()
@@ -480,12 +476,6 @@ class BonusController extends BaseController {
                 // 管理奖金 就是新的蓝星奖金
                 $calcBonus[$key]['BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
 
-                // // 蓝星业绩奖
-                // $calcBonus[$key]['ORI_BONUS_BU_YJ'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_YJ'])];
-
-                // // 蓝星管理奖
-                // $calcBonus[$key]['ORI_BONUS_BU_GL'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_GL'])];
-
                 //共享奖
                 if ($sysConfig['openGX']['VALUE']) {
                     $calcBonus[$key]['BONUS_GX'] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
@@ -549,19 +539,10 @@ class BonusController extends BaseController {
             }
             $tableKey[] = 'BONUS_BS';
 
-            // $tableKey[] = 'ORI_BONUS_BU_YJ';
-            // $tableKey[] = 'ORI_BONUS_BU_GL';
-
             if ($sysConfig['openGX']['VALUE']) {
                 $tableKey[] = 'BONUS_GX';
                 $tableKey[] = 'ORI_MONTH_GX_BONUS';
             }
-            // if ($sysConfig['openYC']['VALUE']) {
-            //     $tableKey[] = 'BONUS_YC';
-            // }
-            // if ($sysConfig['openVIP']['VALUE']) {
-            //     $tableKey[] = 'BONUS_VIP';
-            // }
             if ($sysConfig['openStore']['VALUE']) {
                 $tableKey[] = 'BONUS_ST';
             }

frontendApi/modules/v1/controllers/ShopController.php

@@ -44,12 +44,7 @@ class ShopController extends BaseController {
             'from' => ShopGoods::tableName(),
         ]);
         foreach ($data['list'] as $key => $value) {
-            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
-                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-            } else {
-                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
-            }
-            // $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
         }
         return static::notice($data);
     }
@@ -188,12 +183,7 @@ class ShopController extends BaseController {
             'from' => ShopGoods::tableName(),
         ]);
         foreach ($data['list'] as $key => $value) {
-            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
-                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-            } else {
-                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
-            }
-            //$data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+            $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;  
         }
         return static::notice($data);
     }