约带看id

application/index/controller/Finance.php

@@ -3021,10 +3021,10 @@ class Finance extends Basic
             }
 
             if (!empty($this->params['march_id'])) {
-                $where['c.id'] = $this->params['march_id'];
+                $where['b.order_id'] = $this->params['march_id'];
             }
 
-            $field = 'a.create_time,a.id,c.id as march_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id';
+            $field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id';
             $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
             $data['total'] = $m_paylog->getAdjustmentListTotal($where);

application/model/OPayLogAdjustment.php

@@ -115,7 +115,6 @@ class OPayLogAdjustment extends BaseModel{
         return $this->db_->field($field)
             ->alias("a")
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->limit($pageSize)
@@ -132,7 +131,6 @@ class OPayLogAdjustment extends BaseModel{
     public function getAdjustmentListTotal($params) {
         return $this->db_->alias('a')
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->where($params)
@@ -148,7 +146,6 @@ class OPayLogAdjustment extends BaseModel{
     public function getMoneyTotal($params) {
         return $this->db_->alias('a')
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->where($params)

public/resource/template/adjustment_template_tpl.html

@@ -4,7 +4,7 @@
     <tr class="text-center">
         <td>[%= it[item]['create_time'] %]</td>
         <td>[%= it[item]['id'] %]</td>
-        <td>[%= it[item]['march_id'] %]</td>
+        <td>[%= it[item]['order_id'] %]</td>
         <td>[%= it[item]['paylog_id'] %]</td>
         <td>[%= it[item]['house_id'] %]</td>
         <td>[%= it[item]['address'] %]</td>