From cfed701649335c63996cdd8682680f988724a2ee Mon Sep 17 00:00:00 2001 From: liuchaofu <1873441552@qq.com> Date: Wed, 5 Jun 2024 22:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=A0=81=E6=9F=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 22 ++++++++++++++++++-- app/api/logic/order/OrderLogic.php | 17 +++++++++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 0f455e2c4..76cd245ff 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -28,6 +28,25 @@ class OrderController extends BaseApiController return $this->dataLists(new OrderList()); } + #[ + ApiDoc\Title('核销码查数据'), + ApiDoc\url('/api/order/order/write_code'), + ApiDoc\Method('POST'), + ApiDoc\Param(name: "code", type: "string", require: false, desc: "核销码"), + ApiDoc\NotHeaders(), + ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + ApiDoc\ResponseSuccess("data", type: "array"), + ] + public function write_code() + { + $code = $this->request->post('code'); + if(empty($code)){ + return $this->fail('缺失参数'); + } + $res = OrderLogic::getOne($code); + return $this->success('ok',$res); + } + #[ ApiDoc\Title('核销订单列表'), ApiDoc\url('/api/order/order/write_list'), @@ -402,8 +421,7 @@ class OrderController extends BaseApiController public function writeoff_order() { $params = (new OrderValidate())->post()->goCheck('check'); - $userId = $this->request->userId; - $res = OrderLogic::writeOff($params,$userId); + $res = OrderLogic::writeOff($params); if ($res) { return $this->success('核销成功'); } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index f5a1b73a0..83c87a75a 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -436,7 +436,6 @@ class OrderLogic extends BaseLogic /** * @param $params - * @param $uid * @return bool * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException @@ -444,11 +443,10 @@ class OrderLogic extends BaseLogic * @author: codeliu * @Time: 2024/6/3 22:42 */ - public static function writeOff($params, $uid): bool + public static function writeOff($params): bool { $data = StoreOrder::with('store')->where([ - 'verify_code' => $params['verify_code'], - 'uid' => $uid + 'verify_code' => $params['verify_code'] ])->find(); if (empty($data)) { return false; @@ -520,6 +518,17 @@ class OrderLogic extends BaseLogic } + public static function getOne($code) + { + return StoreOrder::with(['store'])->where('verify_code',$code) + ->select()->each(function ($item) { + $item['goods_list']=StoreOrderCartInfo::where('oid',$item['id'])->with('goodsName')->field('product_id,cart_num,verify_code,is_writeoff,writeoff_time')->limit(3)->select(); + $item['goods_count']=count(explode(',',$item['cart_id'])); + return $item; //返回处理后的数据。 + }) + ->toArray(); + + } public static function write_list($info,$status,$params) {