wesmiler

app/Models/OrderCommissionModel.php

@@ -0,0 +1,24 @@
+<?php
+// +----------------------------------------------------------------------
+// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 LARAVEL研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: laravel开发员 <laravel.qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 订单佣金数据管理-模型
+ * @author laravel开发员
+ * @since 2020/11/11
+ * @package App\Models
+ */
+class OrderCommissionModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'orders_commissions';
+}

app/Models/OrderModel.php

@@ -67,6 +67,15 @@ class OrderModel extends BaseModel
             ->select(['id', 'name', 'logo','mobile']);
     }
 
+    /**
+     * 佣金数据
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function commission()
+    {
+        return $this->hasOne(OrderCommissionModel::class, 'order_no', 'order_no');
+    }
+
 
     /**
      * 经手人

app/Services/Common/OrderService.php

@@ -76,11 +76,6 @@ class OrderService extends BaseService
             $query->where('store_id', $params['store_id']);
         }
 
-        // 会议
-        if (isset($params['meeting_id']) && $params['meeting_id'] > 0) {
-            $query->where('meeting_id', $params['meeting_id']);
-        }
-
         // 用户筛选
         if (isset($params['user_id']) && $params['user_id'] > 0) {
             $query->where('user_id', $params['user_id']);
@@ -146,7 +141,7 @@ class OrderService extends BaseService
             'complete' =>  $query4->where(['status'=>4])->count('id'),
         ];
 
-        $list = $query->with(['user', 'orderGoods', 'store','meeting'])
+        $list = $query->with(['user', 'orderGoods', 'store','commission'])
             ->orderBy('create_time', 'desc')
             ->orderBy('id', 'desc')
             ->paginate($pageSize);