From 4cc4c8a5f61aab4eddf2f5402d4850915b08b85c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 5 Nov 2024 09:35:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E6=97=B6=E7=9A=84=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E5=AF=B9=E5=BA=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整了 OrderOutbound 类中的表头顺序 - 修正了订单导出时的数量显示逻辑 - 更新了订单总价和预收金额的显示逻辑 - 增加了系统门店名称字段 --- .../beforehand_order/BeforehandOrderLogic.php | 3 ++- app/common/service/xlsx/OrderOutbound.php | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index 03dbbc0c4..7566b559f 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -76,6 +76,7 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['gross_weight'] = $v['gross_weight'] ?? ''; $datas[$k]['net_weight'] = $v['net_weight'] ?? ''; $datas[$k]['cart_num'] = $v['nums']; + $datas[$k]['accept_num'] = $v['nums']; $datas[$k]['price'] = $v['price']; $datas[$k]['package'] = $v['package'] ?? ''; $datas[$k]['total_price'] = $v['total_price']; @@ -93,7 +94,6 @@ class BeforehandOrderLogic extends BaseLogic 'total_num' => $total_num, 'total_price' => $total_price, 'pay_price' => $total_price, - 'pay_price' => 0, 'pay_type' => 0, 'deduction_price' => 0, 'paid' => 0, @@ -577,6 +577,7 @@ class BeforehandOrderLogic extends BaseLogic $item['store_name'] = $find['store_name']; return $item; }); + $order['system_store_name']=SystemStore::where('id', $order['store_id'])->value('name'); $other_data = $order['other_data']; unset($order['other_data']); $file_path = $order_info->export($data, $order, $other_data); diff --git a/app/common/service/xlsx/OrderOutbound.php b/app/common/service/xlsx/OrderOutbound.php index 302db32fb..366b45d91 100644 --- a/app/common/service/xlsx/OrderOutbound.php +++ b/app/common/service/xlsx/OrderOutbound.php @@ -38,9 +38,9 @@ class OrderOutbound $sheet->setCellValue('A3', '编号'); $sheet->setCellValue('B3', '品名'); - $sheet->setCellValue('C3', '型号'); - $sheet->setCellValue('D3', '单位'); - $sheet->setCellValue('E3', '净重（约）'); + $sheet->setCellValue('C3', '单位'); + $sheet->setCellValue('D3', '净重（约）'); + $sheet->setCellValue('E3', '数量'); $sheet->setCellValue('F3', '单价'); $sheet->setCellValue('G3', '金额'); $sheet->setCellValue('H3', '备注'); @@ -59,9 +59,9 @@ class OrderOutbound foreach ($data as $k => $v) { $sheet->setCellValue('A' . ($k + 4), $v['product_id']); $sheet->setCellValue('B' . ($k + 4), $v['store_name']); - $sheet->setCellValue('C' . ($k + 4), $v['marques']); - $sheet->setCellValue('D' . ($k + 4), $v['unit_name']); - $sheet->setCellValue('E' . ($k + 4), $v['gross_weight']); + $sheet->setCellValue('C' . ($k + 4), $v['unit_name']); + $sheet->setCellValue('D' . ($k + 4), $v['gross_weight']); + $sheet->setCellValue('E' . ($k + 4), $v['accept_num']==0 ? $v['cart_num'] : $v['accept_num']); $sheet->setCellValue('F' . ($k + 4), $v['price']); $sheet->setCellValue('G' . ($k + 4), $v['pay_price']); $sheet->mergeCells('H' . ($k + 4) . ':I' . $k + 4); @@ -74,16 +74,24 @@ class OrderOutbound $sheet->setCellValue('A' . ($count + 5),'累计接单:'); $sheet->setCellValue('C' . ($count + 5),'预收金额:'); + $sheet->setCellValue('D' . ($count + 5),$order['pay_price']==0?$order['total_price']:$order['pay_price']); $sheet->setCellValue('E' . ($count + 5),'预收押金:'); $sheet->setCellValue('G' . ($count + 5),'合计预收:'); + $sheet->setCellValue('H' . ($count + 5),$order['pay_price']==0?$order['total_price']:$order['pay_price']); $sheet->setCellValue('A' . ($count + 6),'出库合计:'); $sheet->setCellValue('C' . ($count + 6),'出库金额:'); + $sheet->setCellValue('D' . ($count + 6),$order['pay_price']==0?$order['total_price']:$order['pay_price']); $sheet->setCellValue('E' . ($count + 6),'实收押金:'); $sheet->setCellValue('G' . ($count + 6),'合计:'); + $sheet->setCellValue('H' . ($count + 6),$order['pay_price']==0?$order['total_price']:$order['pay_price']); $sheet->setCellValue('A' . ($count + 7),'应收:'); + $sheet->setCellValue('B' . ($count + 7),$order['pay_price']==0?$order['total_price']:$order['pay_price']); $sheet->setCellValue('C' . ($count + 7),'应退:'); + $sheet->setCellValue('G' . ($count + 7),'门店:'); + $sheet->mergeCells('H' . ($count + 7) . ':I' . $count + 7); + $sheet->setCellValue('H' . ($count + 7),$order['system_store_name']); $sheet->mergeCells('B' . ($count + 8) . ':I' . $count + 8); $sheet->setCellValue('A'. ($count + 8), '收货地址:'); From 53f554c574f3d5c8ac1d96bbf2964f6eb00cc53b Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 5 Nov 2024 09:42:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(admin):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A2=9D=E5=A4=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在创建订单时，增加了其他数据字段，包括客户昵称、电话、地址等信息 - 新增字段 other_data 以 JSON 格式存储额外信息 - 优化了订单创建过程，提高了数据的完整性和可维护性 --- .../beforehand_order/BeforehandOrderLogic.php | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index 7566b559f..21b68b21a 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -433,6 +433,23 @@ class BeforehandOrderLogic extends BaseLogic $datas[$k]['update_time'] = time(); $total_num += $v['nums']; } + $other_data = [ + 'nickname' => $order['real_name'] ?? '', + 'phone' => $order['user_phone'] ?? '', + 'address' => $order['user_address'] ?? '', + 'arrival_time' => $params['arrival_time'] ?? '', + 'purpose' => $params['purpose'] ?? '', + 'tables' => $params['tables'] ?? '', + 'days' => $params['days'] ?? '', + 'chef' => $params['chef'] ?? '', + 'chef_phone' => $params['chef_phone'] ?? '', + 'splitting_officer' => $params['splitting_officer'] ?? '', + 'merchandiser' => $params['merchandiser'] ?? '', + 'distribution_personnel' => $params['distribution_personnel'] ?? '', + 'transporter' => $params['transporter'] ?? '', + 'system_store_name' => $params['system_store_name'] ?? '', + 'regional_manager' => $params['regional_manager'] ?? '', + ]; $order = BeforehandOrder::create([ 'order_id' => getNewOrderId('YG'), 'order_sn' => $order['order_id'], @@ -446,7 +463,9 @@ class BeforehandOrderLogic extends BaseLogic 'order_type' => 4, 'deduction_price' => 0, 'paid' => 0, - 'mark' => $params['mark'] ?? '' + 'mark' => $params['mark'] ?? '', + 'other_data' => json_encode($other_data, true) + ]); foreach ($datas as $k => $v) { $datas[$k]['bhoid'] = $order['id']; From a5a8e6c5fe880ce955258972b8f62178cdfb32c9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 5 Nov 2024 09:42:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(admin):=20=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将参数数组从 $params 改为 $order - 更新了 12 个字段的赋值逻辑 --- .../beforehand_order/BeforehandOrderLogic.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index 21b68b21a..2ea01e683 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -437,18 +437,18 @@ class BeforehandOrderLogic extends BaseLogic 'nickname' => $order['real_name'] ?? '', 'phone' => $order['user_phone'] ?? '', 'address' => $order['user_address'] ?? '', - 'arrival_time' => $params['arrival_time'] ?? '', - 'purpose' => $params['purpose'] ?? '', - 'tables' => $params['tables'] ?? '', - 'days' => $params['days'] ?? '', - 'chef' => $params['chef'] ?? '', - 'chef_phone' => $params['chef_phone'] ?? '', - 'splitting_officer' => $params['splitting_officer'] ?? '', - 'merchandiser' => $params['merchandiser'] ?? '', - 'distribution_personnel' => $params['distribution_personnel'] ?? '', - 'transporter' => $params['transporter'] ?? '', - 'system_store_name' => $params['system_store_name'] ?? '', - 'regional_manager' => $params['regional_manager'] ?? '', + 'arrival_time' => $order['arrival_time'] ?? '', + 'purpose' => $order['purpose'] ?? '', + 'tables' => $order['tables'] ?? '', + 'days' => $order['days'] ?? '', + 'chef' => $order['chef'] ?? '', + 'chef_phone' => $order['chef_phone'] ?? '', + 'splitting_officer' => $order['splitting_officer'] ?? '', + 'merchandiser' => $order['merchandiser'] ?? '', + 'distribution_personnel' => $order['distribution_personnel'] ?? '', + 'transporter' => $order['transporter'] ?? '', + 'system_store_name' => $order['system_store_name'] ?? '', + 'regional_manager' => $order['regional_manager'] ?? '', ]; $order = BeforehandOrder::create([ 'order_id' => getNewOrderId('YG'),