|
|
@@ -292,268 +292,270 @@ class WholeController extends Curd
|
|
|
*/
|
|
|
public function sheet(Request $request)
|
|
|
{
|
|
|
- $orderId = $request->get('order_id');
|
|
|
- $orderSheet = OrderSheet::with([
|
|
|
- 'member' => function ($query) {
|
|
|
- $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
|
|
|
- },
|
|
|
- 'goods' => function ($query) {
|
|
|
- $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');
|
|
|
- },
|
|
|
- 'memberInfo',
|
|
|
- 'cert',
|
|
|
- 'sku' => function ($query) {
|
|
|
- $query->where('goods_sku_status', 'ON')
|
|
|
- ->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price');
|
|
|
- },
|
|
|
- 'skus',
|
|
|
- 'refund' => function ($query) {
|
|
|
- $query->select('join_return_order_id', 'order_return_status');
|
|
|
- }
|
|
|
- ])->where('join_sheet_order_id', $orderId)
|
|
|
- ->orderBy('order_sheet_id', 'DESC')
|
|
|
- ->get()
|
|
|
- ->toArray();
|
|
|
-
|
|
|
- $order = Order::where('order_id', $orderId)->first();
|
|
|
- $express = OrderExpress::where('join_express_order_id', $orderId)->first();
|
|
|
- $premises = '';
|
|
|
- if ($express && $express->order_express_type == '自提') {
|
|
|
- $premises = $express->order_express_company;
|
|
|
- }
|
|
|
- $sheetAmount = 0;
|
|
|
- foreach ($orderSheet as &$item) {
|
|
|
- $sheetAmount += $item['order_sheet_amount'];
|
|
|
- $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
|
|
|
- if (!empty($item['goods']) && $item['goods']['goods_classify'] == 'PACKAGE') {
|
|
|
- $components = GoodsComponent::with('goods')
|
|
|
- ->where('join_component_master_goods_id', $item['goods']['goods_id'])
|
|
|
- ->select('join_component_master_goods_id', 'join_component_goods_id', 'goods_component_price',
|
|
|
- 'goods_component_price', 'goods_component_json')
|
|
|
- ->get()
|
|
|
- ->toArray();
|
|
|
- $goodsArr = [];
|
|
|
- foreach ($components as $component) {
|
|
|
- $configJson = !empty($component['goods_component_json']) ? json_decode($component['goods_component_json'], true) : [];
|
|
|
- if (!empty($component['goods'])) {
|
|
|
- $supplierName = Supplier::where('supplier_id', $component['goods']['join_goods_supplier_id'])->value('supplier_name');
|
|
|
- $benefit = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
|
|
|
- ->where('join_benefit_goods_id', $component['goods']['goods_id'])
|
|
|
- ->where('join_benefit_order_id', $orderId)
|
|
|
- ->first();
|
|
|
- $goodsArr[] = [
|
|
|
- 'goods_name' => $component['goods']['goods_name'],
|
|
|
- 'goods_cover' => getenv('STORAGE_DOMAIN') . $component['goods']['goods_cover'],
|
|
|
- 'supplier_name' => $supplierName,
|
|
|
- 'nbr' => $configJson['nbr'] ?? 0,
|
|
|
- 'used' => !empty($benefit->member_benefit_used_count) ? intval($benefit->member_benefit_used_count) : ''
|
|
|
- ];
|
|
|
- }
|
|
|
+ try {
|
|
|
+ $orderId = $request->get('order_id');
|
|
|
+ $orderSheet = OrderSheet::with([
|
|
|
+ 'member' => function ($query) {
|
|
|
+ $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
|
|
|
+ },
|
|
|
+ 'goods' => function ($query) {
|
|
|
+ $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');
|
|
|
+ },
|
|
|
+ 'memberInfo',
|
|
|
+ 'cert',
|
|
|
+ 'sku' => function ($query) {
|
|
|
+ $query->where('goods_sku_status', 'ON')
|
|
|
+ ->select('goods_sku_id', 'join_sku_goods_id', 'goods_sku_specs_json', 'goods_sku_sales_price');
|
|
|
+ },
|
|
|
+ 'skus',
|
|
|
+ 'refund' => function ($query) {
|
|
|
+ $query->select('join_return_order_id', 'order_return_status');
|
|
|
}
|
|
|
+ ])->where('join_sheet_order_id', $orderId)
|
|
|
+ ->orderBy('order_sheet_id', 'DESC')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
|
|
|
- $item['goods']['components'] = $goodsArr;
|
|
|
- }
|
|
|
- if (!empty($item['sku'])) {
|
|
|
- if (!empty($item['sku']['goods_sku_specs_json'])) {
|
|
|
- $specsJson = json_decode($item['sku']['goods_sku_specs_json'], true);
|
|
|
- $skuName = '';
|
|
|
- foreach ($specsJson as $specsKey => $skuSpecs) {
|
|
|
- if (is_array($skuSpecs)) {
|
|
|
- $skuName = $skuName . ' ' . implode(' ', $skuSpecs) . ';';
|
|
|
- } else {
|
|
|
- $skuName = $skuName . ' ' . $skuSpecs . ';';
|
|
|
+ $order = Order::where('order_id', $orderId)->first();
|
|
|
+ $express = OrderExpress::where('join_express_order_id', $orderId)->first();
|
|
|
+ $premises = '';
|
|
|
+ if ($express && $express->order_express_type == '自提') {
|
|
|
+ $premises = $express->order_express_company;
|
|
|
+ }
|
|
|
+ $sheetAmount = 0;
|
|
|
+ foreach ($orderSheet as &$item) {
|
|
|
+ $sheetAmount += $item['order_sheet_amount'];
|
|
|
+ $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
|
|
|
+ if (!empty($item['goods']) && $item['goods']['goods_classify'] == 'PACKAGE') {
|
|
|
+ $components = GoodsComponent::with('goods')
|
|
|
+ ->where('join_component_master_goods_id', $item['goods']['goods_id'])
|
|
|
+ ->select('join_component_master_goods_id', 'join_component_goods_id', 'goods_component_price',
|
|
|
+ 'goods_component_price', 'goods_component_json')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
+ $goodsArr = [];
|
|
|
+ foreach ($components as $component) {
|
|
|
+ $configJson = !empty($component['goods_component_json']) ? json_decode($component['goods_component_json'], true) : [];
|
|
|
+ if (!empty($component['goods'])) {
|
|
|
+ $supplierName = Supplier::where('supplier_id', $component['goods']['join_goods_supplier_id'])->value('supplier_name');
|
|
|
+ $benefit = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
|
|
|
+ ->where('join_benefit_goods_id', $component['goods']['goods_id'])
|
|
|
+ ->where('join_benefit_order_id', $orderId)
|
|
|
+ ->first();
|
|
|
+ $goodsArr[] = [
|
|
|
+ 'goods_name' => $component['goods']['goods_name'],
|
|
|
+ 'goods_cover' => getenv('STORAGE_DOMAIN') . $component['goods']['goods_cover'],
|
|
|
+ 'supplier_name' => $supplierName,
|
|
|
+ 'nbr' => $configJson['nbr'] ?? 0,
|
|
|
+ 'used' => !empty($benefit->member_benefit_used_count) ? intval($benefit->member_benefit_used_count) : ''
|
|
|
+ ];
|
|
|
}
|
|
|
}
|
|
|
- $item['sku']['goods_sku_title'] = rtrim($skuName, ';');
|
|
|
- }
|
|
|
- }
|
|
|
- if (!empty($item['skus'])) {
|
|
|
- foreach ($item['skus'] as $key => $skus) {
|
|
|
- if (!empty($skus['goods_sku_specs_json'])) {
|
|
|
- $item['skus'][$key]['goods_sku_specs_json'] = json_decode($skus['goods_sku_specs_json']);
|
|
|
|
|
|
+ $item['goods']['components'] = $goodsArr;
|
|
|
+ }
|
|
|
+ if (!empty($item['sku'])) {
|
|
|
+ if (!empty($item['sku']['goods_sku_specs_json'])) {
|
|
|
+ $specsJson = json_decode($item['sku']['goods_sku_specs_json'], true);
|
|
|
$skuName = '';
|
|
|
- foreach ($item['skus'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
|
|
|
- $keyStr = ($specsKey == '规格') ? '' : ($specsKey . ':');
|
|
|
+ foreach ($specsJson as $specsKey => $skuSpecs) {
|
|
|
if (is_array($skuSpecs)) {
|
|
|
- $skuName = $skuName . $keyStr . ' ' . implode(' ', $skuSpecs) . '; ';
|
|
|
+ $skuName = $skuName . ' ' . implode(' ', $skuSpecs) . ';';
|
|
|
} else {
|
|
|
- $skuName = $skuName . $keyStr . ' ' . $skuSpecs . '; ';
|
|
|
+ $skuName = $skuName . ' ' . $skuSpecs . ';';
|
|
|
}
|
|
|
}
|
|
|
- $item['skus'][$key]['sku_name'] = rtrim($skuName, '; ');
|
|
|
+ $item['sku']['goods_sku_title'] = rtrim($skuName, ';');
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- $item['skus'] = [];
|
|
|
- }
|
|
|
- if (in_array($item['goods']['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE']) && $order->order_status_system == 'DONE') {
|
|
|
- $item['appontment'] = [];
|
|
|
- $appontments = Appointment::where('join_appointment_order_id', $orderId)
|
|
|
- ->where('appointment_status', 'DONE')
|
|
|
- ->select('appointment_status', 'appointment_id', 'appointment_done_datetime', 'appointment_done_json', 'appointment_apply_json')
|
|
|
- ->get()
|
|
|
- ->toArray();
|
|
|
- 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($item['skus'])) {
|
|
|
+ foreach ($item['skus'] as $key => $skus) {
|
|
|
+ if (!empty($skus['goods_sku_specs_json'])) {
|
|
|
+ $item['skus'][$key]['goods_sku_specs_json'] = json_decode($skus['goods_sku_specs_json']);
|
|
|
+
|
|
|
+ $skuName = '';
|
|
|
+ foreach ($item['skus'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
|
|
|
+ $keyStr = ($specsKey == '规格') ? '' : ($specsKey . ':');
|
|
|
+ if (is_array($skuSpecs)) {
|
|
|
+ $skuName = $skuName . $keyStr . ' ' . implode(' ', $skuSpecs) . '; ';
|
|
|
+ } else {
|
|
|
+ $skuName = $skuName . $keyStr . ' ' . $skuSpecs . '; ';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $item['skus'][$key]['sku_name'] = rtrim($skuName, '; ');
|
|
|
}
|
|
|
}
|
|
|
- $person = 1;
|
|
|
- if (!empty($appontment->appointment_apply_json)) {
|
|
|
- $applyJson = json_decode($appontment->appointment_apply_json, true);
|
|
|
- if (isset($applyJson['person'])) {
|
|
|
- $person = $applyJson['person'];
|
|
|
+ } else {
|
|
|
+ $item['skus'] = [];
|
|
|
+ }
|
|
|
+ if (in_array($item['goods']['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE']) && $order->order_status_system == 'DONE') {
|
|
|
+ $item['appontment'] = [];
|
|
|
+ $appontments = Appointment::where('join_appointment_order_id', $orderId)
|
|
|
+ ->where('appointment_status', 'DONE')
|
|
|
+ ->select('appointment_status', 'appointment_id', 'appointment_done_datetime', 'appointment_done_json', 'appointment_apply_json')
|
|
|
+ ->get()
|
|
|
+ ->toArray();
|
|
|
+ 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');
|
|
|
+ }
|
|
|
}
|
|
|
+ $person = 1;
|
|
|
+ if (!empty($appontment->appointment_apply_json)) {
|
|
|
+ $applyJson = json_decode($appontment->appointment_apply_json, true);
|
|
|
+ if (isset($applyJson['person'])) {
|
|
|
+ $person = $applyJson['person'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $item['appontment'][] = [
|
|
|
+ 'member' => ($item['cert'] ? $item['cert']['member_cert_name'] . '-' : '') . ($item['member'] ? $item['member']['member_mobile'] : ''),
|
|
|
+ 'goods_name' => $item['goods']['goods_name'],
|
|
|
+ 'premisses' => isset($doneJson['charge']) ? $doneJson['charge']['charge_premises'] : '',
|
|
|
+ 'username' => $username,
|
|
|
+ 'nbr' => $person,
|
|
|
+ 'done_time' => $appontment['appointment_done_datetime'],
|
|
|
+ 'appointment_status' => $appontment['appointment_status'],
|
|
|
+ ];
|
|
|
}
|
|
|
- $item['appontment'][] = [
|
|
|
- 'member' => ($item['cert'] ? $item['cert']['member_cert_name'] . '-' : '') . ($item['member'] ? $item['member']['member_mobile'] : ''),
|
|
|
- 'goods_name' => $item['goods']['goods_name'],
|
|
|
- 'premisses' => isset($doneJson['charge']) ? $doneJson['charge']['charge_premises'] : '',
|
|
|
- 'username' => $username,
|
|
|
- 'nbr' => $person,
|
|
|
- 'done_time' => $appontment['appointment_done_datetime'],
|
|
|
- 'appointment_status' => $appontment['appointment_status'],
|
|
|
- ];
|
|
|
}
|
|
|
- }
|
|
|
- if (!empty($item['order_sheet_extend_json']) && !$express) {
|
|
|
- $extendJson = json_decode($item['order_sheet_extend_json'], true);
|
|
|
- if (isset($extendJson['address_id'])) {
|
|
|
- $address = ClientConfig::where('client_config_id', $extendJson['address_id'])->first();
|
|
|
- if (!empty($address)) {
|
|
|
- $valJson = json_decode($address->client_config_val_json, true);
|
|
|
- $express = [
|
|
|
- 'order_express_address' => $valJson['address'] . ($valJson['numbers'] ?? ''),
|
|
|
- 'order_express_city' => $valJson['city'],
|
|
|
- 'order_express_mobile' => $valJson['mobile'],
|
|
|
- 'order_express_person' => $valJson['person']
|
|
|
- ];
|
|
|
+ if (!empty($item['order_sheet_extend_json']) && !$express) {
|
|
|
+ $extendJson = json_decode($item['order_sheet_extend_json'], true);
|
|
|
+ if (isset($extendJson['address_id'])) {
|
|
|
+ $address = ClientConfig::where('client_config_id', $extendJson['address_id'])->first();
|
|
|
+ if (!empty($address)) {
|
|
|
+ $valJson = json_decode($address->client_config_val_json, true);
|
|
|
+ $express = [
|
|
|
+ 'order_express_address' => $valJson['address'] . ($valJson['numbers'] ?? ''),
|
|
|
+ 'order_express_city' => $valJson['city'],
|
|
|
+ 'order_express_mobile' => $valJson['mobile'],
|
|
|
+ 'order_express_person' => $valJson['person']
|
|
|
+ ];
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ $item['member']['level'] = '普通用户';
|
|
|
+ if (!empty($item['member']['join_member_role_id'])) {
|
|
|
+ $item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
|
|
|
+ }
|
|
|
}
|
|
|
- $item['member']['level'] = '普通用户';
|
|
|
- if (!empty($item['member']['join_member_role_id'])) {
|
|
|
- $item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
|
|
|
+ $order->sheet_amount = number_format($sheetAmount, 2);
|
|
|
+
|
|
|
+ $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
|
|
|
+ ->where('pay_category', '<>', 'REFUND')
|
|
|
+ ->where('pay_status', 'SUCCESS')
|
|
|
+ ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
|
|
|
+ ->get();
|
|
|
+ if (count($payDetails) > 1) {
|
|
|
+ $order->pay_category = 'CONSTITUTE';
|
|
|
}
|
|
|
- }
|
|
|
- dump(1);
|
|
|
- $order->sheet_amount = number_format($sheetAmount, 2);
|
|
|
-
|
|
|
- $payDetails = PayDetail::where('join_pay_order_id', $order->order_groupby)
|
|
|
- ->where('pay_category', '<>', 'REFUND')
|
|
|
- ->where('pay_status', 'SUCCESS')
|
|
|
- ->select('pay_id', 'pay_category', 'pay_prepayid', 'pay_paytimes', 'pay_status', 'pay_amount', 'pay_extend_json')
|
|
|
- ->get();
|
|
|
- dump($payDetails);
|
|
|
- if (count($payDetails) > 1) {
|
|
|
- $order->pay_category = 'CONSTITUTE';
|
|
|
- }
|
|
|
- $payDetail = !empty($payDetails) && count($payDetails) > 0 ? $payDetails[0] : [];
|
|
|
- if (!empty($payDetail) && !empty($payDetail->pay_extend_json)) {
|
|
|
- $payExtendJson = json_decode($payDetail->pay_extend_json, true);
|
|
|
- $order->cancel_times = $payExtendJson['cancel_times'] ?? '';
|
|
|
+ $payDetail = !empty($payDetails) && count($payDetails) > 0 ? $payDetails[0] : [];
|
|
|
+ if (!empty($payDetail) && !empty($payDetail->pay_extend_json)) {
|
|
|
+ $payExtendJson = json_decode($payDetail->pay_extend_json, true);
|
|
|
+ $order->cancel_times = $payExtendJson['cancel_times'] ?? '';
|
|
|
// $payDetail->cancel_times = $payExtendJson['cancel_times'] ?? '';
|
|
|
- }
|
|
|
- if (!empty($payDetail) && !empty($payDetail->pay_prepayid)) {
|
|
|
- $categoryArray = explode('-', $payDetail->pay_prepayid);
|
|
|
- if (isset($categoryArray[1])) {
|
|
|
- $payDetail->pay_category = $categoryArray[1];
|
|
|
- } else if (in_array($categoryArray[0], ['WXPAY', 'ALIPAY', 'OFFLINE', 'OFFLINE_ALIPAY', 'OFFLINE_WXPAY', 'MONEY'])) {
|
|
|
- $payDetail->pay_category = $categoryArray[0];
|
|
|
}
|
|
|
- }
|
|
|
- $refund = OrderReturn::where('join_return_order_id', $orderId)
|
|
|
- ->select('order_return_status', 'order_return_apply_datetime', 'order_return_apply_json', 'order_return_accept_datetime', 'order_return_refund_json', 'order_return_extend_json')
|
|
|
- ->first();
|
|
|
- if (!empty($refund->order_return_refund_json)) {
|
|
|
- $returnRefundJson = json_decode($refund->order_return_refund_json, true);
|
|
|
- if (isset($returnRefundJson['user_id'])) {
|
|
|
- $userName = SysUser::where('user_id', $returnRefundJson['user_id'])->value('user_name');
|
|
|
- $returnRefundJson['person'] = $userName;
|
|
|
- unset($returnRefundJson['user_id']);
|
|
|
+ if (!empty($payDetail) && !empty($payDetail->pay_prepayid)) {
|
|
|
+ $categoryArray = explode('-', $payDetail->pay_prepayid);
|
|
|
+ if (isset($categoryArray[1])) {
|
|
|
+ $payDetail->pay_category = $categoryArray[1];
|
|
|
+ } else if (in_array($categoryArray[0], ['WXPAY', 'ALIPAY', 'OFFLINE', 'OFFLINE_ALIPAY', 'OFFLINE_WXPAY', 'MONEY'])) {
|
|
|
+ $payDetail->pay_category = $categoryArray[0];
|
|
|
+ }
|
|
|
}
|
|
|
+ $refund = OrderReturn::where('join_return_order_id', $orderId)
|
|
|
+ ->select('order_return_status', 'order_return_apply_datetime', 'order_return_apply_json', 'order_return_accept_datetime', 'order_return_refund_json', 'order_return_extend_json')
|
|
|
+ ->first();
|
|
|
+ if (!empty($refund->order_return_refund_json)) {
|
|
|
+ $returnRefundJson = json_decode($refund->order_return_refund_json, true);
|
|
|
+ if (isset($returnRefundJson['user_id'])) {
|
|
|
+ $userName = SysUser::where('user_id', $returnRefundJson['user_id'])->value('user_name');
|
|
|
+ $returnRefundJson['person'] = $userName;
|
|
|
+ unset($returnRefundJson['user_id']);
|
|
|
+ }
|
|
|
|
|
|
- $refund->order_return_refund_json = json_encode($returnRefundJson);
|
|
|
- }
|
|
|
- if (!empty($order->order_config_json)) {
|
|
|
- $orderConfigJson = json_decode($order->order_config_json, true);
|
|
|
- if (isset($orderConfigJson['reach'])) {
|
|
|
- $order->reach = $orderConfigJson['reach'];
|
|
|
- }
|
|
|
- if (isset($orderConfigJson['table'])) {
|
|
|
- $order->table = $orderConfigJson['table'];
|
|
|
+ $refund->order_return_refund_json = json_encode($returnRefundJson);
|
|
|
}
|
|
|
- if (isset($orderConfigJson['eat'])) {
|
|
|
- $order->eat = $orderConfigJson['eat'];
|
|
|
- }
|
|
|
- if (isset($orderConfigJson['express'])) {
|
|
|
- $order->express = $orderConfigJson['express'];
|
|
|
- }
|
|
|
- if (isset($orderConfigJson['premises'])) {
|
|
|
- $order->premises = $orderConfigJson['premises'];
|
|
|
- }
|
|
|
- if (isset($orderConfigJson['tableid'])) {
|
|
|
- $order->dept_table_id = $orderConfigJson['tableid'];
|
|
|
+ if (!empty($order->order_config_json)) {
|
|
|
+ $orderConfigJson = json_decode($order->order_config_json, true);
|
|
|
+ if (isset($orderConfigJson['reach'])) {
|
|
|
+ $order->reach = $orderConfigJson['reach'];
|
|
|
+ }
|
|
|
+ if (isset($orderConfigJson['table'])) {
|
|
|
+ $order->table = $orderConfigJson['table'];
|
|
|
+ }
|
|
|
+ if (isset($orderConfigJson['eat'])) {
|
|
|
+ $order->eat = $orderConfigJson['eat'];
|
|
|
+ }
|
|
|
+ if (isset($orderConfigJson['express'])) {
|
|
|
+ $order->express = $orderConfigJson['express'];
|
|
|
+ }
|
|
|
+ if (isset($orderConfigJson['premises'])) {
|
|
|
+ $order->premises = $orderConfigJson['premises'];
|
|
|
+ }
|
|
|
+ if (isset($orderConfigJson['tableid'])) {
|
|
|
+ $order->dept_table_id = $orderConfigJson['tableid'];
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (!empty($order->order_extend_json)) {
|
|
|
- $orderExtendJson = json_decode($order->order_extend_json, true);
|
|
|
- $order->referee = $orderExtendJson['referee'] ?? '';
|
|
|
- if (isset($orderExtendJson['cancel_times'])) {
|
|
|
- $order->cancel_times = $orderExtendJson['cancel_times'];
|
|
|
+ if (!empty($order->order_extend_json)) {
|
|
|
+ $orderExtendJson = json_decode($order->order_extend_json, true);
|
|
|
+ $order->referee = $orderExtendJson['referee'] ?? '';
|
|
|
+ if (isset($orderExtendJson['cancel_times'])) {
|
|
|
+ $order->cancel_times = $orderExtendJson['cancel_times'];
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
|
|
|
- if (!empty($order->order_discount_json)) {
|
|
|
- $orderDiscountJson = json_decode($order->order_discount_json, true);
|
|
|
- foreach ($orderDiscountJson as $discountItem) {
|
|
|
- if (!empty($discountItem['coupon_id'])) {
|
|
|
- $coupon = Coupon::where('coupon_id', $discountItem['coupon_id'])
|
|
|
- ->select('coupon_name', 'coupon_classify', 'coupon_category', 'coupon_value', 'coupon_minimum_limit')
|
|
|
- ->first();
|
|
|
- if (!$coupon) {
|
|
|
- continue;
|
|
|
+ $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
|
|
|
+ if (!empty($order->order_discount_json)) {
|
|
|
+ $orderDiscountJson = json_decode($order->order_discount_json, true);
|
|
|
+ foreach ($orderDiscountJson as $discountItem) {
|
|
|
+ if (!empty($discountItem['coupon_id'])) {
|
|
|
+ $coupon = Coupon::where('coupon_id', $discountItem['coupon_id'])
|
|
|
+ ->select('coupon_name', 'coupon_classify', 'coupon_category', 'coupon_value', 'coupon_minimum_limit')
|
|
|
+ ->first();
|
|
|
+ if (!$coupon) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ $classify = CouponService::couponClassifyInfo($coupon->coupon_classify, $coupon->coupon_category, $coupon->coupon_value, $coupon->coupon_minimum_limit);
|
|
|
+ $discount['coupon_name'] .= $coupon->coupon_classify . '：' . $coupon->coupon_name . '(优惠￥' . $discountItem['coupon_value'] . '), ';
|
|
|
}
|
|
|
- $classify = CouponService::couponClassifyInfo($coupon->coupon_classify, $coupon->coupon_category, $coupon->coupon_value, $coupon->coupon_minimum_limit);
|
|
|
- $discount['coupon_name'] .= $coupon->coupon_classify . '：' . $coupon->coupon_name . '(优惠￥' . $discountItem['coupon_value'] . '), ';
|
|
|
- }
|
|
|
- if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
|
|
|
- if (!empty($discountItem['coupon_detail_id'])) {
|
|
|
- $discount['classify'] .= $discountItem['coupon_detail_id'][0] . '(优惠￥' . round($discountItem['coupon_value'], 2) . '), ';
|
|
|
- } else {
|
|
|
- $discount['classify'] .= $discountItem['coupon_classify'] . '(优惠￥' . round($discountItem['coupon_value'], 2) . '), ';
|
|
|
+ if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
|
|
|
+ if (!empty($discountItem['coupon_detail_id'])) {
|
|
|
+ $discount['classify'] .= $discountItem['coupon_detail_id'][0] . '(优惠￥' . round($discountItem['coupon_value'], 2) . '), ';
|
|
|
+ } else {
|
|
|
+ $discount['classify'] .= $discountItem['coupon_classify'] . '(优惠￥' . round($discountItem['coupon_value'], 2) . '), ';
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!empty($discountItem['coupon_value'])) {
|
|
|
+ $discount['value'] += round($discountItem['coupon_value'], 2);
|
|
|
}
|
|
|
}
|
|
|
- if (!empty($discountItem['coupon_value'])) {
|
|
|
- $discount['value'] += round($discountItem['coupon_value'],2);
|
|
|
+ if (!empty($discount['coupon_name'])) {
|
|
|
+ $discount['coupon_name'] = rtrim($discount['coupon_name'], ', ');
|
|
|
+ }
|
|
|
+ if (!empty($discount['classify'])) {
|
|
|
+ $discount['classify'] = rtrim($discount['classify'], ', ');
|
|
|
}
|
|
|
}
|
|
|
- if (!empty($discount['coupon_name'])) {
|
|
|
- $discount['coupon_name'] = rtrim($discount['coupon_name'], ', ');
|
|
|
- }
|
|
|
- if (!empty($discount['classify'])) {
|
|
|
- $discount['classify'] = rtrim($discount['classify'], ', ');
|
|
|
- }
|
|
|
- }
|
|
|
- $order->discount = $discount;
|
|
|
-
|
|
|
- $order->premises = $order->premises ?? $premises;
|
|
|
- $data = [
|
|
|
- 'order' => $order,
|
|
|
- 'refund' => $refund,
|
|
|
- 'sheet' => $orderSheet,
|
|
|
- 'express' => $express,
|
|
|
- 'payDetail' => $payDetail,
|
|
|
- 'payDetails' => $payDetails
|
|
|
- ];
|
|
|
- dump($data);
|
|
|
+ $order->discount = $discount;
|
|
|
|
|
|
- return json_success('', $data);
|
|
|
+ $order->premises = $order->premises ?? $premises;
|
|
|
+ $data = [
|
|
|
+ 'order' => $order,
|
|
|
+ 'refund' => $refund,
|
|
|
+ 'sheet' => $orderSheet,
|
|
|
+ 'express' => $express,
|
|
|
+ 'payDetail' => $payDetail,
|
|
|
+ 'payDetails' => $payDetails
|
|
|
+ ];
|
|
|
+
|
|
|
+ return json_success('', $data);
|
|
|
+
|
|
|
+ } catch (\Exception $e) {
|
|
|
+ dump($e->getMessage());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public function update(Request $request): Response
|
|
|
@@ -1364,7 +1366,7 @@ class WholeController extends Curd
|
|
|
try {// 使用优惠券
|
|
|
$couponUseJson = [];
|
|
|
if (!empty($params['join_order_member_id']) && !empty($params['preferential'])) {
|
|
|
- $couponResult = OrderService::payUseCoupon('pay','Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
|
|
|
+ $couponResult = OrderService::payUseCoupon('pay', 'Y', $params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
|
|
|
if (!empty($couponResult['pay_amount']) && $couponResult['pay_amount'] != $params['order_amount_pay']) {
|
|
|
throw new BusinessException("计算优惠后，实付金额错误！");
|
|
|
}
|
|
|
@@ -4291,7 +4293,7 @@ class WholeController extends Curd
|
|
|
$payWay = OrderService::$payWay[$payWayEn];
|
|
|
}
|
|
|
}
|
|
|
- if (count($payDetails) > 0){
|
|
|
+ if (count($payDetails) > 0) {
|
|
|
$payDetail0 = $payDetails[0];
|
|
|
$payTimes = $payDetail0['pay_paytimes'];
|
|
|
}
|
gorden