收款记录修改

application/index/controller/Collection.php

@@ -77,7 +77,7 @@ class Collection extends Basic
             }
 
             if (empty($this->params['excel'])) {
-                $field = 'a.id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address';
+                $field = 'a.id,a.order_id,a.create_time,c.user_name,c.user_phone,a.money,a.real_money,a.pay_type,a.house_number,a.type,d.internal_title,d.internal_address,a.source';
                 $data['data']['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
                 $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
                 $data['data']['money_total'] = $order->getMoneyTotal(); //总额
@@ -85,7 +85,7 @@ class Collection extends Basic
             } else {
                 $pageNo = 1;
                 $pageSize = 50000; //最多5万条数据
-                $field = 'a.create_time,c.user_name,c.user_phone,e.name,e.phone,f.store_name,g.district_name,a.money,a.real_money,a.pay_type,a.type,d.internal_address,a.house_number';
+                $field = 'a.create_time,c.user_name,c.user_phone,e.name,e.phone,f.store_name,g.district_name,a.money,a.real_money,a.pay_type,a.type,d.internal_address,a.house_number,a.source';
                 $data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
                 //付款类型 10意向金 20定金 30保管金 40押金 50 租金 60 进场费 70转让费 80其他
@@ -107,8 +107,10 @@ class Collection extends Basic
                             $data[$k]['pay_type'] = '进场费';break;
                         case 70 :
                             $data[$k]['pay_type'] = '转让费';break;
-                        default :
+                        case 80 :
                             $data[$k]['pay_type'] = '其他';
+                        case 90 :
+                            $data[$k]['pay_type'] = '佣金';
                     }
 
                     switch ($v['type']) {
@@ -117,7 +119,14 @@ class Collection extends Basic
                         case 20 :
                             $data[$k]['type'] = '微信';break;
                         case 30 :
-                            $data[$k]['type'] = 'POS机器';break;
+
+                            if ($v['source'] == 0) {
+                                $data[$k]['type'] = 'POS机器';
+                            } else {
+                                $data[$k]['type'] = '智能POS机器';
+                            }
+
+                            break;
                         case 40 :
                             $data[$k]['type'] = '转账';break;
                         case 50 :