分佣表

application/index/controller/Finance.php

@@ -701,15 +701,38 @@ class Finance extends Basic
         $where['a.is_del']         = 0;
 
         if (!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['a.confirm_date'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
+            $income_where['income_time'] = [ '>= time', $this->params['create_time'] . ' 00:00:00' ];
         }
 
         if (!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['a.confirm_date'] = [ '<= time', $this->params['create_time'] . ' 23:59:59' ];
+            $income_where['income_time'] = [ '<= time', $this->params['end_time'] . ' 23:59:59' ];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['a.confirm_date'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59' ] ];
+            $income_where['income_time'] = [ 'between time', [ $this->params['create_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
+        }
+
+        if (!empty($income_where)) {
+            $m_real = new ORealIncome();
+            $bargain_arr = $m_real->getRealIncomeBargain('bargain_id', $income_where);
+
+            if ($bargain_arr['status'] == 'successful') {
+
+                if (empty($bargain_arr['data'])) {
+                    return $this->response(200, '');
+                }
+
+                foreach ($bargain_arr['data'] as $v) {
+                    $bargain_id[] = $v['bargain_id'];
+                }
+
+                if (!empty($bargain_id)) {
+                    $bargain_id_string = implode(',', $bargain_id);
+                    $where[] = ['EXP', 'b.id in ('.$bargain_id_string.') or b.father_id in ('.$bargain_id_string.')'];
+                }
+            } else {
+                return $this->response(101, '内部错误：'.$bargain_arr['msg']);
+            }
         }
 
         if (!empty($this->params['internal_address'])) {

application/model/OPartialCommission.php

@@ -78,6 +78,10 @@ class OPartialCommission extends BaseModel
             }
 
             $result[$k]['income_time'] = $m_real->where('id', $v['real_income_id'])->value('income_time');
+
+            if ($v['father_id'] != 0) {
+                $result[$k]['bargain_id'] = $v['father_id'];
+            }
         }
         return $result;
     }

application/model/ORealIncome.php

@@ -37,4 +37,24 @@ class ORealIncome extends BaseModel
             ->select();
     }
 
+    /**
+     * @param string $field
+     * @param $where
+     * @return mixed
+     */
+    public function getRealIncomeBargain($field = 'id as fee_id,money,income_time', $where) {
+        try {
+            $where['is_del'] = 0;
+            $result['data'] = $this->field($field)
+                ->where($where)
+                ->select();
+            $result['status'] = 'successful';
+        } catch (\Exception $e) {
+            $result['status'] = 'fail';
+            $result['msg'] = $e->getMessage();
+        }
+
+        return $result;
+    }
+
 }
\ No newline at end of file