Browse Source

完善功能

gorden 8 months ago
parent
commit
3696996d46

+ 1 - 0
app/admin/controller/order/AppointmentController.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\order;
 
 use app\admin\service\order\AppointmentService;
+use app\model\Appointment;
 use support\Request;
 use support\Response;
 

+ 3 - 1
app/admin/service/order/AppointmentService.php

@@ -39,6 +39,7 @@ class AppointmentService
             ->leftJoin('goods', 'goods.goods_id', '=', 'appointment.join_appointment_goods_id')
             ->leftJoin('order', 'order.order_id', '=', 'appointment.join_appointment_order_id')
             ->leftJoin('member_benefit', 'member_benefit.member_benefit_id', '=', 'appointment.join_appointment_member_benefit_id')
+            // ->leftJoin('member_quota', 'member_quota.member_quota_id', '=', 'appointment.join_appointment_member_benefit_id')
             ->leftJoin('goods_sku', 'goods_sku.goods_sku_id', '=', 'appointment.join_appointment_goods_sku_id')
             ->whereIn('appointment_status',['PAYING','WAITING','PENDING','DOING','DONE','CANCEL','REVOKE'])
             ->when($id != '', function ($query) use ($id) {
@@ -58,7 +59,8 @@ class AppointmentService
             'order.order_name', 'goods_sku.goods_sku_specs_json', 'order.order_amount_total', 'order.order_amount_pay',
             'order.order_category', 'order.order_status_system', 'order.order_status_payment', 'order.order_status_storage',
             'order.order_addtimes',
-            'member_benefit.member_benefit_name'
+            'member_benefit.member_benefit_name','member_benefit.member_benefit_id as benefit_id',
+            // 'member_quota.member_quota_id as quota_id','member_quota.member_quota_name'
         )
             ->orderBy('appointment.appointment_addtimes', 'desc')
             ->forPage($page, $pageSize)