From 5b9c50b6894264e4a3aad4aa6e3bcb781ecbdeba Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Wed, 5 Jun 2024 14:54:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UserVisitController.php | 35 +++++++++++++ app/api/logic/user/UserVisitLogic.php | 47 +++++++++++++++++ app/api/validate/VisitValidate.php | 50 +++++++++++++++++++ app/common/model/store_visit/StoreVisit.php | 22 ++++++++ app/common/model/user/UserVisit.php | 22 ++++++++ 5 files changed, 176 insertions(+) create mode 100644 app/api/controller/user/UserVisitController.php create mode 100644 app/api/logic/user/UserVisitLogic.php create mode 100644 app/api/validate/VisitValidate.php create mode 100644 app/common/model/store_visit/StoreVisit.php create mode 100644 app/common/model/user/UserVisit.php diff --git a/app/api/controller/user/UserVisitController.php b/app/api/controller/user/UserVisitController.php new file mode 100644 index 000000000..26fac0cff --- /dev/null +++ b/app/api/controller/user/UserVisitController.php @@ -0,0 +1,35 @@ +post()->goCheck('add'); + + $result = UserVisitLogic::add($params,$this->userId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(UserVisitLogic::getError()); + + } + +} \ No newline at end of file diff --git a/app/api/logic/user/UserVisitLogic.php b/app/api/logic/user/UserVisitLogic.php new file mode 100644 index 000000000..5a95ef88c --- /dev/null +++ b/app/api/logic/user/UserVisitLogic.php @@ -0,0 +1,47 @@ +$params['product_id'], + 'uid'=>$uid + ]) + ->whereDay('create_time') + ->find(); + if($check){ + StoreVisit::where('id',$check['id'])->inc('count')->update(); + }else{ + StoreVisit::create([ + 'uid' => $uid, + 'product_id' => $params['product_id'], + 'cate_id' => $params['cate_id'], + 'count' => 1, + 'create_time' => time(), + ]); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + } \ No newline at end of file diff --git a/app/api/validate/VisitValidate.php b/app/api/validate/VisitValidate.php new file mode 100644 index 000000000..daf39519a --- /dev/null +++ b/app/api/validate/VisitValidate.php @@ -0,0 +1,50 @@ + 'require|number', + 'cate_id' => 'require|number', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'product_id' => '商品id', + 'cate_id' => '分类', + ]; + + + /** + * @notes 添加场景 + * @return VisitValidate + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function sceneAdd() + { + return $this->only(['product_id','cate_id']); + } + + + +} \ No newline at end of file diff --git a/app/common/model/store_visit/StoreVisit.php b/app/common/model/store_visit/StoreVisit.php new file mode 100644 index 000000000..0f506070a --- /dev/null +++ b/app/common/model/store_visit/StoreVisit.php @@ -0,0 +1,22 @@ + Date: Wed, 5 Jun 2024 15:11:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B8=E9=94=80=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/order/OrderController.php | 19 +++++++++ app/api/logic/order/OrderLogic.php | 41 +++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 165278172..0f455e2c4 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -33,6 +33,7 @@ class OrderController extends BaseApiController ApiDoc\url('/api/order/order/write_list'), ApiDoc\Method('POST'), ApiDoc\Param(name: "status", type: "int", require: true, desc: "1：待核销；2：已核销"), + ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), ApiDoc\NotHeaders(), @@ -56,6 +57,24 @@ class OrderController extends BaseApiController return $this->success('ok',$res); } + + #[ + ApiDoc\Title('核销数量'), + ApiDoc\url('/api/order/order/write_count'), + ApiDoc\Method('POST'), + ApiDoc\Param(name: "name", type: "string", require: false, desc: "搜商品或者订单id"), + ApiDoc\NotHeaders(), + ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + ApiDoc\ResponseSuccess("data", type: "array"), + ] + public function write_count() + { + $info = $this->userInfo; + $params = $this->request->post(); + $res = OrderLogic::write_count($info,$params); + return $this->success('ok',$res); + } + #[ ApiDoc\Title('订单校验'), ApiDoc\url('/api/order/order/checkOrder'), diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 7585a7d7b..d95294fed 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -442,6 +442,46 @@ class OrderLogic extends BaseLogic } + public static function write_count($info,$params) + { + $store_id = SystemStoreStaff::where('phone',$info['mobile'])->value('store_id'); + if(empty($store_id)){ + throw new \Exception('该用户未绑定店铺请查看'); + } + $query = StoreOrderCartInfo::alias('o') + ->leftJoin('store_branch_product p','p.id = o.product_id') + ->leftJoin('store_order s','s.id = o.oid') + ->field('o.oid,p.store_name,s.order_id') + ->where('o.store_id',$store_id); + + if(isset($params['name']) && $params['name']){ + if($params['name'] && preg_match('/[\x{4e00}-\x{9fff}]+/u', $params['name'])==1){ + $query->where('p.store_name','like','%'.$params['name'].'%'); + }else{ + $query->where('s.order_id',$params['name']); + } + } + $product = $query->select(); + if(empty($product)){ + return [ + 'no_send'=>0, + 'send'=>0 + ]; + } + $oids = array_column($product->toArray(), 'oid'); + $uniqueOids = array_unique($oids); + $no_send = StoreOrder::whereIn('id',$uniqueOids) + ->where('status',1)->count(); + $send = StoreOrder::whereIn('id',$uniqueOids) + ->where('status',2)->count(); + return [ + 'no_send'=>$no_send, + 'send'=>$send + ]; + + } + + public static function write_list($info,$status,$params) { @@ -463,7 +503,6 @@ class OrderLogic extends BaseLogic }else{ $query->where('s.order_id',$params['name']); } - } $product = $query->select(); if(empty($product)){