Browse Source

完善功能

gorden 10 months ago
parent
commit
b909ff91a4

+ 3 - 1
app/admin/controller/order/WholeController.php

@@ -68,7 +68,9 @@ class WholeController extends Curd
             },
             'goods' => function ($query) {
                 $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify');
-            }
+            },
+            'memberInfo',
+            'cert'
         ])->where('join_sheet_order_id', $orderId)
             ->get()
             ->toArray();

+ 0 - 1
app/admin/service/member/MemberService.php

@@ -138,7 +138,6 @@ class MemberService
                 'member_status' => $params['status'],
                 'member_mobile' => $params['mobile'],
                 'member_from' => $params['source'],
-                'member_addtimes' => time(),
             ];
             Member::where('member_id', $params['member_id'])->update($memberData);
             // member cert

+ 10 - 0
app/model/OrderSheet.php

@@ -34,6 +34,16 @@ class OrderSheet extends Model
         return $this->hasOne(Member::class, 'member_id', 'join_sheet_member_id');
     }
 
+    public function memberInfo(){
+        return $this->hasOne(MemberInfo::class,'join_info_member_id','join_sheet_member_id')
+            ->select('join_info_member_id','member_info_nickname');
+    }
+
+    public function cert(){
+        return $this->hasOne(MemberCert::class,'join_cert_member_id','join_sheet_member_id')
+            ->select('join_cert_member_id','member_cert_name');
+    }
+
     /**
      * @Desc 关联Goods
      * @Author Gorden