From f8f7048d704b5305cdd6ec7e608280eeb0695f41 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 18 Aug 2024 12:29:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D=E8=8E=B7=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/store_order/StoreOrderController.php | 4 ++-- .../store_order_cart_info/StoreOrderCartInfoController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/controller/store_order/StoreOrderController.php b/app/admin/controller/store_order/StoreOrderController.php index 2d386ac93..ba1bb475c 100644 --- a/app/admin/controller/store_order/StoreOrderController.php +++ b/app/admin/controller/store_order/StoreOrderController.php @@ -161,8 +161,8 @@ class StoreOrderController extends BaseAdminController $find=StoreProduct::where('id',$value->product_id)->find(); $value->store_name=$find['store_name']??''; $value->store_info=$find['store_info']??''; - if(!empty($find['unit_id'])){ - $value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name'); + if(!empty($find['unit'])){ + $value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name'); }else{ $value->unit_name=''; } diff --git a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php index 8bce62073..12550706d 100644 --- a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php +++ b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php @@ -87,8 +87,8 @@ class StoreOrderCartInfoController extends BaseAdminController $find=StoreProduct::where('id',$value->product_id)->find(); $value->store_name=$find['store_name']??''; $value->store_info=$find['store_info']??''; - if(!empty($find['unit_id'])){ - $value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name'); + if(!empty($find['unit'])){ + $value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name'); }else{ $value->unit_name=''; } From e8dbf9440c78874473123cd0a3b8b11b5e24021e Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 18 Aug 2024 14:04:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BA=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=9D=A1=E7=A0=81=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E9=80=9A=E7=9F=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StoreBranchProductExchangeLists.php | 2 +- .../lists/store_branch_product/StoreBranchProductLists.php | 2 +- app/api/controller/order/OrderController.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php index f4144ab48..28e90e728 100644 --- a/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php +++ b/app/admin/lists/store_branch_product exchange/StoreBranchProductExchangeLists.php @@ -58,7 +58,7 @@ class StoreBranchProductExchangeLists extends BaseAdminDataLists implements List } } return StoreBranchProductExchange::where($this->searchWhere)->where($where) - ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'status']) + ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'bar_code','status']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php index 017d9f342..8c93d9426 100644 --- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php +++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php @@ -81,7 +81,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI $this->searchWhere[] = $where; } return StoreBranchProduct::where($this->searchWhere) - ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price', 'manufacturer_information']) + ->field(['id', 'store_id', 'product_id', 'image', 'store_name', 'store_info', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost', 'purchase', 'status', 'batch', 'vip_price','bar_code', 'manufacturer_information']) ->when(!empty($this->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->adminInfo['store_id']); }) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index f60a26e63..5f9ed4ed5 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -197,7 +197,7 @@ class OrderController extends BaseApiController Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); try{ - $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]]; + $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]]; $url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959'; (new Curl())->postJson($url, json_encode($arr)); }catch(Exception $e){ @@ -315,7 +315,7 @@ class OrderController extends BaseApiController Db::name('wechat_micropay')->insert(['order_id' => $order['order_id'], 'create_time' => time(), 'update_time' => time()]); Redis::send('send-code-pay', ['order_id' => $order['order_id']]); try{ - $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单"]]; + $arr = ["msgtype" => "markdown", "markdown" => ["content" => "有新的条码支付订单|".$order['order_id']]]; $url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b538e44b-940b-445f-afe0-97320942d959'; (new Curl())->postJson($url, json_encode($arr)); }catch(Exception $e){ From 5f007b5b1d3d49079a8ab8ae3a27e5d0ff894f2a Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sun, 18 Aug 2024 14:39:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=BA=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E8=A1=A8=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/store_order/StoreOrderController.php | 10 +++++----- .../StoreOrderCartInfoController.php | 10 ++++++++-- app/common/service/xlsx/OrderDetail.php | 13 ++++++++----- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/admin/controller/store_order/StoreOrderController.php b/app/admin/controller/store_order/StoreOrderController.php index ba1bb475c..34977798c 100644 --- a/app/admin/controller/store_order/StoreOrderController.php +++ b/app/admin/controller/store_order/StoreOrderController.php @@ -154,9 +154,11 @@ class StoreOrderController extends BaseAdminController $id = $this->request->post('id'); $system_store = $this->request->post('system_store'); $xlsx = new OrderDetail(); + $order=StoreOrder::where('id',$id)->findOrEmpty(); + $time= strtotime('+1 day', $order['pay_time']); + $order['pay_time']=date('Y-m-d H:i:s',$order['pay_time']); + $order['delivery_time']=date('Y-m-d', $time); $data = StoreOrderCartInfo::where('oid', $id)->select(); - $total_num=0; - $total_price=0; foreach ($data as $key => &$value) { $find=StoreProduct::where('id',$value->product_id)->find(); $value->store_name=$find['store_name']??''; @@ -166,10 +168,8 @@ class StoreOrderController extends BaseAdminController }else{ $value->unit_name=''; } - $total_num+=$value->cart_num; - $total_price+=$value->total_price; } - $file_path = $xlsx->export($data,$system_store,$total_num,$total_price); + $file_path = $xlsx->export($data,$system_store,$order); return $this->success('导出成功', ['url' => $file_path]); } diff --git a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php index 12550706d..a6aabe21a 100644 --- a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php +++ b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php @@ -7,6 +7,7 @@ use app\admin\controller\BaseAdminController; use app\admin\lists\store_order_cart_info\StoreOrderCartInfoLists; use app\admin\lists\store_order_cart_info\StoreOrderCartInfoTwoLists; use app\admin\logic\store_order_cart_info\StoreOrderCartInfoLogic; +use app\common\model\store_order\StoreOrder; use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_product\StoreProduct; use app\common\model\store_product_unit\StoreProductUnit; @@ -80,7 +81,10 @@ class StoreOrderCartInfoController extends BaseAdminController $data = StoreOrderCartInfo::where($where)->select(); } - + $order['pay_time']=''; + $order['delivery_time']=''; + $order['order_id']=''; + $total_num=0; $total_price=0; foreach ($data as $key => &$value) { @@ -95,7 +99,9 @@ class StoreOrderCartInfoController extends BaseAdminController $total_num+=$value->cart_num; $total_price+=$value->total_price; } - $file_path = $xlsx->export($data,$system_store,$total_num,$total_price); + $order['total_num']=$total_num; + $order['total_price']=$total_price; + $file_path = $xlsx->export($data,$system_store,$order); return $this->success('导出成功', ['url' => $file_path]); } } \ No newline at end of file diff --git a/app/common/service/xlsx/OrderDetail.php b/app/common/service/xlsx/OrderDetail.php index 8518e8bcd..6e4ac057b 100644 --- a/app/common/service/xlsx/OrderDetail.php +++ b/app/common/service/xlsx/OrderDetail.php @@ -14,9 +14,9 @@ class OrderDetail public $company='共投里海'; public $address='泸州龙马潭区海吉星122栋'; public $phone='08302669767'; - public $tel='08302669767'; + public $tel='17309099881'; - public function export($data,$system_store,$total_num,$total_price) + public function export($data,$system_store,$order) { $spreadsheet = new Spreadsheet(); $sheet = $spreadsheet->getActiveSheet(); @@ -32,8 +32,11 @@ class OrderDetail $sheet->setCellValue('A2', '店铺名称'); $sheet->setCellValue('B2', $system_store); $sheet->setCellValue('F2', '送货时间'); + $sheet->setCellValue('G2', $order['delivery_time']??''); $sheet->setCellValue('A3', '开单日期'); + $sheet->setCellValue('B3', $order['pay_time']??''); $sheet->setCellValue('F3', '单号'); + $sheet->setCellValue('G3', $order['order_id']??''); $sheet->setCellValue('A4', '序号'); $sheet->setCellValue('B4', '商品名称'); $sheet->setCellValue('D4', '规格'); @@ -71,10 +74,10 @@ class OrderDetail $sheet->mergeCells('B' . ($count + 6) . ':E' . $count + 6); $sheet->setCellValue('A' . $count + 6, '合计数量'); - $sheet->setCellValue('B' . $count + 6,$total_num); + $sheet->setCellValue('B' . $count + 6,$order['total_num']); $sheet->mergeCells('G' . ($count + 6) . ':J' . $count + 6); $sheet->setCellValue('F' . $count + 6, '合计价格'); - $sheet->setCellValue('G' . $count + 6, $total_price); + $sheet->setCellValue('G' . $count + 6, $order['total_price']); $sheet->mergeCells('A' . ($count + 7) . ':J' . $count + 7); @@ -97,7 +100,7 @@ class OrderDetail $sheet->mergeCells('A' . ($count + 10) . ':J' . $count + 10); $sheet->setCellValue('A' . $count + 11, '仓库',); - $sheet->setCellValue('B' . $count + 11, $this->warehouse); + // $sheet->setCellValue('B' . $count + 11, $this->warehouse); $sheet->mergeCells('B' . ($count + 11) . ':C' . $count + 11); $sheet->setCellValue('D' . $count + 11, '送货'); $sheet->mergeCells('E' . ($count + 11) . ':F' . $count + 11);