分佣提成列表显示修改

application/index/controller/Finance.php

@@ -478,7 +478,7 @@ class Finance extends Basic
             $fields            = 'a.id,a.role,a.agent_id,a.scale,a.scale_fee,a.father_id';
             $where[0]          = [ 'EXP', "a.id = {$this->params['id']} or a.father_id = {$this->params['id']}" ];
             $where['a.status'] = [ '<>', 30 ];
-            $data['data']      = $m_comm->getBargainPartial(1, 100, 'a.id desc', $fields, $where);
+            $data['data']      = $m_comm->getBargainPartial(1, 100, 'a.id desc', $fields, $where, $this->params['id']);
         }
 
         return $this->response($data['code'], $data['msg'], $data['data']);

application/model/OBargainModel.php

@@ -1027,7 +1027,7 @@ class OBargainModel extends Model
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function getBargainPartial($pageNo, $pageSize, $order_ = 'id desc', $fields, $where)
+    public function getBargainPartial($pageNo, $pageSize, $order_ = 'id desc', $fields, $where, $bargain_id = 0)
     {
         $data = $this->field($fields)
             ->alias('a')
@@ -1087,11 +1087,21 @@ class OBargainModel extends Model
                 ->order("id asc")
                 ->select();
             foreach ($partial_commission as $k2 => $v2) {
-                $income_time = $m_real->field('id,income_time')->find($v2['real_income_id']);
-                if (empty($income_time)) {
-                    $partial_commission[$k2]['income_time'] = [];
+                if (empty($v2['real_income_id'])) {
+                    $income_time = $m_real->field('id,income_time')->where('bargain_id', $bargain_id)->select();
+                    //当只有一个收入日期，给前端显示用
+                    if (count($income_time) == 1) {
+                        $income_time_add['id'] = $income_time[0]['id'];
+                        $income_time_add['income_time'] = $income_time[0]['income_time'];
+                        $partial_commission[$k2]['income_time_add'] = $income_time_add;
+                    }
                 } else {
-                    $partial_commission[$k2]['income_time'] = $income_time;
+                    $income_time = $m_real->field('id,income_time')->find($v2['real_income_id']);
+                    if (empty($income_time)) {
+                        $partial_commission[$k2]['income_time'] = [];
+                    } else {
+                        $partial_commission[$k2]['income_time'] = $income_time;
+                    }
                 }
             }
             //todo 最后一个分佣提成如果不为空则取其值