收款列表字段同步

application/index/controller/Finance.php

@@ -14,10 +14,13 @@ use app\api_broker\service\VipService;
 use app\index\extend\Basic;
 use app\index\untils\ExportExcelUntil;
 use app\model\AAgents;
+use app\model\ADistrict;
+use app\model\AStore;
 use app\model\OBargainLogModel;
 use app\model\OBargainModel;
 use app\model\OImg;
 use app\model\OMarchInModel;
+use app\model\OPayLogAdjustment;
 use app\model\ORealIncome;
 use app\model\OTaxes;
 use app\model\OFinancialAudit;
@@ -2280,7 +2283,7 @@ class Finance extends Basic
      */
     public function getCollection() {
         if (!$this->request->isAjax() && $this->params['excel'] != 1) {
-            return view('getCollection');
+//            return view('getCollection');
         }
 
         $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
@@ -2388,12 +2391,21 @@ class Finance extends Basic
             }
 
             if (empty($this->params['excel'])) {
-                $field = 'a.id,a.father_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,a.transaction_fee,c.report_agent_phone,
-            c.report_agent_name,f.store_name,g.district_name,a.income_time';
-                $data['list'] = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
-                $data['total'] = $order->getAddPayLogOrderListLmitTotal($where);
-
+                $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,c.report_agent_phone,
+            c.report_agent_name,a.income_time,e.store_id';
+                $list = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
+                $data['total'] = $order->getAddPayLogOrderListLimitTotal($where);
+
+                $m_store = new AStore();
+                $m_pay_adjustment = new OPayLogAdjustment();
+                foreach ($list as $k=>$v) {
+                    $list[$k]['store_name'] = $m_store->getStoreKeyById('store_name', ['id'=>$v['store_id']]);
+                    $source_id = $m_pay_adjustment->getFieldValue('id', ['paylog_id'=> $v['id']]);
+                    $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'];
+                }
+                $data['list'] = $list;
                 //加时间条件
                 if ($is_show) {
                     $data['money_total'] = $order->getMoneyTotal($where, 'a.money'); //总额
@@ -2414,7 +2426,7 @@ class Finance extends Basic
                 $pageNo = 1;
                 $pageSize = 50000; //最多5万条数据
                 $field = 'a.create_time,c.user_name,c.user_phone,c.report_agent_name,c.report_agent_phone,f.store_name,g.district_name,a.money,a.real_money,a.transaction_fee,a.type,a.pay_type,d.internal_address,a.house_number,a.source';
-                $data = $order->getAddPayLogOrderListLmit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
+                $data = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
                 foreach ($data as $k => $v) {
                     if (!empty($v['user_phone'])) {

application/model/OPayLogAdjustment.php

@@ -35,4 +35,14 @@ class OPayLogAdjustment extends Model{
             ->select();
     }
 
+    /**
+     * @param $field
+     * @param $params
+     * @return int|mixed
+     */
+    public function getFieldValue($field,$params) {
+        return $this->db_->where($params)
+            ->value($field);
+    }
+
 }
\ No newline at end of file

application/model/OPayLogModel.php

@@ -329,7 +329,7 @@ class OPayLogModel extends Model
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getAddPayLogOrderListLmit($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
+    public function getAddPayLogOrderListLimit($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
     {
         $params["a.is_del"] = 0;
         if (isset($params['e.name']) || isset($params['f.store_name']) || isset($params['e.phone'])) {
@@ -341,8 +341,8 @@ class OPayLogModel extends Model
                 ->join("o_report c", "b.f_id = c.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'c.report_agent_id=e.id', 'left')
-                ->join('a_store f', 'e.store_id=f.id', 'left')
-                ->join('a_district g', 'f.district_id=g.id', 'left')
+//                ->join('a_store f', 'e.store_id=f.id', 'left')
+//                ->join('a_district g', 'f.district_id=g.id', 'left')
                 ->limit($pageSize)
                 ->page($pageNo)
                 ->order($order_)
@@ -356,8 +356,8 @@ class OPayLogModel extends Model
                 ->join("o_report c", "b.f_id = c.id", "left")
                 ->join('g_houses d', 'b.house_id = d.id', 'left')
                 ->join('a_agents e', 'c.report_agent_id=e.id', 'left')
-                ->join('a_store f', 'e.store_id=f.id', 'left')
-                ->join('a_district g', 'f.district_id=g.id', 'left')
+//                ->join('a_store f', 'e.store_id=f.id', 'left')
+//                ->join('a_district g', 'f.district_id=g.id', 'left')
                 ->limit($pageSize)
                 ->page($pageNo)
                 ->order($order_)
@@ -374,7 +374,7 @@ class OPayLogModel extends Model
      * @param string $params
      * @return int|string
      */
-    public function getAddPayLogOrderListLmitTotal($params = '')
+    public function getAddPayLogOrderListLimitTotal($params = '')
     {
         $params["a.is_del"] = 0;
         if (isset($params['e.name']) || isset($params['f.store_name']) || isset($params['e.phone'])) {