From 962a3df1977845bd74f792658a6adc3525c179e9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 31 Oct 2024 15:15:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(beforehand=5Forder):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=85=B6=E4=BB=96=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E9=87=91=E6=B5=81=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在订单表中添加 other_data 字段，用于存储订单附加信息 - 修改订单创建逻辑，将附加信息以 JSON 形式存储 - 更新用户资金流操作，支持添加备注信息 - 优化订单列表查询字段，移除不必要的 uid 字段 --- .../beforehand_order/BeforehandOrderController.php | 12 ++++++++++++ .../lists/beforehand_order/BeforehandOrderLists.php | 4 ++-- .../logic/beforehand_order/BeforehandOrderLogic.php | 3 ++- app/admin/logic/user/UserLogic.php | 8 ++++---- .../model/beforehand_order/BeforehandOrder.php | 1 + 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/app/admin/controller/beforehand_order/BeforehandOrderController.php b/app/admin/controller/beforehand_order/BeforehandOrderController.php index 6fd533e51..57fa81011 100644 --- a/app/admin/controller/beforehand_order/BeforehandOrderController.php +++ b/app/admin/controller/beforehand_order/BeforehandOrderController.php @@ -57,6 +57,18 @@ class BeforehandOrderController extends BaseAdminController { $params = $this->request->post(); $params['admin_id'] = $this->adminId; + $other_data=[ + 'nickname'=>$params['nickname']??'', + 'phone'=>$params['phone']??'', + 'address'=>$params['address']??'', + 'arrival_time'=>$params['arrival_time']??'', + 'purpose'=>$params['purpose']??'', + 'tables'=>$params['tables']??'', + 'days'=>$params['days']??'', + 'chef'=>$params['chef']??'', + 'chef_phone'=>$params['chef_phone']??'', + ]; + $params['other_data'] = $other_data; $result = BeforehandOrderLogic::add($params); return $this->success('添加成功', [], 1, 1); } diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index cbefa10ce..de26f9c71 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -28,7 +28,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte public function setSearch(): array { return [ - '=' => ['store_id', 'order_id', 'uid','paid','status','order_type','order_sn'], + '=' => ['store_id', 'order_id', 'paid','status','order_type','order_sn'], ]; } @@ -45,7 +45,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte public function lists(): array { return BeforehandOrder::where($this->searchWhere) - ->field(['id','order_id','store_id','uid','order_type','total_num','total_price','outbound_id','admin_id','create_time', 'status', 'mark','warehousing_id']) + ->field(['id','order_id','store_id','order_type','total_num','total_price','outbound_id','admin_id','create_time', 'status', 'mark','warehousing_id']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item){ diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index 50aaef5b4..89a841136 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -95,7 +95,8 @@ class BeforehandOrderLogic extends BaseLogic 'address' => $params['address'] ?? '', 'mark' => $params['mark'] ?? '', 'arrival_time' => strtotime($params['arrival_time']), - 'order_type' => $order_type + 'order_type' => $order_type, + 'other_data' => json_encode($params['other_data'],true) ]); $product_arr=[]; foreach ($datas as $k => $v) { diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index f4c5afff4..c97608d8c 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -242,11 +242,11 @@ class UserLogic extends BaseLogic try { $capitalFlowDao = new CapitalFlowLogic($find, 'user'); if ($params['type'] == 1) { - $capitalFlowDao->userIncome('system_purchase_add', 'system', 0, $params['purchase_funds'],'',1); + $capitalFlowDao->userIncome('system_purchase_add', 'system', 0, $params['purchase_funds'],$params['mark']??'',1); $find->purchase_funds = bcadd($params['purchase_funds'], $find['purchase_funds'], 2); $find->save(); } else { - $capitalFlowDao->userExpense('system_purchase_dec', 'system', 0, $params['purchase_funds']); + $capitalFlowDao->userExpense('system_purchase_dec', 'system', 0, $params['purchase_funds'],$params['mark']??''); $find->purchase_funds = bcsub($params['purchase_funds'], $find['purchase_funds'], 2); $find->save(); } @@ -267,11 +267,11 @@ class UserLogic extends BaseLogic try { $capitalFlowDao = new CapitalFlowLogic($find, 'user'); if ($params['type'] == 1) { - $capitalFlowDao->userIncome('system_balance_add', 'system', 0, $params['now_money'],); + $capitalFlowDao->userIncome('system_balance_add', 'system', 0, $params['now_money'],$params['mark']??''); $find->now_money = bcadd($params['now_money'], $find['now_money'], 2); $find->save(); } else { - $capitalFlowDao->userExpense('system_balance_reduce', 'system', 0, $params['now_money']); + $capitalFlowDao->userExpense('system_balance_reduce', 'system', 0, $params['now_money'],$params['mark']??''); $find->now_money = bcsub($params['now_money'], $find['now_money'], 2); $find->save(); } diff --git a/app/common/model/beforehand_order/BeforehandOrder.php b/app/common/model/beforehand_order/BeforehandOrder.php index e7944436d..50a4fda14 100644 --- a/app/common/model/beforehand_order/BeforehandOrder.php +++ b/app/common/model/beforehand_order/BeforehandOrder.php @@ -17,6 +17,7 @@ class BeforehandOrder extends BaseModel use SoftDelete; protected $name = 'beforehand_order'; protected $deleteTime = 'delete_time'; + protected $json = ['other_data']; } \ No newline at end of file