提现

app/admin/view/broker/cashlist.html

@@ -55,7 +55,7 @@
 			cols: [
 				[
 					{ field: 'id', width: 80, title: '表ID', sort: true },
-					{ field: 'broker', title: '经济人', templet: '#brokerTpl', minWidth: 200, align: 'left' },
+					{ field: 'broker', title: '经纪人', templet: '#brokerTpl', minWidth: 200, align: 'left' },
 					{ field: 'title', title: '标题', width: 150, align: 'center' },
 					{ field: 'value', title: '金额', width: 100, align: 'center' },
 					{ field: 'status_text', title: '状态', width: 100, align: 'center' },

app/admin/view/user/commission.html

@@ -9,7 +9,7 @@
 							<tr>
 								<th>任务</th>
 								<th>用户佣金（元）</th>
-								<th>经济人佣金（元）</th>
+								<th>经纪人佣金（元）</th>
 							</tr>
 							<tr class="form-tr">
 								<td>新人注册</td>

app/agent/controller/Broker.php

@@ -6,6 +6,7 @@ use app\agent\BaseController;
 use app\common\model\UserPart as UserPartModel;
 use app\common\model\Broker as BrokerModel;
 use app\common\model\User as UserModel;
+use app\common\model\BrokerIncome as BrokerIncomeModel;
 
 use app\common\service\IncomeService;
 use app\common\validate\Broker as BrokerValidate;
@@ -286,12 +287,12 @@ class Broker extends BaseController
         if ($broker['income'] < $value) {
             exit(json_encode([
                 'code' => 1,
-                'msg'  => "经济人收益不足",
+                'msg'  => "经纪人收益不足",
             ]));
         }
 
         $incomeService = new IncomeService();
-        $incomeService->add($brokerid, -$value, '商家结算', '劳务公司与经济人线下结算');
+        $incomeService->add($brokerid, -$value, '商家结算', '劳务公司与经纪人线下结算');
 
         exit(json_encode([
             'code' => 0,

app/agent/view/broker/incomelist.html

@@ -21,7 +21,7 @@
 
 		table.render({
 			elem: '#LAY-broker-incomelist-table',
-			url: setter.baseWorkerUrl + 'broker/listincome?brokerid={$brokerid}',
+			url: setter.baseAgentUrl + 'broker/listincome?brokerid={$brokerid}',
 			cols: [
 				[
 					{ field: 'title', title: '标题' },
@@ -41,7 +41,7 @@
 				field = obj.field,
 				value = obj.value;
 			admin.req({
-				url: setter.baseWorkerUrl + 'broker/fieldbroker',
+				url: setter.baseAgentUrl + 'broker/fieldbroker',
 				data: { id: id, field: field, value: value },
 				done: function(res) {
 					layer.msg('修改成功');

app/common/service/BalanceService.php

@@ -56,7 +56,7 @@ class BalanceService extends BaseService
             $user->save();
         }
 
-        //经济人收益
+        //经纪人收益
         if (!empty($commission[$field['broker']])) {
             $incomeService = new IncomeService();
             $incomeService->add($user['broker_id'], $commission[$field['broker']], $type['title'], $type['remark']);

app/mainapp/controller/Broker.php

@@ -512,7 +512,7 @@ class Broker extends BaseController
         }
 
         $service = new IncomeService();
-        $service->add($brokerid, -$value, '经济人发起提现', '', 2);
+        $service->add($brokerid, -$value, '经纪人发起提现', '', 2);
 
         page_result();
     }

app/worker/controller/Broker.php

@@ -255,12 +255,12 @@ class Broker extends BaseController
         if ($broker['income'] < $value) {
             exit(json_encode([
                 'code' => 1,
-                'msg'  => "经济人收益不足",
+                'msg'  => "经纪人收益不足",
             ]));
         }
 
         $incomeService = new IncomeService();
-        $incomeService->add($brokerid, -$value, '商家结算', '劳务公司与经济人线下结算');
+        $incomeService->add($brokerid, -$value, '商家结算', '劳务公司与经纪人线下结算');
 
         exit(json_encode([
             'code' => 0,