完善功能

app/admin/controller/order/WholeController.php

@@ -17,6 +17,7 @@ use app\model\GoodsComponent;
 use app\model\Member;
 use app\model\MemberAccount;
 use app\model\MemberBenefit;
+use app\model\MemberRole;
 use app\model\Order;
 use app\model\OrderExpress;
 use app\model\OrderSheet;
@@ -75,6 +76,9 @@ class WholeController extends Curd
             },
             'member' => function ($query) {
                 $query->select('member_id', 'member_mobile');
+            },
+            'cert' => function ($query) {
+                $query->select('join_cert_member_id', 'member_cert_name');
             }
         ]);
         foreach ($where as $column => $value) {
@@ -138,7 +142,7 @@ class WholeController extends Curd
         $orderId = $request->get('order_id');
         $orderSheet = OrderSheet::with([
             'member' => function ($query) {
-                $query->select('member_id', 'member_mobile');
+                $query->select('member_id', 'member_mobile','member_is_owner','join_member_role_id');
             },
             'goods' => function ($query) {
                 $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify');
@@ -246,6 +250,10 @@ class WholeController extends Curd
                     }
                 }
             }
+            $item['member']['level'] = '普通用户';
+            if (!empty($item['member']['join_member_role_id'])){
+                $item['member']['level'] = MemberRole::where('member_role_id',$item['member']['join_member_role_id'])->value('member_role_name');
+            }
         }
 
         $order = Order::where('order_id', $orderId)->first();

app/admin/controller/sys_manage/HealthyClassroomController.php

@@ -82,10 +82,10 @@ class HealthyClassroomController extends Curd
     public function afterQuery($items)
     {
         foreach ($items as &$item) {
-            if (!empty($item->content_title_prefix)) {
-                $item->content_title_prefix = ltrim($item->content_title_prefix, '【');
-                $item->content_title_prefix = rtrim($item->content_title_prefix, '】');
-            }
+//            if (!empty($item->content_title_prefix)) {
+//                $item->content_title_prefix = ltrim($item->content_title_prefix, '【');
+//                $item->content_title_prefix = rtrim($item->content_title_prefix, '】');
+//            }
             if (!empty($item->content_config_json)) {
                 $configJson = json_decode($item->content_config_json, true);
                 foreach ($configJson as $key => $item1) {
@@ -139,7 +139,7 @@ class HealthyClassroomController extends Curd
         }
         $data = $this->inputFilter($params);
 
-        $data['content_title_prefix'] = '【'.$data['content_title_prefix'].'】';
+        $data['content_title_prefix'] = $data['content_title_prefix'];
         $data['content_category'] = 'CLASSROOM';
 
         return $data;
@@ -158,7 +158,7 @@ class HealthyClassroomController extends Curd
             $params['content_config_json'] = json_encode($params['content_config_json'], JSON_UNESCAPED_UNICODE);
         }
         $data = $this->inputFilter($params);
-        $data['content_title_prefix'] = '【'.$data['content_title_prefix'].'】';
+        $data['content_title_prefix'] = $data['content_title_prefix'];
         $model = $this->model->find($id);
         if (!$model) {
             throw new BusinessException('记录不存在', 2);

app/model/Order.php

@@ -28,11 +28,18 @@ class Order extends Model
         return $date->format('Y-m-d H:i:s');
     }
 
-    public function sheet(){
-        return $this->hasOne(OrderSheet::class,'join_sheet_order_id','order_id');
+    public function sheet()
+    {
+        return $this->hasOne(OrderSheet::class, 'join_sheet_order_id', 'order_id');
     }
 
-    public function member(){
-        return $this->hasOne(Member::class,'member_id','join_order_member_id');
+    public function member()
+    {
+        return $this->hasOne(Member::class, 'member_id', 'join_order_member_id');
+    }
+
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_order_member_id');
     }
 }