|
|
@@ -861,7 +861,10 @@ class WholeController extends Curd
|
|
|
},
|
|
|
'order' => function ($query) {
|
|
|
$query->select('order_id', 'order_status_system', 'order_status_payment', 'order_status_storage');
|
|
|
- }
|
|
|
+ },
|
|
|
+ 'refund' => function ($query) {
|
|
|
+ $query->select('join_return_order_id', 'orders_return_id', 'order_return_status');
|
|
|
+ },
|
|
|
])->where('join_sheet_member_id', $memberId)
|
|
|
->orderBy('order_sheet_addtimes', 'desc')
|
|
|
->get()
|
|
|
@@ -882,6 +885,7 @@ class WholeController extends Curd
|
|
|
->leftJoin('member_benefit', 'member_benefit.member_benefit_id', '=', 'appointment.join_appointment_member_benefit_id')
|
|
|
// ->leftJoin('goods_sku', 'goods_sku.goods_sku_id', '=', 'appointment.join_appointment_goods_sku_id')
|
|
|
->where('join_appointment_member_id', $memberId)
|
|
|
+ ->whereIn('appointment_status',['WAITING','PENDING','DOING','DONE','CANCEL','REVOKE'])
|
|
|
->select('appointment.*',
|
|
|
// 'member.member_mobile',
|
|
|
// 'member_cert.member_cert_name',
|
gorden