1

app/validate/admin/UserBrokerageValidate.php

@@ -25,8 +25,8 @@ class UserBrokerageValidate extends Validate
         'brokerage_name|会员名称' => 'require|max:16',
         'brokerage_icon|会员图标' => 'require',
         'brokerage_rule|会员升级规则' => 'requireIf:type,0|array|checkBrokerageRule',
-        'extension_one|一级佣金比例' => 'requireIf:type,0|float|>=:0|<=:100',
-        'extension_two|二级佣金比例' => 'requireIf:type,0|float|>=:0|<=:100',
+        'extension_one|一级奖金比例' => 'requireIf:type,0|float|>=:0|<=:100',
+        'extension_two|二级奖金比例' => 'requireIf:type,0|float|>=:0|<=:100',
         'image|背景图' => 'requireIf:type,1|max:128',
         'value|会员成长值' => 'requireIf:type,1|float|>=:0',
         'type|类型' => 'require|in:0,1',

app/validate/merchant/StoreProductValidate.php

@@ -115,11 +115,11 @@ class StoreProductValidate extends Validate
                     $arr[] = $sku;
                 }
                 if(isset($data['extension_type']) && $data['extension_type'] && systemConfig('extension_status')){
-                    if(!isset($v['extension_one']) || !isset($v['extension_two'])) return '佣金金额必须填写';
+                    if(!isset($v['extension_one']) || !isset($v['extension_two'])) return '奖金金额必须填写';
                     if(($v['extension_one'] < 0) || ($v['extension_two'] < 0))
-                        return '佣金金额不可存在负数';
+                        return '奖金金额不可存在负数';
                     if($v['price'] < bcadd($v['extension_one'],$v['extension_two'],2))
-                        return '自定义佣金总金额不能大于商品售价';
+                        return '自定义奖金总金额不能大于商品售价';
                 }
                 if ($data['product_type'] == 20 && !$v['ot_price']) {
                     return '积分商品兑换积分必须大于0';

crmeb/services/ExcelService.php

@@ -431,8 +431,8 @@ class ExcelService
         $financialType = [
             'order' => '订单支付',
             'presell' => '预售订单（尾款）',
-            'brokerage_one' => '一级佣金',
-            'brokerage_two' => '二级佣金',
+            'brokerage_one' => '一级奖金',
+            'brokerage_two' => '二级奖金',
             'order_charge' => '手续费',
             'order_true' => '商户入账',
             'refund_order' => '退款',
@@ -440,8 +440,8 @@ class ExcelService
             'refund_true' => '商户返还入账',
             'presell_charge' => '预售订单（手续费）',
             'presell_true' => '商户入账',
-            'refund_brokerage_one' => '返还一级佣金',
-            'refund_brokerage_two' => '返还二级佣金',
+            'refund_brokerage_one' => '返还一级奖金',
+            'refund_brokerage_two' => '返还二级奖金',
             'mer_presell' => '预售订单（总额）',
             'order_presell' => '预售订单（定金）',
             'refund_platform_coupon' => '退回优惠券补贴',
@@ -507,7 +507,7 @@ class ExcelService
             $foot = [
                 '合计：平台应入账手续费 ' . $charge,
                 '收入合计： ' . '订单支付' . $income['count'] . '笔,' . '实际支付金额共:' . $income['number'] . '元',
-                '支出合计： ' . '佣金支出' . $expend['count_brokerage'] . '笔,支出金额：' . $expend['number_brokerage'] . '元；商户入账支出' . $expend['count_order'] . '笔，支出金额：' . $expend['number_order'] . '元；退款手续费' . $expend['count_charge'] . '笔，支出金额' . $expend['number_charge'] .'元；线下商户已收款' .$expend['count_offline']. '笔,金额:'.$expend['number_offline'] . '元；合计支出' . $expend['number'],
+                '支出合计： ' . '奖金支出' . $expend['count_brokerage'] . '笔,支出金额：' . $expend['number_brokerage'] . '元；商户入账支出' . $expend['count_order'] . '笔，支出金额：' . $expend['number_order'] . '元；退款手续费' . $expend['count_charge'] . '笔，支出金额' . $expend['number_charge'] .'元；线下商户已收款' .$expend['count_offline']. '笔,金额:'.$expend['number_offline'] . '元；合计支出' . $expend['number'],
             ];
             //商户
         } else {
@@ -542,7 +542,7 @@ class ExcelService
             $foot = [
                 '合计：商户应入金额 ' . $charge,
                 '收入合计： ' . '订单支付' . $income['count'] . '笔,' . '实际支付金额共:' . $income['number'] . '元;线下收入' . $income['count_offline'] . '笔,金额:' . $income['number_offline'] . '元',
-                '支出合计： ' . '佣金支出' . $count_brokeage . '笔,支出金额：' . $number_brokeage . '元；退款' . $expend['count_refund'] . '笔，支出金额:' . $expend['number_refund'] . '元；平台手续费' . $count_charge . '笔，支出金额：' . $number_charge . '元；合计支出金额：' . $expend['number'] . '元；',
+                '支出合计： ' . '奖金支出' . $count_brokeage . '笔,支出金额：' . $number_brokeage . '元；退款' . $expend['count_refund'] . '笔，支出金额:' . $expend['number_refund'] . '元；平台手续费' . $count_charge . '笔，支出金额：' . $number_charge . '元；合计支出金额：' . $expend['number'] . '元；',
             ];
             $mer_name = '商户名称:' . $mer_name;
         }

crmeb/services/MiniProgramService.php

@@ -579,11 +579,11 @@ class MiniProgramService
         $transferDetailList = [
             [
                 'info_type' => '活动名称',
-                'info_content' => '佣金转入余额'
+                'info_content' => '奖金转入余额'
             ],
             [
                 'info_type' => '奖励说明',
-                'info_content' => '佣金转入余额'
+                'info_content' => '奖金转入余额'
             ]
         ];
 

crmeb/services/UpdateAuthInit.php

@@ -95,7 +95,7 @@ class UpdateAuthInit implements RouteParserInterface
                     'option' => [
                         '_name'  =>'systemAgreeSave',
                         '_path'  =>'/promoter/commission',
-                        '_alias' => '佣金说明',
+                        '_alias' => '奖金说明',
                         '_repeat'=> true,
                         '_auth'  => true,
                     ],

crmeb/services/WechatService.php

@@ -884,11 +884,11 @@ class WechatService
         $transferDetailList = [
             [
                 'info_type' => '活动名称',
-                'info_content' => '佣金转入余额'
+                'info_content' => '奖金转入余额'
             ],
             [
                 'info_type' => '奖励说明',
-                'info_content' => '佣金转入余额'
+                'info_content' => '奖金转入余额'
             ]
         ];
 

crmeb/services/WechatTemplateMessageService.php

@@ -721,7 +721,7 @@ class WechatTemplateMessageService
                     'uid' => $res->uid,
                     'data' => [
                         'amount3' => $res->extract_price,
-                        'thing4' => $res->status == -1 ? '审核未通过' : ($res->wechat_status == 'WAIT_USER_CONFIRM' ? '佣金提现已通过，请及时确认收款' : '审核通过'),
+                        'thing4' => $res->status == -1 ? '审核未通过' : ($res->wechat_status == 'WAIT_USER_CONFIRM' ? '奖金提现已通过，请及时确认收款' : '审核通过'),
                         'time9' => $res->create_time,
                     ],
                     'link' => 'pages/users/user_spread_money/index?type=1',

route/api.php

@@ -154,13 +154,13 @@ Route::group('api/', function () {
 
             //余额记录
             Route::get('bill', 'User/bill');
-            //佣金记录
+            //奖金记录
             Route::get('brokerage_list', 'User/brokerage_list');
             //推广人订单
             Route::get('spread_order', 'User/spread_order');
             //推广人排行榜
             Route::get('spread_top', 'User/spread_top');
-            //佣金排行榜
+            //奖金排行榜
             Route::get('brokerage_top', 'User/brokerage_top');
             Route::get('spread_info', 'User/spread_info');
             Route::get('spread_level', 'User/spread_info');