|
|
@@ -39,7 +39,6 @@ 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) {
|
|
|
@@ -59,8 +58,7 @@ 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_id as benefit_id',
|
|
|
- // 'member_quota.member_quota_id as quota_id','member_quota.member_quota_name'
|
|
|
+ 'member_benefit.member_benefit_name','member_benefit.member_benefit_id as benefit_id'
|
|
|
)
|
|
|
->orderBy('appointment.appointment_addtimes', 'desc')
|
|
|
->forPage($page, $pageSize)
|
gorden