预计收款时间

application/index/controller/Finance.php

@@ -203,7 +203,7 @@ class Finance extends Basic
         } else {
             $bargain       = new OBargainModel();
             $fields        = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.is_open,a.order_id,';
-            $fields        .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price';
+            $fields        .= 'a.trade_type,a.house_number,a.commission,a.content,d.shop_type,a.industry_type,a.price,a.estimated_receipt_date';
             $where['a.id'] = $this->params['id'];
             $data['data']  = $bargain->getBargainInfo($fields, $where);
         }
@@ -237,6 +237,10 @@ class Finance extends Basic
                 return $this->response('101', '实收佣金数量超过限制');
             }
 
+            if (empty($this->params['estimated_receipt_date'])) {
+                return $this->response(101,'预计收款时间为空');
+            }
+
             //应收总佣金
             if (!empty($this->params['commission'])) {
                 $update_data['commission'] = $this->params['commission'];
@@ -266,6 +270,8 @@ class Finance extends Basic
                 $update_data['price'] = $this->params['price'];
             }
 
+            $update_data['estimated_receipt_date'] = $this->params['estimated_receipt_date']; //预计收款时间
+
             $m_bargain = new OBargainModel();
             $m_real    = new ORealIncome();