|
@@ -223,34 +223,36 @@ class WholeController extends Curd
|
|
|
$benifit = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
|
|
|
->where('join_benefit_order_id', $orderId)
|
|
|
->first();
|
|
|
- $item['benefit'] = [
|
|
|
- 'total' => intval($benifit->member_benefit_limit_count),
|
|
|
- 'used' => intval($benifit->member_benefit_used_count),
|
|
|
- 'cut' => $benifit->member_benefit_limit_count - $benifit->member_benefit_used_count,
|
|
|
- ];
|
|
|
- $appontments = Appointment::where('join_appointment_member_benefit_id', $benifit->member_benefit_id)
|
|
|
- ->where('appointment_status', 'DONE')
|
|
|
- ->select('appointment_id', 'appointment_done_datetime', 'appointment_done_json')
|
|
|
- ->get()
|
|
|
- ->toArray();
|
|
|
- $item['appontment'] = [];
|
|
|
- foreach ($appontments as $appontment) {
|
|
|
- $doneJson = [];
|
|
|
- $username = '';
|
|
|
- if (!empty($appontment['appointment_done_json'])) {
|
|
|
- $doneJson = json_decode($appontment['appointment_done_json'], true);
|
|
|
- if (isset($doneJson['charge'])) {
|
|
|
- $username = SysUser::where('user_id', $doneJson['charge']['charge_user_id'])->value('user_name');
|
|
|
+ if(!empty($benifit)){
|
|
|
+ $item['benefit'] = [
|
|
|
+ 'total' => intval($benifit->member_benefit_limit_count),
|
|
|
+ 'used' => intval($benifit->member_benefit_used_count),
|
|
|
+ 'cut' => $benifit->member_benefit_limit_count - $benifit->member_benefit_used_count,
|
|
|
+ ];
|
|
|
+ $appontments = Appointment::where('join_appointment_member_benefit_id', $benifit->member_benefit_id)
|
|
|
+ ->where('appointment_status', 'DONE')
|
|
|
+ ->select('appointment_id', 'appointment_done_datetime', 'appointment_done_json')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
+ $item['appontment'] = [];
|
|
|
+ foreach ($appontments as $appontment) {
|
|
|
+ $doneJson = [];
|
|
|
+ $username = '';
|
|
|
+ if (!empty($appontment['appointment_done_json'])) {
|
|
|
+ $doneJson = json_decode($appontment['appointment_done_json'], true);
|
|
|
+ if (isset($doneJson['charge'])) {
|
|
|
+ $username = SysUser::where('user_id', $doneJson['charge']['charge_user_id'])->value('user_name');
|
|
|
+ }
|
|
|
}
|
|
|
+ $item['appontment'][] = [
|
|
|
+ 'member' => ($item['cert']['member_cert_name'] ? $item['cert']['member_cert_name'] . '-' : '') . $item['member']['member_mobile'],
|
|
|
+ 'goods_name' => $item['goods']['goods_name'],
|
|
|
+ 'premisses' => isset($doneJson['charge']) ? $doneJson['charge']['charge_premises'] : '',
|
|
|
+ 'username' => $username,
|
|
|
+ 'nbr' => 1,
|
|
|
+ 'done_time' => $appontment['appointment_done_datetime']
|
|
|
+ ];
|
|
|
}
|
|
|
- $item['appontment'][] = [
|
|
|
- 'member' => ($item['cert']['member_cert_name'] ? $item['cert']['member_cert_name'] . '-' : '') . $item['member']['member_mobile'],
|
|
|
- 'goods_name' => $item['goods']['goods_name'],
|
|
|
- 'premisses' => isset($doneJson['charge']) ? $doneJson['charge']['charge_premises'] : '',
|
|
|
- 'username' => $username,
|
|
|
- 'nbr' => 1,
|
|
|
- 'done_time' => $appontment['appointment_done_datetime']
|
|
|
- ];
|
|
|
}
|
|
|
}
|
|
|
if (!empty($item['order_sheet_extend_json']) && !$express) {
|