获取时间

application/index/controller/Finance.php

@@ -2404,6 +2404,17 @@ class Finance extends Basic
                     $list[$k]['source_id'] = empty($source_id) ? 0 : $source_id;
                     $bargain_id = $this->m_bargain->selectBargainByOrderNo('id', ['order_id', $v['order_id']]);
                     $list[$k]['bargain_id'] = $bargain_id[0]['id'];
+
+                    switch ($v['type']) {
+                        case 91:
+                            //中介费 对应业务员：约带看的人  即 反签方
+                            break;
+                        case 92:
+                            //案场费 对应业务员：盘方
+                            break;
+                        default :
+                            //意向金/保管金   10/30 对应业务员：约带看的人  即 反签方
+                    }
                 }
                 $data['list'] = $list;
                 //加时间条件
@@ -2456,8 +2467,8 @@ class Finance extends Basic
      * @return mixed
      */
     public function numberTransitionString($data) {
-        //付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他 90佣金
-        //支付方式 10支付宝 20 微信 30pos机器 40转账 50现金 60其他
+        //pay_type支付方式 10施总支付宝  11林老师支付宝  20 施总微信 21林老师微信  30pos机器 40地产转账  41世家公账  42 3000账号 50现金 60其他
+        //type付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他 90佣金 91中介费 92 案场费
         foreach ($data as $k => $v) {
 
             switch ($v['type']) {
@@ -2479,13 +2490,21 @@ class Finance extends Basic
                     $data[$k]['type'] = '其他';break;
                 case 90 :
                     $data[$k]['type'] = '佣金';break;
+                case 91 :
+                    $data[$k]['type'] = '中介费';break;
+                case 92 :
+                    $data[$k]['type'] = '案场费';break;
             }
 
             switch ($v['pay_type']) {
                 case 10 :
-                    $data[$k]['pay_type'] = '支付宝';break;
+                    $data[$k]['pay_type'] = '施总支付宝';break;
+                case 11 :
+                    $data[$k]['pay_type'] = '林老师支付宝';break;
                 case 20 :
-                    $data[$k]['pay_type'] = '微信';break;
+                    $data[$k]['pay_type'] = '施总微信';break;
+                case 21 :
+                    $data[$k]['pay_type'] = '林老师微信';break;
                 case 30 :
 
                     if ($v['source'] == 0) {
@@ -2496,7 +2515,11 @@ class Finance extends Basic
 
                     break;
                 case 40 :
-                    $data[$k]['pay_type'] = '转账';break;
+                    $data[$k]['pay_type'] = '地产转账';break;
+                case 41 :
+                    $data[$k]['pay_type'] = '世家公账';break;
+                case 42 :
+                    $data[$k]['pay_type'] = '3000账号';break;
                 case 50 :
                     $data[$k]['pay_type'] = '现金';break;
                 default :

application/index/controller/Setting.php

@@ -222,4 +222,23 @@ class Setting extends Basic
 
         return $this->response($code, $msg, $data);
     }
+
+    /**
+     * @return \think\Response
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getConfigWeek() {
+        $code = 200;
+        $msg = '';
+        $where['params'] = 'week_competition_'.$this->params['site_id'];
+
+        if (empty($this->params['site_id'])) {
+            return $this->response(101, '参数错误');
+        }
+        $id = $this->m_config->getSettingV2($where, 'id,rule');
+        $data = $id[0]['rule'];
+        return $this->response($code, $msg, $data);
+    }
 }
\ No newline at end of file

application/index/extend/Basic.php

@@ -67,6 +67,7 @@ class Basic extends Controller
         'index/yindaoAndroid',
         'index/yindaoIos',
         'index/getUserMacAddress',
+        'index/getConfigWeek'
     );
 
     /**

application/route.php

@@ -216,6 +216,7 @@ Route::group('index', [
 
     'getSetting'                         => ['index/Setting/getSettingV2', ['method' => 'get|post']], //新增和修改全局参数设置
     'configWeek'                         => ['index/Setting/configWeek', ['method' => 'getpost']], //周竞赛时间存储
+    'getConfigWeek'                      => ['index/Setting/getConfigWeek', ['method' => 'get']], //获取周竞赛时间
     'getMenu'                            => ['index/Auth/getMenu', ['method' => 'get|post']], //新增和修改全局参数设置
     'reportListOne/:check_status'        => ['index/Finance/reportList', ['method' => 'get'], ['check_status' => 1]], //财务 成交报告-未结单-第一级审核
     'reportListTwo/:check_status'        => ['index/Finance/reportList', ['method' => 'get'], ['check_status' => 2]], //财务 成交报告-未结单-第二级审核