收款详情

application/index/controller/Finance.php

@@ -2775,17 +2775,17 @@ class Finance extends Basic
             if (empty($pay_data['order_id'])) {
                 $pay_data['bargain_id'] = "";
                 $pay_data['is_open'] = 0;
-                $pay_data['price'] = "";
+                $pay_data['price'] = 0;
             } else {
                 $bargain_data = $this->m_bargain->getDetail('id,price,is_open', ['order_id'=>$pay_data['order_id']]);
                 $pay_data['bargain_id'] = empty($bargain_data) ? "":$bargain_data['id'];
                 $pay_data['is_open'] = empty($bargain_data['is_open']) ? 0 :$bargain_data['is_open'];
-                $pay_data['price'] = $bargain_data['price'];
+                $pay_data['price'] = empty($bargain_data['price'])? 0:$bargain_data['price'];
 
                 $m_order = new OrderModel();
                 $house_data = $m_order->selectOrderByOrderId('b.id,b.internal_address', ['order_id'=>$pay_data['order_id']]);
-                $pay_data['house_id'] = $house_data[0]['id'];
-                $pay_data['address'] = $house_data[0]['internal_address'];
+                $pay_data['house_id'] = empty($house_data[0]['id']) ? '':$house_data[0]['id'];
+                $pay_data['address'] = empty($house_data[0]['internal_address']) ? '':$house_data[0]['internal_address'];
             }
 
             $m_pay_adjustment = new OPayLogAdjustment();
@@ -2813,8 +2813,6 @@ class Finance extends Basic
                 }
                 $pay_data['current_agent_name'] = empty($current_agent_name['reception_name']) ? "" : $current_agent_name['reception_name'];
             }
-
-            $pay_data = $this->nullToStr($pay_data);
         } catch (\Exception $e) {
             $msg = '内部错误:'.$e->getMessage();
         }
@@ -2845,6 +2843,7 @@ class Finance extends Basic
             $save_data['transaction_fee']  = $this->params['transaction_fee'];
             $save_data['pay_type']  = $this->params['pay_type'];
             $save_data['last_transfer_time']  = $this->params['last_transfer_time'];
+            $save_data['transfer_name']  = $this->params['transfer_name'];
             $save_data['money']  = $this->params['money'];
             $m_pay->updatePayLog($save_data);
         } catch (\Exception $e) {
@@ -2879,22 +2878,4 @@ class Finance extends Basic
     public function dailyDetails() {
         return view('daily_details');
     }
-
-    /**
-     * @param $array
-     * @return mixed
-     */
-    public function nullToStr(array $array)
-    {
-
-        foreach ($array as $k=>$v){
-            if(is_null($v)) {
-                $array [$k] = '';
-            }
-            if(is_array($v)) {
-                $array [$k] = nulltostr($v);
-            }
-        }
-        return $array;
-    }
 }

application/model/OMarchInModel.php

@@ -455,7 +455,7 @@ class OMarchInModel extends Model
      */
     public function getAgentMarchIn($field, $where) {
         try {
-            $data['data'] = $this->field($field)
+            $data['data'] = $this->db_model->field($field)
                 ->alias('a')
                 ->join('a_agents b', 'a.reception_id = b.id', 'left')
                 ->join('o_bargain c', 'a.order_id = c.order_id', 'left')
@@ -480,7 +480,7 @@ class OMarchInModel extends Model
      * @throws \think\exception\DbException
      */
     public function getInfo($field, $where, $order = 'id desc') {
-        return $this->field($field)
+        return $this->db_model->field($field)
             ->where($where)
             ->order($order)
             ->find();