复消积分 改成复销点数

backendApi/config/menu.php

@@ -206,8 +206,8 @@ return [
 //            ['name'=>'车房养老奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-cf-export', 'routePath'=>'bonus/flow-cf-export', 'show'=>0,],
 //            ['name'=>'领袖分红奖流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx', 'routePath'=>'bonus/flow-lx', 'show'=>1,],
 //            ['name'=>'领袖分红奖流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-lx-export', 'routePath'=>'bonus/flow-lx-export', 'show'=>0,],
-            ['name'=>'复消积分流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
-            ['name'=>'复消积分流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
+            ['name'=>'复销点数流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp', 'routePath'=>'bonus/flow-rp', 'show'=>1,],
+            ['name'=>'复销点数流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-rp-export', 'routePath'=>'bonus/flow-rp-export', 'show'=>0,],
             ['name'=>'兑换点数流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange', 'routePath'=>'bonus/flow-exchange', 'show'=>1,],
             ['name'=>'兑换点数流水导出', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-exchange-export', 'routePath'=>'bonus/flow-exchange-export', 'show'=>0,],
             ['name'=>'会员余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-balance', 'routePath'=>'bonus/flow-balance', 'show'=>1,],

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

@@ -148,7 +148,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
                     ],
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '会员复消积分',
+                    'header' => '会员复销点数',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['RECONSUME_POINTS'],
@@ -399,7 +399,7 @@ class BalanceList extends \common\libs\dataList\DataList implements DataListInte
 //                'DEC_ROLE_NAME'=> ['isUserTable'=> true, 'name'=> '报单中心级别', 'other'=> 'decRole'],
 //                'SYSTEM_NAME'=> ['isUserTable'=> false, 'name'=> '体系名称', 'other'=> 'systems'],
                 'BONUS'=> ['isUserTable'=> false, 'name'=> '会员奖金余额'],
-                'RECONSUME_POINTS'=> ['isUserTable'=> false, 'name'=> '会员复消积分'],
+                'RECONSUME_POINTS'=> ['isUserTable'=> false, 'name'=> '会员复销点数'],
                 'CASH'=> ['isUserTable'=> false, 'name'=> '会员余额'],
 //                'CF'=> ['isUserTable'=> false, 'name'=> '车房养老余额'],
 //                'LX'=> ['isUserTable'=> false, 'name'=> '领袖分红余额'],

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

@@ -19,7 +19,7 @@ class FlowReconsumePointsList extends \common\libs\dataList\DataList implements
      * @return string
      */
     public function getListName() {
-        return '复消积分流水';
+        return '复销点数流水';
     }
 
     /**

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

@@ -468,7 +468,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                     ],
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复销积分',
+                    'header' => '复销点数',
                     'value' => function($row) {
                         return (new Price([
                             'value' => $row['RECONSUME_POINTS'],

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

@@ -145,7 +145,7 @@ class TraceDownBdList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceDownGlList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -139,7 +139,7 @@ class TraceDownGxList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -145,7 +145,7 @@ class TraceDownTgList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -146,7 +146,7 @@ class TraceDownXfList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceDownYjList extends \common\libs\dataList\DataList implements DataList
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpBdList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpGlList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpGxList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpTgList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpXfList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpYcList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

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

@@ -144,7 +144,7 @@ class TraceUpYjList extends \common\libs\dataList\DataList implements DataListIn
                     },
                 ],
                 'RECONSUME_POINTS' => [
-                    'header' => '复消积分',
+                    'header' => '复销点数',
                     'headerOther' => [
                         'width' => '150',
                     ],

backendEle/src/router/index.js

@@ -759,7 +759,7 @@ export const constantRouterMap = [
         component: _import('bonus/flow-rp'),
         name: 'bonus_flow-rp',
         meta: {
-          title: '复消积分流水',
+          title: '复销点数流水',
           breadcrumb: [
             {title: '首页', path: '/dashboard/index'},
             {title: '奖金管理', path: '/bonus/period'},

backendEle/src/views/config/transfer.vue

@@ -96,7 +96,7 @@
         },
         loading: true,
         submitButtonStat: false,
-        allWallet:{'bonus':'会员账户','cash':'现金钱包','point':'复消积分'}
+        allWallet:{'bonus':'会员账户','cash':'现金钱包','point':'复销点数'}
       }
     },
     methods: {

backendEle/src/views/finance/change-balance-opt.vue

@@ -54,7 +54,7 @@
               <!--<el-input v-model="excelForm.rowCount"></el-input>-->
             <!--</el-form-item>-->
             <!--<el-form-item label="">-->
-              <!--<el-tag type="info">表格中账户类型要求英文：bonus(会员账户余额)、reconsume_points(复消积分)</el-tag>-->
+              <!--<el-tag type="info">表格中账户类型要求英文：bonus(会员账户余额)、reconsume_points(复销点数)</el-tag>-->
             <!--</el-form-item>-->
             <!--<el-form-item>-->
               <!--<leo-excel-uploader-->

common/config/params.php

@@ -192,7 +192,7 @@ return [
         ],
         'reconsume_points' => [
             'name' => 'bonus',
-            'label' => '复消积分余额',
+            'label' => '复销点数余额',
         ],
         'cash' => [
             'name' => 'cash',

common/helpers/bonus/BonusSend.php

@@ -362,7 +362,7 @@ class BonusSend extends BaseObject {
                         //     [
                         //     'TRANSFER_SN' => Transfer::generateSN(),
                         //     'DEAL_TYPE_ID' => DealType::BONUS_SEND, 
-                        //     'REMARK' => '复消积分发放'
+                        //     'REMARK' => '复销点数发放'
                         //     ]
                         // );
                     }

common/models/BalanceAudit.php

@@ -36,7 +36,7 @@ class BalanceAudit extends \common\components\ActiveRecord
         ],
         'reconsume_points' => [
             'name' => 'reconsume_points',
-            'label' => '复消积分',
+            'label' => '复销点数',
         ],
         'exchange_points' => [
             'name' => 'exchange_points',

common/models/CalcBonus.php

@@ -99,7 +99,7 @@ use Yii;
  * @property string $BONUS_BONUS_GL 实发管理奖奖金
  * @property string $ORI_BONUS_GL_BD 报单管理奖原奖金
  * @property string $ORI_BONUS_GL_FX 复消管理奖原奖金
- * @property string $RECONSUME_POINTS 复消积分
+ * @property string $RECONSUME_POINTS 复销点数
  * @property string $MANAGE_TAX 管理费 
  * @property string $BONUS_BS 蓝星奖金(即新的管理奖)
  * @property string $ORI_BONUS_BS 蓝星原奖金(即新的管理奖,原奖金)
@@ -229,7 +229,7 @@ class CalcBonus extends \common\components\ActiveRecord
             'REAL_BONUS_GL'=> '实发管理奖奖金',
             'ORI_BONUS_GL_BD'=> '报单管理奖原奖金',
             'ORI_BONUS_GL_FX'=> '复消管理奖原奖金',
-            'RECONSUME_POINTS'=> '复消积分',
+            'RECONSUME_POINTS'=> '复销点数',
             'MANAGE_TAX'=> '管理费',
             'EXCHANGE_POINTS' => '兑换点数',
             'BONUS_BS' => '蓝星奖',

common/models/ReturnOrder.php

@@ -81,7 +81,7 @@ class ReturnOrder extends \common\components\ActiveRecord
             'ADMIN_ID' => '删除订单人ID',
             'ORI_BONUS' => '删除订单前用户奖金',
             'ORI_EXCHANGE_POINTS' => '删前用户无业绩兑换点数',
-            'ORI_RECONSUME_POINTS' => '删除前用户复消积分',
+            'ORI_RECONSUME_POINTS' => '删除前用户复销点数',
             'ORI_DEC_LV' => '删前级别',
             'RETURN_DEC_LV' => '删后级别',
             'IS_LOCKING' => '此单是否会锁定会员'

common/models/Transfer.php

@@ -37,7 +37,7 @@ class Transfer extends \common\components\ActiveRecord
     const WALLET_NAME = [
         'bonus'=>'增值点数',
         'cash'=>'消费点数',
-        'point'=>'复消积分'
+        'point'=>'复销点数'
     ];
 
     /**

common/models/UserBonus.php

@@ -115,9 +115,9 @@ class UserBonus extends \common\components\ActiveRecord
             'ORI_YJ_TOTAL' => '业绩奖原奖金累计',
             'ORI_GX_TOTAL' => '共享奖原奖金累计',
             'ORI_GL_TOTAL' => '管理奖原奖金累计',
-            'RECONSUME_POINTS' => '复消积分',
-            'RECONSUME_POINTS_TOTAL' => '复消积分累计',
-            'RECONSUME_POINTS_EXPIRED' => '复消积分过期',
+            'RECONSUME_POINTS' => '复销点数',
+            'RECONSUME_POINTS_TOTAL' => '复销点数累计',
+            'RECONSUME_POINTS_EXPIRED' => '复销点数过期',
             'MANAGE_TAX' => '管理费累计',
             'BONUS_TOTAL' => '总奖金累计',
             'BS' => '蓝星奖(即新的管理奖)',

common/models/UserPeriodPoints.php

@@ -48,7 +48,7 @@ class UserPeriodPoints extends \common\components\ActiveRecord
         return [
             'ID' => 'ID',
             'USER_ID' => '会员ID',
-            'RECONSUME_POINTS' => '复消积分',
+            'RECONSUME_POINTS' => '复销点数',
             'REMAINDER_POINTS' => '剩余积分',
             'EXPIRED' => '是否过期',
             'EXPIRED_PERIOD' => '过期期数',

common/models/forms/ChangeBalanceForm.php

@@ -164,7 +164,7 @@ class ChangeBalanceForm extends Model {
     public function isAmount($attribute) {
         if ($this->amount == 0) $this->addError($attribute, '调整金额不能为0');
         if ($this->amount < 0 && $this->type == 'reconsume_points' && abs($this->amount) > Balance::getBalanceReconsumePoints($this->_userId)) {
-            $this->addError('scenario', '会员复消积分余额不足，不允许调整');
+            $this->addError('scenario', '会员复销点数余额不足，不允许调整');
         }
 //        if ($this->amount < 0 && $this->type == 'lx' && abs($this->amount) > Balance::getBalanceLX($this->_userId)) {
 //            $this->addError('scenario', '会员领袖分红余额不足，不允许调整');

common/models/forms/OrderDeleteForm.php

@@ -176,7 +176,7 @@ class OrderDeleteForm extends Model
             } else if ($payType == 'exchange') {
                 $amountResult = Balance::changeUserBonus($userId,'exchange_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '退货退还无业绩兑换点数']);
             } else{
-                $amountResult = Balance::changeUserBonus($userId,'reconsume_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '退货退还复销积分']);
+                $amountResult = Balance::changeUserBonus($userId,'reconsume_points', +abs($payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '退货退还复销点数']);
             }
             if ($amountResult !== true) {
                 $transaction->rollBack();

common/models/forms/OrderForm.php

@@ -346,7 +346,7 @@ class OrderForm extends Model
                 }
             } else{
                 if ($this->_payAmount > Balance::getBalanceReconsumePoints($loginUserId)) {
-                    throw new Exception('复消积分不足，无法购买商品');
+                    throw new Exception('复销点数不足，无法购买商品');
                 }
             }
 
@@ -457,7 +457,7 @@ class OrderForm extends Model
         } else if ($this->payType=='exchange') {
             Balance::changeUserBonus(\Yii::$app->user->id,'exchange_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '会员兑换积分兑换']);
         } else{
-            Balance::changeUserBonus(\Yii::$app->user->id,'reconsume_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '会员复销积分兑换']);
+            Balance::changeUserBonus(\Yii::$app->user->id,'reconsume_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE,'REMARK' => '会员复销点数兑换']);
         }
         return $orderModel;
     }
@@ -531,7 +531,7 @@ class OrderForm extends Model
                 }
             }else{
                 if ($this->_payAmount > Balance::getBalanceReconsumePoints($loginUserId)) {
-                    throw new Exception('复消积分不足，无法购买商品');
+                    throw new Exception('复销点数不足，无法购买商品');
                 }
             }
 
@@ -640,7 +640,7 @@ class OrderForm extends Model
         if($this->payType=='cash') {
             Cash::changeUserCash($loginUserId, 'CASH', -abs($this->_payAmount), ['REMARK' => '会员复销余额支付']);
         }else{
-            Balance::changeUserBonus($loginUserId,'reconsume_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE, 'REMARK' => '会员复销积分兑换']);
+            Balance::changeUserBonus($loginUserId,'reconsume_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE, 'REMARK' => '会员复销点数兑换']);
         }
         return $orderModel;
     }

console/controllers/BonusController.php

@@ -241,7 +241,7 @@ class BonusController extends BaseController
      * @return bool
      */
     public function actionFlowBalanceExport($taskId){
-        return $this->_export($taskId, FlowBalanceList::class, '复消积分流水列表');
+        return $this->_export($taskId, FlowBalanceList::class, '复销点数流水列表');
     }
 
     /**
@@ -250,7 +250,7 @@ class BonusController extends BaseController
      * @return bool
      */
     public function actionFlowRpExport($taskId){
-        return $this->_export($taskId, FlowReconsumePointsList::class, '复消积分流水列表');
+        return $this->_export($taskId, FlowReconsumePointsList::class, '复销点数流水列表');
     }
 
     /**

frontendApi/modules/v1/controllers/BonusController.php

@@ -74,7 +74,7 @@ class BonusController extends BaseController {
         // 会员奖金->增值点数      会员余额->消费点数
         $wallet[] = ['walletType' => 'bonus', 'walletName' => '增值点数', 'amount' => Tool::formatPrice($data['BONUS'])];
         $wallet[] = ['walletType' => 'cash', 'walletName' => '消费点数', 'amount' => Tool::formatPrice($data['CASH'])];
-        $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
+        $wallet[] = ['walletType' => 'point', 'walletName' => '复销点数', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
         $wallet[] = ['walletType' => 'exchange', 'walletName' => '兑换点数', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];
 //        if ($showCFLX) {
 //            $wallet[] = ['walletType' => 'cf', 'walletName' => '福利积分一', 'amount' => Tool::formatPrice($data['CF'])];
@@ -373,7 +373,7 @@ class BonusController extends BaseController {
             $data[] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
             $data[] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus['MANAGE_TAX'])];
             $data[] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_REAL'])];
-            $data[] = ['name' => '复消积分', 'value' => Tool::formatPrice($calcBonus['RECONSUME_POINTS'])];
+            $data[] = ['name' => '复销点数', 'value' => Tool::formatPrice($calcBonus['RECONSUME_POINTS'])];
             $data[] = ['name' => '兑换点数', 'value' => Tool::formatPrice($calcBonus['EXCHANGE_POINTS'])];
             $data[] = ['name' => '一市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_1L'])];
             $data[] = ['name' => '二市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_2L'])];
@@ -481,7 +481,7 @@ class BonusController extends BaseController {
                 }
                 // 总奖金
                 $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
-                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
+                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销点数', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
                 $calcBonus[$key]['EXCHANGE_POINTS'] = ['name' => '兑换点数', 'value' => Tool::formatPrice($calcBonus[$key]['EXCHANGE_POINTS'])];
                 $calcBonus[$key]['MANAGE_TAX'] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus[$key]['MANAGE_TAX'])];
                 $calcBonus[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_REAL'])];

frontendEle/src/views/finance/transfer-add.vue

@@ -13,7 +13,7 @@
         <el-form-item label="当前可用消费点数">
           <el-tag type="success">{{cash}}元</el-tag>
         </el-form-item>
-        <el-form-item label="当前可用复消积分">
+        <el-form-item label="当前可用复销点数">
           <el-tag type="success">{{point}}元</el-tag>
         </el-form-item>
         <el-form-item label="当前转账比例" v-if="false">
@@ -66,7 +66,7 @@ export default {
   },
   data () {
     return {
-      allWallet:{'bonus':'会员账户','cash':'现金钱包','point':'复消积分'},
+      allWallet:{'bonus':'会员账户','cash':'现金钱包','point':'复销点数'},
       form: {
         type:1,
         toUserName: '',