From d6516e36219c868630d8edcfd5aff7f8a0c077d3 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 26 Apr 2024 11:26:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ExceptionHandler.php | 24 + app/admin/controller/BaseAdminController.php | 4 +- app/admin/controller/order/CartController.php | 95 ++ .../retail/CashierclassController.php | 97 ++ .../retail/CashierinfoController.php | 95 ++ .../setting/pay/PayConfigController.php | 59 + .../setting/pay/PayWayController.php | 49 + app/admin/controller/user/UserController.php | 15 + app/admin/lists/order/CartLists.php | 65 + app/admin/lists/retail/CashierclassLists.php | 71 + app/admin/lists/retail/CashierinfoLists.php | 65 + .../lists/setting/pay/PayConfigLists.php | 50 + app/admin/logic/order/CartLogic.php | 96 ++ app/admin/logic/retail/CashierclassLogic.php | 122 ++ app/admin/logic/retail/CashierinfoLogic.php | 94 ++ .../logic/setting/pay/PayConfigLogic.php | 91 ++ app/admin/logic/setting/pay/PayWayLogic.php | 111 ++ app/admin/logic/user/UserLogic.php | 73 +- app/admin/validate/order/CartValidate.php | 84 + .../validate/retail/CashierclassValidate.php | 98 ++ .../validate/retail/CashierinfoValidate.php | 82 + .../validate/setting/PayConfigValidate.php | 128 ++ app/admin/validate/user/UserValidate.php | 150 +- app/api/controller/BaseApiController.php | 18 + app/api/controller/IndexController.php | 7 +- app/api/controller/LoginController.php | 22 + app/api/controller/order/CartController.php | 28 + .../order/PurchaseOrderController.php | 50 + .../order/RetailOrderController.php | 49 + app/api/http/middleware/InitMiddleware.php | 34 + app/api/http/middleware/LoginMiddleware.php | 63 + app/api/logic/LoginLogic.php | 431 ++++++ app/api/logic/order/OrderLogic.php | 176 +++ app/api/service/UserTokenService.php | 103 ++ app/api/service/WechatUserService.php | 254 ++++ app/api/validate/LoginAccountValidate.php | 148 ++ app/ceshi/controller/IndexController.php | 29 + app/common/cache/UserAccountSafeCache.php | 69 + app/common/cache/UserTokenCache.php | 107 ++ ...nController.php => BaseLikeController.php} | 2 +- app/common/enum/OrderEnum.php | 40 + app/common/enum/PayEnum.php | 128 ++ app/common/logic/order/RetailOrderLogic.php | 105 ++ app/common/model/order/Cart.php | 22 + app/common/model/order/FinancialRecord.php | 22 + app/common/model/pay/PayConfig.php | 45 + app/common/model/pay/PayWay.php | 54 + app/common/model/retail/Cashierclass.php | 22 + app/common/model/retail/Cashierinfo.php | 22 + app/common/model/user/UserSession.php | 15 + .../generator/core/ControllerGenerator.php | 4 +- .../service/generator/stub/vue/details.stub | 10 +- .../service/wechat/WeChatConfigService.php | 93 ++ .../service/wechat/WeChatMnpService.php | 101 ++ app/common/service/wechat/WeChatOaService.php | 157 ++ .../service/wechat/WeChatRequestService.php | 82 + app/functions.php | 39 + composer.json | 5 +- composer.lock | 1350 ++++++++++++++++- config/event.php | 6 + config/exception.php | 3 +- config/middleware.php | 16 +- config/plugin/tinywan/jwt/app.php | 83 + .../image/adminapi/default/article01.png | Bin 0 -> 298478 bytes .../image/adminapi/default/article02.jpeg | Bin 0 -> 30594 bytes .../image/adminapi/default/article03.png | Bin 0 -> 14175 bytes .../image/adminapi/default/backend_avatar.png | Bin 0 -> 158102 bytes .../adminapi/default/backend_backdrop.png | Bin 0 -> 85612 bytes .../adminapi/default/backend_favicon.ico | Bin 0 -> 5253 bytes .../image/adminapi/default/backend_logo.png | Bin 0 -> 8604 bytes .../image/adminapi/default/balance_pay.png | Bin 0 -> 4362 bytes .../image/adminapi/default/banner01.png | Bin 0 -> 1046431 bytes .../image/adminapi/default/banner02.png | Bin 0 -> 252590 bytes .../adminapi/default/customer_service.jpg | Bin 0 -> 182327 bytes .../image/adminapi/default/default_avatar.png | Bin 0 -> 4764 bytes .../image/adminapi/default/login_image.png | Bin 0 -> 85612 bytes .../image/adminapi/default/menu_admin.png | Bin 0 -> 3197 bytes .../image/adminapi/default/menu_auth.png | Bin 0 -> 2969 bytes .../image/adminapi/default/menu_dept.png | Bin 0 -> 3047 bytes .../image/adminapi/default/menu_dict.png | Bin 0 -> 2162 bytes .../image/adminapi/default/menu_file.png | Bin 0 -> 2672 bytes .../image/adminapi/default/menu_generator.png | Bin 0 -> 3264 bytes .../image/adminapi/default/menu_role.png | Bin 0 -> 4173 bytes .../image/adminapi/default/menu_web.png | Bin 0 -> 2156 bytes .../resource/image/adminapi/default/nav01.png | Bin 0 -> 16655 bytes .../resource/image/adminapi/default/nav02.png | Bin 0 -> 17684 bytes .../resource/image/adminapi/default/nav03.png | Bin 0 -> 16960 bytes .../resource/image/adminapi/default/nav04.png | Bin 0 -> 20123 bytes .../resource/image/adminapi/default/nav05.png | Bin 0 -> 18685 bytes .../image/adminapi/default/pc_logo.png | Bin 0 -> 26169 bytes .../image/adminapi/default/qq_group.png | Bin 0 -> 42862 bytes .../image/adminapi/default/shop_logo.png | Bin 0 -> 2651 bytes .../image/adminapi/default/tabbar_home.png | Bin 0 -> 1706 bytes .../adminapi/default/tabbar_home_sel.png | Bin 0 -> 1784 bytes .../image/adminapi/default/tabbar_me.png | Bin 0 -> 2948 bytes .../image/adminapi/default/tabbar_me_sel.png | Bin 0 -> 3112 bytes .../image/adminapi/default/tabbar_text.png | Bin 0 -> 831 bytes .../adminapi/default/tabbar_text_sel.png | Bin 0 -> 839 bytes .../image/adminapi/default/user_about.png | Bin 0 -> 3110 bytes .../image/adminapi/default/user_collect.png | Bin 0 -> 2759 bytes .../image/adminapi/default/user_kefu.png | Bin 0 -> 2601 bytes .../image/adminapi/default/user_setting.png | Bin 0 -> 2569 bytes .../image/adminapi/default/wallet.png | Bin 0 -> 1908 bytes .../image/adminapi/default/web_favicon.ico | Bin 0 -> 1704 bytes .../image/adminapi/default/web_logo.jpg | Bin 0 -> 86343 bytes .../image/adminapi/default/web_logo.png | Bin 0 -> 4971 bytes .../image/adminapi/default/wechat_pay.png | Bin 0 -> 6483 bytes support/bootstrap.php | 6 +- support/helpers.php | 16 +- windows.php | 2 - 110 files changed, 5711 insertions(+), 145 deletions(-) create mode 100644 app/ExceptionHandler.php create mode 100644 app/admin/controller/order/CartController.php create mode 100644 app/admin/controller/retail/CashierclassController.php create mode 100644 app/admin/controller/retail/CashierinfoController.php create mode 100644 app/admin/controller/setting/pay/PayConfigController.php create mode 100644 app/admin/controller/setting/pay/PayWayController.php create mode 100644 app/admin/lists/order/CartLists.php create mode 100644 app/admin/lists/retail/CashierclassLists.php create mode 100644 app/admin/lists/retail/CashierinfoLists.php create mode 100644 app/admin/lists/setting/pay/PayConfigLists.php create mode 100644 app/admin/logic/order/CartLogic.php create mode 100644 app/admin/logic/retail/CashierclassLogic.php create mode 100644 app/admin/logic/retail/CashierinfoLogic.php create mode 100644 app/admin/logic/setting/pay/PayConfigLogic.php create mode 100644 app/admin/logic/setting/pay/PayWayLogic.php create mode 100644 app/admin/validate/order/CartValidate.php create mode 100644 app/admin/validate/retail/CashierclassValidate.php create mode 100644 app/admin/validate/retail/CashierinfoValidate.php create mode 100644 app/admin/validate/setting/PayConfigValidate.php create mode 100644 app/api/controller/BaseApiController.php create mode 100644 app/api/controller/LoginController.php create mode 100644 app/api/controller/order/CartController.php create mode 100644 app/api/controller/order/PurchaseOrderController.php create mode 100644 app/api/controller/order/RetailOrderController.php create mode 100644 app/api/http/middleware/InitMiddleware.php create mode 100644 app/api/http/middleware/LoginMiddleware.php create mode 100644 app/api/logic/LoginLogic.php create mode 100644 app/api/logic/order/OrderLogic.php create mode 100644 app/api/service/UserTokenService.php create mode 100644 app/api/service/WechatUserService.php create mode 100644 app/api/validate/LoginAccountValidate.php create mode 100644 app/ceshi/controller/IndexController.php create mode 100644 app/common/cache/UserAccountSafeCache.php create mode 100644 app/common/cache/UserTokenCache.php rename app/common/controller/{BaseLikeAdminController.php => BaseLikeController.php} (97%) create mode 100644 app/common/enum/OrderEnum.php create mode 100644 app/common/enum/PayEnum.php create mode 100644 app/common/logic/order/RetailOrderLogic.php create mode 100644 app/common/model/order/Cart.php create mode 100644 app/common/model/order/FinancialRecord.php create mode 100644 app/common/model/pay/PayConfig.php create mode 100644 app/common/model/pay/PayWay.php create mode 100644 app/common/model/retail/Cashierclass.php create mode 100644 app/common/model/retail/Cashierinfo.php create mode 100644 app/common/model/user/UserSession.php create mode 100644 app/common/service/wechat/WeChatConfigService.php create mode 100644 app/common/service/wechat/WeChatMnpService.php create mode 100644 app/common/service/wechat/WeChatOaService.php create mode 100644 app/common/service/wechat/WeChatRequestService.php create mode 100644 config/event.php create mode 100644 config/plugin/tinywan/jwt/app.php create mode 100644 public/resource/image/adminapi/default/article01.png create mode 100644 public/resource/image/adminapi/default/article02.jpeg create mode 100644 public/resource/image/adminapi/default/article03.png create mode 100644 public/resource/image/adminapi/default/backend_avatar.png create mode 100644 public/resource/image/adminapi/default/backend_backdrop.png create mode 100644 public/resource/image/adminapi/default/backend_favicon.ico create mode 100644 public/resource/image/adminapi/default/backend_logo.png create mode 100644 public/resource/image/adminapi/default/balance_pay.png create mode 100644 public/resource/image/adminapi/default/banner01.png create mode 100644 public/resource/image/adminapi/default/banner02.png create mode 100644 public/resource/image/adminapi/default/customer_service.jpg create mode 100644 public/resource/image/adminapi/default/default_avatar.png create mode 100644 public/resource/image/adminapi/default/login_image.png create mode 100644 public/resource/image/adminapi/default/menu_admin.png create mode 100644 public/resource/image/adminapi/default/menu_auth.png create mode 100644 public/resource/image/adminapi/default/menu_dept.png create mode 100644 public/resource/image/adminapi/default/menu_dict.png create mode 100644 public/resource/image/adminapi/default/menu_file.png create mode 100644 public/resource/image/adminapi/default/menu_generator.png create mode 100644 public/resource/image/adminapi/default/menu_role.png create mode 100644 public/resource/image/adminapi/default/menu_web.png create mode 100644 public/resource/image/adminapi/default/nav01.png create mode 100644 public/resource/image/adminapi/default/nav02.png create mode 100644 public/resource/image/adminapi/default/nav03.png create mode 100644 public/resource/image/adminapi/default/nav04.png create mode 100644 public/resource/image/adminapi/default/nav05.png create mode 100644 public/resource/image/adminapi/default/pc_logo.png create mode 100644 public/resource/image/adminapi/default/qq_group.png create mode 100644 public/resource/image/adminapi/default/shop_logo.png create mode 100644 public/resource/image/adminapi/default/tabbar_home.png create mode 100644 public/resource/image/adminapi/default/tabbar_home_sel.png create mode 100644 public/resource/image/adminapi/default/tabbar_me.png create mode 100644 public/resource/image/adminapi/default/tabbar_me_sel.png create mode 100644 public/resource/image/adminapi/default/tabbar_text.png create mode 100644 public/resource/image/adminapi/default/tabbar_text_sel.png create mode 100644 public/resource/image/adminapi/default/user_about.png create mode 100644 public/resource/image/adminapi/default/user_collect.png create mode 100644 public/resource/image/adminapi/default/user_kefu.png create mode 100644 public/resource/image/adminapi/default/user_setting.png create mode 100644 public/resource/image/adminapi/default/wallet.png create mode 100644 public/resource/image/adminapi/default/web_favicon.ico create mode 100644 public/resource/image/adminapi/default/web_logo.jpg create mode 100644 public/resource/image/adminapi/default/web_logo.png create mode 100644 public/resource/image/adminapi/default/wechat_pay.png diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php new file mode 100644 index 0000000..aaf6f74 --- /dev/null +++ b/app/ExceptionHandler.php @@ -0,0 +1,24 @@ +dataLists(new CartLists()); + } + + + /** + * @notes 添加购物车表 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function add() + { + $params = (new CartValidate())->post()->goCheck('add'); + $result = CartLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(CartLogic::getError()); + } + + + /** + * @notes 编辑购物车表 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function edit() + { + $params = (new CartValidate())->post()->goCheck('edit'); + $result = CartLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(CartLogic::getError()); + } + + + /** + * @notes 删除购物车表 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function delete() + { + $params = (new CartValidate())->post()->goCheck('delete'); + CartLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取购物车表详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function detail() + { + $params = (new CartValidate())->goCheck('detail'); + $result = CartLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/retail/CashierclassController.php b/app/admin/controller/retail/CashierclassController.php new file mode 100644 index 0000000..559be7f --- /dev/null +++ b/app/admin/controller/retail/CashierclassController.php @@ -0,0 +1,97 @@ +setSearch(['merchant'=>222]); + return $this->dataLists($lists); + } + + + /** + * @notes 添加零售订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function add() + { + $params = (new CashierclassValidate())->post()->goCheck('add'); + $result = CashierclassLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(CashierclassLogic::getError()); + } + + + /** + * @notes 编辑零售订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function edit() + { + $params = (new CashierclassValidate())->post()->goCheck('edit'); + $result = CashierclassLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(CashierclassLogic::getError()); + } + + + /** + * @notes 删除零售订单 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function delete() + { + $params = (new CashierclassValidate())->post()->goCheck('delete'); + CashierclassLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取零售订单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function detail() + { + $params = (new CashierclassValidate())->goCheck('detail'); + $result = CashierclassLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/retail/CashierinfoController.php b/app/admin/controller/retail/CashierinfoController.php new file mode 100644 index 0000000..de2536c --- /dev/null +++ b/app/admin/controller/retail/CashierinfoController.php @@ -0,0 +1,95 @@ +dataLists(new CashierinfoLists()); + } + + + /** + * @notes 添加零售订单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function add() + { + $params = (new CashierinfoValidate())->post()->goCheck('add'); + $result = CashierinfoLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(CashierinfoLogic::getError()); + } + + + /** + * @notes 编辑零售订单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function edit() + { + $params = (new CashierinfoValidate())->post()->goCheck('edit'); + $result = CashierinfoLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(CashierinfoLogic::getError()); + } + + + /** + * @notes 删除零售订单详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function delete() + { + $params = (new CashierinfoValidate())->post()->goCheck('delete'); + CashierinfoLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取零售订单详情详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function detail() + { + $params = (new CashierinfoValidate())->goCheck('detail'); + $result = CashierinfoLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/admin/controller/setting/pay/PayConfigController.php b/app/admin/controller/setting/pay/PayConfigController.php new file mode 100644 index 0000000..7deeb6c --- /dev/null +++ b/app/admin/controller/setting/pay/PayConfigController.php @@ -0,0 +1,59 @@ +post()->goCheck(); + PayConfigLogic::setConfig($params); + return $this->success('设置成功', [], 1, 1); + } + + + /** + * @notes 获取支付配置 + * @return \think\response\Json + * @author 段誉 + * @date 2023/2/23 16:14 + */ + public function getConfig() + { + $id = (new PayConfigValidate())->goCheck('get'); + $result = PayConfigLogic::getConfig($id); + return $this->success('获取成功', $result); + } + + + /** + * @notes + * @return \think\response\Json + * @author 段誉 + * @date 2023/2/23 16:15 + */ + public function lists() + { + return $this->dataLists(new PayConfigLists()); + } +} \ No newline at end of file diff --git a/app/admin/controller/setting/pay/PayWayController.php b/app/admin/controller/setting/pay/PayWayController.php new file mode 100644 index 0000000..a5c17b2 --- /dev/null +++ b/app/admin/controller/setting/pay/PayWayController.php @@ -0,0 +1,49 @@ +success('获取成功',$result); + } + + + /** + * @notes 设置支付方式 + * @return \think\response\Json + * @throws \Exception + * @author 段誉 + * @date 2023/2/23 16:27 + */ + public function setPayWay() + { + $params = $this->request->post(); + $result = (new PayWayLogic())->setPayWay($params); + if (true !== $result) { + return $this->fail($result); + } + return $this->success('操作成功',[],1, 1); + } +} \ No newline at end of file diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 38c1989..36320c7 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -21,6 +21,21 @@ class UserController extends BaseAdminController return $this->dataLists(new UserLists()); } + /** + * @notes 添加用户列表 + * @return \think\response\Json + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public function add() + { + $params = (new UserValidate())->post()->goCheck('add'); + $result = UserLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(UserLogic::getError()); + } /** * @notes 获取用户详情 diff --git a/app/admin/lists/order/CartLists.php b/app/admin/lists/order/CartLists.php new file mode 100644 index 0000000..349924d --- /dev/null +++ b/app/admin/lists/order/CartLists.php @@ -0,0 +1,65 @@ +searchWhere) + ->field(['cart_id']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['cart_id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取购物车表数量 + * @return int + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function count(): int + { + return Cart::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/retail/CashierclassLists.php b/app/admin/lists/retail/CashierclassLists.php new file mode 100644 index 0000000..0e2de88 --- /dev/null +++ b/app/admin/lists/retail/CashierclassLists.php @@ -0,0 +1,71 @@ + ['merchant', 'store_id', 'customer', 'time', 'number', 'user', 'pay_type', 'type', 'auditinguser'], + ]; + return $search; + } + + public function queryWhere(): array + { + $where=['ass']; + return $where; + } + + /** + * @notes 获取零售订单列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function lists(): array + { + return Cashierclass::where($this->searchWhere) + ->field(['id', 'merchant', 'store_id', 'customer', 'time', 'number', 'total', 'deduction_price', 'actual', 'money', 'user', 'pay_type', 'type', 'auditinguser', 'auditingtime']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取零售订单数量 + * @return int + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function count(): int + { + return Cashierclass::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/retail/CashierinfoLists.php b/app/admin/lists/retail/CashierinfoLists.php new file mode 100644 index 0000000..2638aff --- /dev/null +++ b/app/admin/lists/retail/CashierinfoLists.php @@ -0,0 +1,65 @@ + ['pid', 'room', 'goods', 'warehouse', 'serial'], + ]; + } + + + /** + * @notes 获取零售订单详情列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function lists(): array + { + return Cashierinfo::where($this->searchWhere) + ->field(['id', 'pid', 'room', 'goods', 'warehouse', 'serial', 'nums', 'price', 'discount', 'total', 'data', 'more', 'sort']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取零售订单详情数量 + * @return int + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function count(): int + { + return Cashierinfo::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/admin/lists/setting/pay/PayConfigLists.php b/app/admin/lists/setting/pay/PayConfigLists.php new file mode 100644 index 0000000..62050ca --- /dev/null +++ b/app/admin/lists/setting/pay/PayConfigLists.php @@ -0,0 +1,50 @@ +append(['pay_way_name']) + ->order('sort','asc') + ->select() + ->toArray(); + + return $lists; + } + + + /** + * @notes 获取数量 + * @return int + * @author 段誉 + * @date 2023/2/23 16:15 + */ + public function count(): int + { + return PayConfig::count(); + } + + + +} \ No newline at end of file diff --git a/app/admin/logic/order/CartLogic.php b/app/admin/logic/order/CartLogic.php new file mode 100644 index 0000000..55c2ef2 --- /dev/null +++ b/app/admin/logic/order/CartLogic.php @@ -0,0 +1,96 @@ + $params['cart_num'], + 'goods_id' => $params['goods_id'], + 'uid' => $params['uid'], + 'source' => $params['source']??0, + 'mer_id' => $params['mer_id']??0, + 'staff_id' => $params['staff_id']??0, + 'is_new' => $params['is_new']??0, + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑购物车表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Cart::where(['uid'=>$params['uid'],'goods_id'=>$params['goods_id']])->inc('cart_num',$params['cart_num'])->update(); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除购物车表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public static function delete(array $params): bool + { + return Cart::destroy($params['cart_id']); + } + + + /** + * @notes 获取购物车表详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public static function detail($params): array + { + return Cart::findOrEmpty($params['cart_id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/retail/CashierclassLogic.php b/app/admin/logic/retail/CashierclassLogic.php new file mode 100644 index 0000000..0931e2c --- /dev/null +++ b/app/admin/logic/retail/CashierclassLogic.php @@ -0,0 +1,122 @@ + $params['merchant'], + 'store_id' => $params['store_id'], + 'customer' => $params['customer'], + 'time' => $params['time'], + 'number' => $params['number'], + 'total' => $params['total'], + 'deduction_price' => $params['deduction_price'], + 'actual' => $params['actual'], + 'money' => $params['money'], + 'pay_type' => $params['pay_type'], + 'data' => $params['data'], + 'type' => $params['type'], + 'auditinguser' => $params['auditinguser'], + 'auditingtime' => strtotime($params['auditingtime']), + 'more' => $params['more'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑零售订单 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Cashierclass::where('id', $params['id'])->update([ + 'merchant' => $params['merchant'], + 'store_id' => $params['store_id'], + 'customer' => $params['customer'], + 'time' => $params['time'], + 'number' => $params['number'], + 'total' => $params['total'], + 'deduction_price' => $params['deduction_price'], + 'actual' => $params['actual'], + 'money' => $params['money'], + 'pay_type' => $params['pay_type'], + 'data' => $params['data'], + 'type' => $params['type'], + 'auditinguser' => $params['auditinguser'], + 'auditingtime' => strtotime($params['auditingtime']), + 'more' => $params['more'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除零售订单 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public static function delete(array $params): bool + { + return Cashierclass::destroy($params['id']); + } + + + /** + * @notes 获取零售订单详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public static function detail($params): array + { + return Cashierclass::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/retail/CashierinfoLogic.php b/app/admin/logic/retail/CashierinfoLogic.php new file mode 100644 index 0000000..1c8e55f --- /dev/null +++ b/app/admin/logic/retail/CashierinfoLogic.php @@ -0,0 +1,94 @@ +getMessage()); + return false; + } + } + + + /** + * @notes 编辑零售订单详情 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + Cashierinfo::where('id', $params['id'])->update([ + + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除零售订单详情 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public static function delete(array $params): bool + { + return Cashierinfo::destroy($params['id']); + } + + + /** + * @notes 获取零售订单详情详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public static function detail($params): array + { + return Cashierinfo::findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/admin/logic/setting/pay/PayConfigLogic.php b/app/admin/logic/setting/pay/PayConfigLogic.php new file mode 100644 index 0000000..40a4b92 --- /dev/null +++ b/app/admin/logic/setting/pay/PayConfigLogic.php @@ -0,0 +1,91 @@ + $params['config']['interface_version'], + 'merchant_type' => $params['config']['merchant_type'], + 'mch_id' => $params['config']['mch_id'], + 'pay_sign_key' => $params['config']['pay_sign_key'], + 'apiclient_cert' => $params['config']['apiclient_cert'], + 'apiclient_key' => $params['config']['apiclient_key'], + ]; + } + if ($payConfig['pay_way'] == PayEnum::ALI_PAY) { + $config = [ + 'mode' => $params['config']['mode'], + 'merchant_type' => $params['config']['merchant_type'], + 'app_id' => $params['config']['app_id'], + 'private_key' => $params['config']['private_key'], + 'ali_public_key' => $params['config']['ali_public_key'], + ]; + } + + $payConfig->name = $params['name']; + $payConfig->icon = $params['icon']; + $payConfig->sort = $params['sort']; + $payConfig->config = $config; + $payConfig->remark = $params['remark'] ?? ''; + return $payConfig->save(); + } + + + /** + * @notes 获取配置 + * @param $params + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2023/2/23 16:16 + */ + public static function getConfig($params) + { + $payConfig = PayConfig::find($params['id'])->toArray(); + $payConfig['domain'] = '//'.request()->host();; + return $payConfig; + } + +} diff --git a/app/admin/logic/setting/pay/PayWayLogic.php b/app/admin/logic/setting/pay/PayWayLogic.php new file mode 100644 index 0000000..a6e0745 --- /dev/null +++ b/app/admin/logic/setting/pay/PayWayLogic.php @@ -0,0 +1,111 @@ +append(['pay_way_name']) + ->toArray(); + + if (empty($payWay)) { + return []; + } + + $lists = []; + for ($i = 1; $i <= max(array_column($payWay, 'scene')); $i++) { + foreach ($payWay as $val) { + if ($val['scene'] == $i) { + $val['icon'] = FileService::getFileUrl(PayConfig::where('id', $val['pay_config_id'])->value('icon')); + $lists[$i][] = $val; + } + } + } + + return $lists; + } + + + /** + * @notes 设置支付方式 + * @param $params + * @return bool|string + * @throws \Exception + * @author 段誉 + * @date 2023/2/23 16:26 + */ + public static function setPayWay($params) + { + $payWay = new PayWay; + $data = []; + foreach ($params as $key => $value) { + $isDefault = array_column($value, 'is_default'); + $isDefaultNum = array_count_values($isDefault); + $status = array_column($value, 'status'); + $sceneName = PayEnum::getPaySceneDesc($key); + if (!in_array(YesNoEnum::YES, $isDefault)) { + return $sceneName . '支付场景缺少默认支付'; + } + if ($isDefaultNum[YesNoEnum::YES] > 1) { + return $sceneName . '支付场景的默认值只能存在一个'; + } + if (!in_array(YesNoEnum::YES, $status)) { + return $sceneName . '支付场景至少开启一个支付状态'; + } + + foreach ($value as $val) { + $result = PayWay::where('id', $val['id'])->findOrEmpty(); + if ($result->isEmpty()) { + continue; + } + if ($val['is_default'] == YesNoEnum::YES && $val['status'] == YesNoEnum::NO) { + return $sceneName . '支付场景的默认支付未开启支付状态'; + } + $data[] = [ + 'id' => $val['id'], + 'is_default' => $val['is_default'], + 'status' => $val['status'], + ]; + } + } + $payWay->saveAll($data); + return true; + } +} + diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index 9f2bc08..c3dad5b 100755 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -16,6 +16,9 @@ namespace app\admin\logic\user; use app\common\enum\user\UserTerminalEnum; use app\common\logic\BaseLogic; use app\common\model\user\User; +use think\facade\Db; +use app\common\service\FileService; +use Webman\Config; /** * 用户逻辑层 @@ -24,6 +27,73 @@ use app\common\model\user\User; */ class UserLogic extends BaseLogic { + /** + * @notes 添加用户列表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public static function add(array $params): bool + { + $passwordSalt = Config::get('project.unique_identification'); + $password = create_password($params['password'], $passwordSalt); + $defaultAvatar = config('project.default_image.admin_avatar'); + $avatar = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : $defaultAvatar; + + Db::startTrans(); + try { + User::create([ + 'avatar' => $avatar, + 'real_name' => $params['real_name'], + 'nickname' => $params['nickname'], + 'account' => $params['account'], + 'password' => $password, + 'mobile' => $params['mobile'], + 'sex' => $params['sex'], + 'is_disable' => $params['is_disable'], + 'user_money' => $params['user_money'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + /** + * @notes 编辑用户列表 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + User::where('id', $params['id'])->update([ + 'avatar' => $params['avatar'], + 'real_name' => $params['real_name'], + 'nickname' => $params['nickname'], + 'account' => $params['account'], + 'password' => $params['password'], + 'mobile' => $params['mobile'], + 'sex' => $params['sex'], + 'is_disable' => $params['is_disable'], + 'user_money' => $params['user_money'] + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } /** * @notes 用户详情 @@ -62,5 +132,4 @@ class UserLogic extends BaseLogic $params['field'] => $params['value'] ]); } - -} \ No newline at end of file +} diff --git a/app/admin/validate/order/CartValidate.php b/app/admin/validate/order/CartValidate.php new file mode 100644 index 0000000..3ca3d3e --- /dev/null +++ b/app/admin/validate/order/CartValidate.php @@ -0,0 +1,84 @@ + 'require|number', + 'goods_id' => 'require|number', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'cart_num' => '数量', + 'goods_id' => '商品id', + ]; + + + /** + * @notes 添加场景 + * @return CartValidate + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function sceneAdd() + { + return $this->only(['cart_num','goods_id']); + } + + + /** + * @notes 编辑场景 + * @return CartValidate + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function sceneEdit() + { + return $this->only(['']); + } + + + /** + * @notes 删除场景 + * @return CartValidate + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function sceneDelete() + { + return $this->only(['']); + } + + + /** + * @notes 详情场景 + * @return CartValidate + * @author likeadmin + * @date 2024/04/24 10:37 + */ + public function sceneDetail() + { + return $this->only(['']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/retail/CashierclassValidate.php b/app/admin/validate/retail/CashierclassValidate.php new file mode 100644 index 0000000..d6c46fd --- /dev/null +++ b/app/admin/validate/retail/CashierclassValidate.php @@ -0,0 +1,98 @@ + 'require', + 'merchant' => 'require', + 'customer' => 'require', + 'time' => 'require', + 'number' => 'require', + 'total' => 'require', + 'actual' => 'require', + 'money' => 'require', + 'pay_type' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'merchant' => '所属商户', + 'customer' => '客户ID', + 'time' => '单据时间', + 'number' => '单据编号', + 'total' => '单据金额', + 'actual' => '实际金额', + 'money' => '实收金额', + 'pay_type' => '支付方式 0余额 1微信 2小程序 3 h5 4支付宝 5 支付宝扫码 6 微信扫码 8先货后款 10对公转账', + ]; + + + /** + * @notes 添加场景 + * @return CashierclassValidate + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function sceneAdd() + { + return $this->only(['merchant','customer','time','number','total','actual','money','pay_type']); + } + + + /** + * @notes 编辑场景 + * @return CashierclassValidate + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function sceneEdit() + { + return $this->only(['id','merchant','customer','time','number','total','actual','money','pay_type']); + } + + + /** + * @notes 删除场景 + * @return CashierclassValidate + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return CashierclassValidate + * @author likeadmin + * @date 2024/04/24 09:57 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/retail/CashierinfoValidate.php b/app/admin/validate/retail/CashierinfoValidate.php new file mode 100644 index 0000000..ded9671 --- /dev/null +++ b/app/admin/validate/retail/CashierinfoValidate.php @@ -0,0 +1,82 @@ + 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + ]; + + + /** + * @notes 添加场景 + * @return CashierinfoValidate + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function sceneAdd() + { + return $this->remove('id', true); + } + + + /** + * @notes 编辑场景 + * @return CashierinfoValidate + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function sceneEdit() + { + return $this->only(['id']); + } + + + /** + * @notes 删除场景 + * @return CashierinfoValidate + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return CashierinfoValidate + * @author likeadmin + * @date 2024/04/24 10:11 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/admin/validate/setting/PayConfigValidate.php b/app/admin/validate/setting/PayConfigValidate.php new file mode 100644 index 0000000..12e0569 --- /dev/null +++ b/app/admin/validate/setting/PayConfigValidate.php @@ -0,0 +1,128 @@ + 'require', + 'name' => 'require|checkName', + 'icon' => 'require', + 'sort' => 'require|number|max:5', + 'config' => 'require|checkConfig', + ]; + + protected $message = [ + 'id.require' => 'id不能为空', + 'name.require' => '支付名称不能为空', + 'icon.require' => '支付图标不能为空', + 'sort.require' => '排序不能为空', + 'sort,number' => '排序必须是纯数字', + 'sort.max' => '排序最大不能超过五位数', + 'config.require' => '支付参数缺失', + ]; + + public function sceneGet() + { + return $this->only(['id']); + } + + + /** + * @notes 校验支付配置记录 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2023/2/23 16:19 + */ + public function checkConfig($config, $rule, $data) + { + $result = PayConfig::where('id', $data['id'])->find(); + if (empty($result)) { + return '支付方式不存在'; + } + + if ($result['pay_way'] == PayEnum::WECHAT_PAY) { + if (empty($config['interface_version'])) { + return '微信支付接口版本不能为空'; + } + if (empty($config['merchant_type'])) { + return '商户类型不能为空'; + } + if (empty($config['mch_id'])) { + return '微信支付商户号不能为空'; + } + if (empty($config['pay_sign_key'])) { + return '商户API密钥不能为空'; + } + if (empty($config['apiclient_cert'])) { + return '微信支付证书不能为空'; + } + if (empty($config['apiclient_key'])) { + return '微信支付证书密钥不能为空'; + } + } + if ($result['pay_way'] == PayEnum::ALI_PAY) { + if (empty($config['mode'])) { + return '模式不能为空'; + } + if (empty($config['merchant_type'])) { + return '商户类型不能为空'; + } + if (empty($config['app_id'])) { + return '应用ID不能为空'; + } + if (empty($config['private_key'])) { + return '应用私钥不能为空'; + } + if (empty($config['ali_public_key'])) { + return '支付宝公钥不能为空'; + } + } + return true; + } + + + /** + * @notes 校验支付名 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2023/2/23 16:19 + */ + public function checkName($value, $rule, $data) + { + $result = PayConfig::where('name', $value) + ->where('id', '<>', $data['id']) + ->findOrEmpty(); + if (!$result->isEmpty()) { + return '支付名称已存在'; + } + return true; + } +} \ No newline at end of file diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index 7ce67a6..67b1d5c 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -1,110 +1,92 @@ 'require|checkUser', - 'field' => 'require|checkField', - 'value' => 'require', - ]; - protected $message = [ - 'id.require' => '请选择用户', - 'field.require' => '请选择操作', - 'value.require' => '请输入内容', + /** + * 设置校验规则 + * @var string[] + */ + protected $rule = [ + 'id' => 'require', + 'real_name' => 'require', + 'nickname' => 'require', + 'account' => 'require', + 'password' => 'require', + 'mobile' => 'require', ]; /** - * @notes 详情场景 - * @return \app\admin\validate\user\UserValidate - * @author 乔峰 - * @date 2022/9/22 16:35 + * 参数描述 + * @var string[] */ - public function sceneDetail() + protected $field = [ + 'id' => 'id', + 'real_name' => '真实姓名', + 'nickname' => '用户昵称', + 'account' => '用户账号', + 'password' => '用户密码', + 'mobile' => '用户电话', + ]; + + + /** + * @notes 添加场景 + * @return UserValidate + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public function sceneAdd() + { + return $this->only(['real_name','nickname','account','password','mobile']); + } + + + /** + * @notes 编辑场景 + * @return UserValidate + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public function sceneEdit() + { + return $this->only(['id','real_name','nickname','account','password','mobile']); + } + + + /** + * @notes 删除场景 + * @return UserValidate + * @author likeadmin + * @date 2024/04/25 10:20 + */ + public function sceneDelete() { return $this->only(['id']); } /** - * @notes 用户信息校验 - * @param $value - * @param $rule - * @param $data - * @return bool|string - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author 乔峰 - * @date 2022/9/22 17:03 + * @notes 详情场景 + * @return UserValidate + * @author likeadmin + * @date 2024/04/25 10:20 */ - public function checkUser($value, $rule, $data) + public function sceneDetail() { - $userIds = is_array($value) ? $value : [$value]; - - foreach ($userIds as $item) { - if (!User::find($item)) { - return '用户不存在！'; - } - } - return true; + return $this->only(['id']); } - - /** - * @notes 校验是否可更新信息 - * @param $value - * @param $rule - * @param $data - * @return bool|string - * @author 乔峰 - * @date 2022/9/22 16:37 - */ - public function checkField($value, $rule, $data) - { - $allowField = ['account', 'sex', 'mobile', 'real_name']; - - if (!in_array($value, $allowField)) { - return '用户信息不允许更新'; - } - - switch ($value) { - case 'account': - //验证手机号码是否存在 - $account = User::where([ - ['id', '<>', $data['id']], - ['account', '=', $data['value']] - ])->findOrEmpty(); - - if (!$account->isEmpty()) { - return '账号已被使用'; - } - break; - - case 'mobile': - if (false == $this->validate($data['value'], 'mobile', $data)) { - return '手机号码格式错误'; - } - - //验证手机号码是否存在 - $mobile = User::where([ - ['id', '<>', $data['id']], - ['mobile', '=', $data['value']] - ])->findOrEmpty(); - - if (!$mobile->isEmpty()) { - return '手机号码已存在'; - } - break; - } - return true; - } } \ No newline at end of file diff --git a/app/api/controller/BaseApiController.php b/app/api/controller/BaseApiController.php new file mode 100644 index 0000000..a319ac1 --- /dev/null +++ b/app/api/controller/BaseApiController.php @@ -0,0 +1,18 @@ +request->userInfo) && $this->request->userInfo) { + $this->userInfo = $this->request->userInfo; + $this->userId = $this->request->userInfo['user_id']; + } + } +} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 372ad82..84ec37f 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -4,12 +4,14 @@ namespace app\api\controller; use app\admin\validate\tools\GenerateTableValidate; use app\admin\logic\tools\GeneratorLogic; -use app\common\controller\BaseLikeAdminController; -class IndexController extends BaseLikeAdminController +class IndexController extends BaseApiController { + public $notNeedLogin = ['index']; + public function index() { + d(2); return json(['msg' =>create_password(123456, '11d3')]); } @@ -19,7 +21,6 @@ class IndexController extends BaseLikeAdminController public function download() { $params = (new GenerateTableValidate())->goCheck('download'); - var_dump($params); $result = GeneratorLogic::download($params['file']); if (false === $result) { return $this->fail(GeneratorLogic::getError() ?: '下载失败'); diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php new file mode 100644 index 0000000..310abd6 --- /dev/null +++ b/app/api/controller/LoginController.php @@ -0,0 +1,22 @@ +request->post(); + $params = (new LoginAccountValidate())->post()->goCheck(); + $result = LoginLogic::login($params); + if (false === $result) { + return $this->fail(LoginLogic::getError()); + } + return $this->data($result); + } +} diff --git a/app/api/controller/order/CartController.php b/app/api/controller/order/CartController.php new file mode 100644 index 0000000..bd58f8a --- /dev/null +++ b/app/api/controller/order/CartController.php @@ -0,0 +1,28 @@ +get()->goCheck('add'); + $params['uid']=1; + $result=Cart::where(['uid'=>$params['uid'],'goods_id'=>$params['goods_id'],'is_fail'=>0,'is_pay'=>0])->find(); + if($result){ + $res=CartLogic::edit($params); + }else{ + $res=CartLogic::add($params); + } + if($res){ + return $this->success('添加成功'); + }else{ + return $this->fail(CartLogic::getError()); + } + } + +} \ No newline at end of file diff --git a/app/api/controller/order/PurchaseOrderController.php b/app/api/controller/order/PurchaseOrderController.php new file mode 100644 index 0000000..f3894fc --- /dev/null +++ b/app/api/controller/order/PurchaseOrderController.php @@ -0,0 +1,50 @@ +request->get(); + $params['store_id']=1; + $res=OrderLogic::cartIdByPurchaseOrderInfo($params); + return $this->data($res); + } + + /** + * @notes 创建购货订单 + */ + public function createOrder(){ + + $user=User::where('id',$this->request->userId)->find(); + $cartId = (Array)$this->request->post('cart_id', []); + $addressId = (int)$this->request->post('address_id'); + $pay_type = (int)$this->request->post('pay_type'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + $params=$this->request->post(); + $order=OrderLogic::createOrder($cartId,$addressId,null,$params); + if(is_object($order)){ + if($pay_type==PayEnum::BALANCE_PAY){ + $user=User::where('id',$this->request->userId)->find(); + RetailOrderLogic::payBalance($user,$order); + return $this->success('支付成功'); + } + return $this->data(['order_id'=>$order->id]); + }else{ + return $this->fail(OrderLogic::getError()); + } + } +} \ No newline at end of file diff --git a/app/api/controller/order/RetailOrderController.php b/app/api/controller/order/RetailOrderController.php new file mode 100644 index 0000000..f59fe40 --- /dev/null +++ b/app/api/controller/order/RetailOrderController.php @@ -0,0 +1,49 @@ +request->post('cart_id', []); + $addressId = (int)$this->request->post('address_id'); + $pay_type = (int)$this->request->post('pay_type'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + $params=$this->request->post(); + $res=OrderLogic::cartIdByOrderInfo($cartId,$addressId,null,$params); + return $this->data($res); + } + + /** + * @notes 创建零售订单 + */ + public function createOrder(){ + + $user=User::where('id',$this->request->userId)->find(); + $cartId = (Array)$this->request->post('cart_id', []); + $addressId = (int)$this->request->post('address_id'); + $pay_type = (int)$this->request->post('pay_type'); + $auth_code = $this->request->post('auth_code'); //微信支付条码 + $params=$this->request->post(); + $order=OrderLogic::createOrder($cartId,$addressId,null,$params); + if(is_object($order)){ + if($pay_type==PayEnum::BALANCE_PAY){ + $user=User::where('id',$this->request->userId)->find(); + RetailOrderLogic::payBalance($user,$order); + return $this->success('支付成功'); + } + return $this->data(['order_id'=>$order->id]); + }else{ + return $this->fail(OrderLogic::getError()); + } + } +} \ No newline at end of file diff --git a/app/api/http/middleware/InitMiddleware.php b/app/api/http/middleware/InitMiddleware.php new file mode 100644 index 0000000..999fbc3 --- /dev/null +++ b/app/api/http/middleware/InitMiddleware.php @@ -0,0 +1,34 @@ +controller); + $controllerClass = new $controller; + if (($controllerClass instanceof BaseApiController) === false) { + throw new ControllerExtendException($controller, '404'); + } + } catch (ClassNotFoundException $e) { + throw new HttpException(404, 'controller not exists:' . $e->getClass()); + } + + //创建控制器对象 + $request->controllerObject = new $controller; + return $handler($request); + } +} \ No newline at end of file diff --git a/app/api/http/middleware/LoginMiddleware.php b/app/api/http/middleware/LoginMiddleware.php new file mode 100644 index 0000000..2971ebf --- /dev/null +++ b/app/api/http/middleware/LoginMiddleware.php @@ -0,0 +1,63 @@ +header('token'); + //判断接口是否免登录 + $isNotNeedLogin = $request->controllerObject->isNotNeedLogin(); + + //不直接判断$isNotNeedLogin结果，使不需要登录的接口通过，为了兼容某些接口可以登录或不登录访问 + if (empty($token) && !$isNotNeedLogin) { + //没有token并且该地址需要登录才能访问, 指定show为0，前端不弹出此报错 + return JsonService::fail('请求参数缺token', [], 0, 0); + } + + $userInfo = (new UserTokenCache())->getUserInfo($token); + + if (empty($userInfo) && !$isNotNeedLogin) { + //token过期无效并且该地址需要登录才能访问 + return JsonService::fail('登录超时，请重新登录', [], -1, 0); + } + + //token临近过期，自动续期 + if ($userInfo) { + //获取临近过期自动续期时长 + $beExpireDuration = Config::get('project.user_token.be_expire_duration'); + //token续期 + if (time() > ($userInfo['expire_time'] - $beExpireDuration)) { + $result = UserTokenService::overtimeToken($token); + //续期失败（数据表被删除导致） + if (empty($result)) { + return JsonService::fail('登录过期', [], -1); + } + } + } + + //给request赋值，用于控制器 + $request->userInfo = $userInfo; + $request->userId = $userInfo['user_id'] ?? 0; + + return $handler($request); + } + +} \ No newline at end of file diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php new file mode 100644 index 0000000..a4e0f06 --- /dev/null +++ b/app/api/logic/LoginLogic.php @@ -0,0 +1,431 @@ + $userSn, + 'avatar' => $avatar, + 'nickname' => '用户' . $userSn, + 'account' => $params['account'], + 'password' => $password, + 'channel' => $params['channel'], + ]); + + return true; + } catch (\Exception $e) { + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 账号/手机号登录，手机号验证码 + * @param $params + * @return array|false + * @author 段誉 + * @date 2022/9/6 19:26 + */ + public static function login($params) + { + try { + // 账号/手机号 密码登录 + $where = ['account|mobile' => $params['account']]; + if ($params['scene'] == LoginEnum::MOBILE_CAPTCHA) { + //手机验证码登录 + $where = ['mobile' => $params['account']]; + } + + $user = User::where($where)->findOrEmpty(); + if ($user->isEmpty()) { + throw new \Exception('用户不存在'); + } + + //更新登录信息 + $user->login_time = time(); + $user->login_ip = request()->getLocalIp(); + $user->save(); + + //设置token + $userInfo = UserTokenService::setToken($user->id, $params['terminal']); + + //返回登录信息 + $avatar = $user->avatar ?: Config::get('project.default_image.user_avatar'); + $avatar = FileService::getFileUrl($avatar); + + return [ + 'nickname' => $userInfo['nickname'], + // 'sn' => $userInfo['sn'], + 'mobile' => $userInfo['mobile'], + 'avatar' => $avatar, + 'token' => $userInfo['token'], + ]; + } catch (\Exception $e) { + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 退出登录 + * @param $userInfo + * @return bool + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/9/16 17:56 + */ + public static function logout($userInfo) + { + //token不存在，不注销 + if (!isset($userInfo['token'])) { + return false; + } + + //设置token过期 + return UserTokenService::expireToken($userInfo['token']); + } + + + /** + * @notes 获取微信请求code的链接 + * @param string $url + * @return string + * @author 段誉 + * @date 2022/9/20 19:47 + */ + public static function codeUrl(string $url) + { + // return (new WeChatOaService())->getCodeUrl($url); + } + + + /** + * @notes 公众号登录 + * @param array $params + * @return array|false + * @throws \GuzzleHttp\Exception\GuzzleException + * @author 段誉 + * @date 2022/9/20 19:47 + */ + public static function oaLogin(array $params) + { + // Db::startTrans(); + // try { + // //通过code获取微信 openid + // $response = (new WeChatOaService())->getOaResByCode($params['code']); + // $userServer = new WechatUserService($response, UserTerminalEnum::WECHAT_OA); + // $userInfo = $userServer->getResopnseByUserInfo()->authUserLogin()->getUserInfo(); + + // // 更新登录信息 + // self::updateLoginInfo($userInfo['id']); + + // Db::commit(); + // return $userInfo; + + // } catch (\Exception $e) { + // Db::rollback(); + // self::$error = $e->getMessage(); + // return false; + // } + } + + + /** + * @notes 小程序-静默登录 + * @param array $params + * @return array|false + * @author 段誉 + * @date 2022/9/20 19:47 + */ + public static function silentLogin(array $params) + { + try { + //通过code获取微信 openid + $response = (new WeChatMnpService())->getMnpResByCode($params['code']); + $userServer = new WechatUserService($response, UserTerminalEnum::WECHAT_MMP); + $userInfo = $userServer->getResopnseByUserInfo('silent')->getUserInfo(); + + if (!empty($userInfo)) { + // 更新登录信息 + self::updateLoginInfo($userInfo['id']); + } + + return $userInfo; + } catch (\Exception $e) { + self::$error = $e->getMessage(); + return false; + } + } + + + /** + * @notes 小程序-授权登录 + * @param array $params + * @return array|false + * @author 段誉 + * @date 2022/9/20 19:47 + */ + public static function mnpLogin(array $params) + { + Db::startTrans(); + try { + //通过code获取微信 openid + $response = (new WeChatMnpService())->getMnpResByCode($params['code']); + $userServer = new WechatUserService($response, UserTerminalEnum::WECHAT_MMP); + $userInfo = $userServer->getResopnseByUserInfo()->authUserLogin()->getUserInfo(); + + // 更新登录信息 + self::updateLoginInfo($userInfo['id']); + + Db::commit(); + return $userInfo; + } catch (\Exception $e) { + Db::rollback(); + self::$error = $e->getMessage(); + return false; + } + } + + + /** + * @notes 更新登录信息 + * @param $userId + * @throws \Exception + * @author 段誉 + * @date 2022/9/20 19:46 + */ + public static function updateLoginInfo($userId) + { + $user = User::findOrEmpty($userId); + if ($user->isEmpty()) { + throw new \Exception('用户不存在'); + } + + $time = time(); + $user->login_time = $time; + $user->login_ip = request()->getLocalIp(); + $user->update_time = $time; + $user->save(); + } + + + /** + * @notes 小程序端绑定微信 + * @param array $params + * @return bool + * @author 段誉 + * @date 2022/9/20 19:46 + */ + public static function mnpAuthLogin(array $params) + { + // try { + // //通过code获取微信openid + // $response = (new WeChatMnpService())->getMnpResByCode($params['code']); + // $response['user_id'] = $params['user_id']; + // $response['terminal'] = UserTerminalEnum::WECHAT_MMP; + + // return self::createAuth($response); + + // } catch (\Exception $e) { + // self::$error = $e->getMessage(); + // return false; + // } + } + + + /** + * @notes 公众号端绑定微信 + * @param array $params + * @return bool + * @throws \GuzzleHttp\Exception\GuzzleException + * @author 段誉 + * @date 2022/9/16 10:43 + */ + public static function oaAuthLogin(array $params) + { + // try { + // //通过code获取微信openid + // $response = (new WeChatOaService())->getOaResByCode($params['code']); + // $response['user_id'] = $params['user_id']; + // $response['terminal'] = UserTerminalEnum::WECHAT_OA; + + // return self::createAuth($response); + + // } catch (\Exception $e) { + // self::$error = $e->getMessage(); + // return false; + // } + } + + + /** + * @notes 生成授权记录 + * @param $response + * @return bool + * @throws \Exception + * @author 段誉 + * @date 2022/9/16 10:43 + */ + public static function createAuth($response) + { + //先检查openid是否有记录 + $isAuth = UserAuth::where('openid', '=', $response['openid'])->findOrEmpty(); + if (!$isAuth->isEmpty()) { + throw new \Exception('该微信已被绑定'); + } + + if (isset($response['unionid']) && !empty($response['unionid'])) { + //在用unionid找记录，防止生成两个账号，同个unionid的问题 + $userAuth = UserAuth::where(['unionid' => $response['unionid']]) + ->findOrEmpty(); + if (!$userAuth->isEmpty() && $userAuth->user_id != $response['user_id']) { + throw new \Exception('该微信已被绑定'); + } + } + + //如果没有授权，直接生成一条微信授权记录 + UserAuth::create([ + 'user_id' => $response['user_id'], + 'openid' => $response['openid'], + 'unionid' => $response['unionid'] ?? '', + 'terminal' => $response['terminal'], + ]); + return true; + } + + + /** + * @notes 获取扫码登录地址 + * @return array|false + * @author 段誉 + * @date 2022/10/20 18:23 + */ + public static function getScanCode($redirectUri) + { + // try { + // $config = WeChatConfigService::getOpConfig(); + // $appId = $config['app_id']; + // $redirectUri = UrlEncode($redirectUri); + + // // 设置有效时间标记状态, 超时扫码不可登录 + // $state = MD5(time().rand(10000, 99999)); + // (new WebScanLoginCache())->setScanLoginState($state); + + // // 扫码地址 + // $url = WeChatRequestService::getScanCodeUrl($appId, $redirectUri, $state); + // return ['url' => $url]; + + // } catch (\Exception $e) { + // self::$error = $e->getMessage(); + // return false; + // } + } + + + /** + * @notes 网站扫码登录 + * @param $params + * @return array|false + * @author 段誉 + * @date 2022/10/21 10:28 + */ + public static function scanLogin($params) + { + // Db::startTrans(); + // try { + // // 通过code 获取 access_token,openid,unionid等信息 + // $userAuth = WeChatRequestService::getUserAuthByCode($params['code']); + + // if (empty($userAuth['openid']) || empty($userAuth['access_token'])) { + // throw new \Exception('获取用户授权信息失败'); + // } + + // // 获取微信用户信息 + // $response = WeChatRequestService::getUserInfoByAuth($userAuth['access_token'], $userAuth['openid']); + + // // 生成用户或更新用户信息 + // $userServer = new WechatUserService($response, UserTerminalEnum::PC); + // $userInfo = $userServer->getResopnseByUserInfo()->authUserLogin()->getUserInfo(); + + // // 更新登录信息 + // self::updateLoginInfo($userInfo['id']); + + // Db::commit(); + // return $userInfo; + + // } catch (\Exception $e) { + // Db::rollback(); + // self::$error = $e->getMessage(); + // return false; + // } + } + + + /** + * @notes 更新用户信息 + * @param $params + * @param $userId + * @return User + * @author 段誉 + * @date 2023/2/22 11:19 + */ + public static function updateUser($params, $userId) + { + return User::where(['id' => $userId])->update([ + 'nickname' => $params['nickname'], + 'avatar' => FileService::setFileUrl($params['avatar']), + 'is_new_user' => YesNoEnum::NO + ]); + } +} \ No newline at end of file diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php new file mode 100644 index 0000000..8e9c0fe --- /dev/null +++ b/app/api/logic/order/OrderLogic.php @@ -0,0 +1,176 @@ + 0, 'is_fail' => 0]; + $cart_select = Cart::whereIn('cart_id', $cartId)->where($where)->field('goods_id as goods,cart_num')->select()->toArray(); + if (empty($cart_select)) { + self::setError('购物车为空'); + return false; + } + /** 计算价格 */ + foreach ($cart_select as $k => $v) { + $sell = Goods::where(['id' => $v['goods']])->value('sell'); + $cart_select[$k]['total'] = bcmul($v['cart_num'], $sell, 2); + $cart_select[$k]['price'] = $sell; + } + $order = [ + 'time' => time(), + 'number' => static::getNewOrderId('PF'), + 'total' => array_sum(array_column($cart_select, 'total')), + 'pay_type' => $params['pay_type'], + 'cart_id'=>explode(',',$cartId) + ]; + return ['order' => $order, 'cart_list' => $cart_select]; + } + + /** + * 创建新订单 + * @return Object + */ + static public function createOrder($cartId, $addressId, $user = null, $params = []): Object + { + + $orderInfo = self::cartIdByOrderInfo($cartId, $addressId, $user, $params); + $_order = $orderInfo['order']; + $_order['deduction_price'] = 0; + $_order['merchant'] = 0; + $_order['customer'] = request()->userId; + $_order['money'] = 0; + $_order['user'] = request()->userId; + $_order['account'] = 0; + $_order['payinfo'] = ''; + $_order['type'] = 0; + $_order['actual'] = $_order['total']; + Db::startTrans(); + try { + $order = Cashierclass::create($_order); + $goods_list = $orderInfo['cart_list']; + foreach ($goods_list as $k => $v) { + $goods_list[$k]['pid'] = $order->id; + $goods_list[$k]['merchant'] = 0; + $goods_list[$k]['room'] = 0; + $goods_list[$k]['discount'] = 0; + $goods_list[$k]['warehouse'] = 0; + $goods_list[$k]['nums'] = $v['cart_num']; + } + (new Cashierinfo())->saveAll($goods_list); + Db::commit(); + return $order; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + /** + * @notes 获取购货订单购物车商品信息 + * @param $params + * @return array + */ + static public function cartIdByPurchaseOrderInfo($params = []) + { + $where1=['paid'=>1]; + d(222); + $cartId=Cashierinfo::where('store_id',$params['store_id'])->where($where1)->select(); + throw new \RuntimeException("Command has no defaultName"); + $cartId=implode(',',$cartId); + var_dump($cartId); + $where = ['is_pay' => 0, 'is_fail' => 0]; + $cart_select = Cart::whereIn('cart_id', $cartId)->where($where)->field('goods_id as goods,cart_num')->select()->toArray(); + if (empty($cart_select)) { + self::setError('购物车为空'); + return false; + } + /** 计算价格 */ + foreach ($cart_select as $k => $v) { + $sell = Goods::where(['id' => $v['goods']])->value('sell'); + $cart_select[$k]['total'] = bcmul($v['cart_num'], $sell, 2); + $cart_select[$k]['price'] = $sell; + } + $order = [ + 'time' => time(), + 'number' => static::getNewOrderId('PF'), + 'total' => array_sum(array_column($cart_select, 'total')), + 'pay_type' => $params['pay_type'], + 'cart_id'=>explode(',',$cartId) + ]; + return ['order' => $order, 'cart_list' => $cart_select]; + } + /** + * 创建购货订单 + * @return Object + */ + static public function createPurchaseOrder($cartId, $addressId, $user = null, $params = []): Object + { + + $orderInfo = self::cartIdByOrderInfo($cartId, $addressId, $user, $params); + $_order = $orderInfo['order']; + $_order['deduction_price'] = 0; + $_order['merchant'] = 0; + $_order['customer'] = request()->userId; + $_order['money'] = 0; + $_order['user'] = request()->userId; + $_order['account'] = 0; + $_order['payinfo'] = ''; + $_order['type'] = 0; + $_order['actual'] = $_order['total']; + Db::startTrans(); + try { + $order = Cashierclass::create($_order); + $goods_list = $orderInfo['cart_list']; + foreach ($goods_list as $k => $v) { + $goods_list[$k]['pid'] = $order->id; + $goods_list[$k]['merchant'] = 0; + $goods_list[$k]['room'] = 0; + $goods_list[$k]['discount'] = 0; + $goods_list[$k]['warehouse'] = 0; + $goods_list[$k]['nums'] = $v['cart_num']; + } + (new Cashierinfo())->saveAll($goods_list); + Db::commit(); + return $order; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + /** + * @notes 获取订单号 + * @param $type + * @return string + * @author likeadmin + * @date 2021/7/28 17:05 + */ + static public function getNewOrderId($type) + { + list($msec, $sec) = explode(' ', microtime()); + $msectime = number_format((floatval($msec) + floatval($sec)) * 1000, 0, '', ''); + $orderId = $type . $msectime . mt_rand(10000, max(intval($msec * 10000) + 10000, 98369)); + return $orderId; + } +} diff --git a/app/api/service/UserTokenService.php b/app/api/service/UserTokenService.php new file mode 100644 index 0000000..98c261a --- /dev/null +++ b/app/api/service/UserTokenService.php @@ -0,0 +1,103 @@ +find(); + + //获取token延长过期的时间 + $expireTime = $time + Config::get('project.user_token.expire_duration'); + $userTokenCache = new UserTokenCache(); + //token处理 + if ($userSession) { + //清空缓存 + $userTokenCache->deleteUserInfo($userSession->token); + //重新获取token + $userSession->token = create_token($userId); + $userSession->expire_time = $expireTime; + $userSession->update_time = $time; + $userSession->save(); + } else { + //找不到在该终端的token记录，创建token记录 + $userSession = UserSession::create([ + 'user_id' => $userId, + 'terminal' => $terminal, + 'token' => create_token($userId), + 'expire_time' => $expireTime + ]); + } + return $userTokenCache->setUserInfo($userSession->token); + } + + + /** + * @notes 延长token过期时间 + * @param $token + * @return array|false|mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/9/16 10:10 + */ + public static function overtimeToken($token) + { + $time = time(); + $adminSession = UserSession::where('token', '=', $token)->find(); + //延长token过期时间 + $adminSession->expire_time = $time + Config::get('project.user_token.expire_duration'); + $adminSession->update_time = $time; + $adminSession->save(); + + return (new UserTokenCache())->setUserInfo($adminSession->token); + } + + + /** + * @notes 设置token为过期 + * @param $token + * @return bool + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/9/16 10:10 + */ + public static function expireToken($token) + { + $userSession = UserSession::where('token', '=', $token) + ->find(); + if (empty($userSession)) { + return false; + } + + $time = time(); + $userSession->expire_time = $time; + $userSession->update_time = $time; + $userSession->save(); + + return (new UserTokenCache())->deleteUserInfo($token); + } + +} \ No newline at end of file diff --git a/app/api/service/WechatUserService.php b/app/api/service/WechatUserService.php new file mode 100644 index 0000000..0594b6f --- /dev/null +++ b/app/api/service/WechatUserService.php @@ -0,0 +1,254 @@ +terminal = $terminal; + $this->setParams($response); + } + + + /** + * @notes 设置微信返回的用户信息 + * @param $response + * @author cjhao + * @date 2021/8/2 11:49 + */ + private function setParams($response): void + { + $this->response = $response; + $this->openid = $response['openid']; + $this->unionid = $response['unionid'] ?? ''; + $this->nickname = $response['nickname'] ?? ''; + $this->headimgurl = $response['headimgurl'] ?? ''; + } + + + /** + * @notes 根据opendid或unionid获取系统用户信息 + * @return $this + * @author 段誉 + * @date 2022/9/23 16:09 + */ + public function getResopnseByUserInfo(): self + { + $openid = $this->openid; + $unionid = $this->unionid; + + $user = User::alias('u') + ->field('u.id,u.sn,u.mobile,u.nickname,u.avatar,u.mobile,u.is_disable,u.is_new_user') + ->join('user_auth au', 'au.user_id = u.id') + ->where(function ($query) use ($openid, $unionid) { + $query->whereOr(['au.openid' => $openid]); + if (isset($unionid) && $unionid) { + $query->whereOr(['au.unionid' => $unionid]); + } + }) + ->findOrEmpty(); + + $this->user = $user; + return $this; + } + + + /** + * @notes 获取用户信息 + * @param bool $isCheck 是否验证账号是否可用 + * @return array + * @throws Exception + * @author cjhao + * @date 2021/8/3 11:42 + */ + public function getUserInfo($isCheck = true): array + { + if (!$this->user->isEmpty() && $isCheck) { + $this->checkAccount(); + } + if (!$this->user->isEmpty()) { + $this->getToken(); + } + return $this->user->toArray(); + } + + + /** + * @notes 校验账号 + * @throws Exception + * @author 段誉 + * @date 2022/9/16 10:14 + */ + private function checkAccount() + { + if ($this->user->is_disable) { + throw new Exception('您的账号异常，请联系客服。'); + } + } + + + /** + * @notes 创建用户 + * @throws Exception + * @author 段誉 + * @date 2022/9/16 10:06 + */ + private function createUser(): void + { + //设置头像 + if (empty($this->headimgurl)) { + // 默认头像 + $defaultAvatar = config('project.default_image.user_avatar'); + $avatar = ConfigService::get('default_image', 'user_avatar', $defaultAvatar); + } else { + // 微信获取到的头像信息 + $avatar = $this->getAvatarByWechat(); + } + + $userSn = User::createUserSn(); + $this->user->sn = $userSn; + $this->user->account = 'u' . $userSn; + $this->user->nickname = "用户" . $userSn; + $this->user->avatar = $avatar; + $this->user->channel = $this->terminal; + $this->user->is_new_user = YesNoEnum::YES; + + if ($this->terminal != UserTerminalEnum::WECHAT_MMP && !empty($this->nickname)) { + $this->user->nickname = $this->nickname; + } + + $this->user->save(); + + UserAuth::create([ + 'user_id' => $this->user->id, + 'openid' => $this->openid, + 'unionid' => $this->unionid, + 'terminal' => $this->terminal, + ]); + } + + + /** + * @notes 更新用户信息 + * @throws Exception + * @author 段誉 + * @date 2022/9/16 10:06 + * @remark 该端没授权信息,重新写入一条该端的授权信息 + */ + private function updateUser(): void + { + // 无头像需要更新头像 + if (empty($this->user->avatar)) { + $this->user->avatar = $this->getAvatarByWechat(); + $this->user->save(); + } + + $userAuth = UserAuth::where(['user_id' => $this->user->id, 'openid' => $this->openid]) + ->findOrEmpty(); + + // 无该端授权信息，新增一条 + if ($userAuth->isEmpty()) { + $userAuth->user_id = $this->user->id; + $userAuth->openid = $this->openid; + $userAuth->unionid = $this->unionid; + $userAuth->terminal = $this->terminal; + $userAuth->save(); + } else { + if (empty($userAuth['unionid']) && !empty($this->unionid)) { + $userAuth->unionid = $this->unionid; + $userAuth->save(); + } + } + } + + + /** + * @notes 获取token + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author cjhao + * @date 2021/8/2 16:45 + */ + private function getToken(): void + { + $user = UserTokenService::setToken($this->user->id, $this->terminal); + $this->user->token = $user['token']; + } + + + /** + * @notes 用户授权登录， + * 如果用户不存在，创建用户；用户存在，更新用户信息，并检查该端信息是否需要写入 + * @return WechatUserService + * @throws Exception + * @author cjhao + * @date 2021/8/2 16:35 + */ + public function authUserLogin(): self + { + if ($this->user->isEmpty()) { + $this->createUser(); + } else { + $this->updateUser(); + } + return $this; + } + + + /** + * @notes 处理从微信获取到的头像信息 + * @return string + * @throws Exception + * @author 段誉 + * @date 2022/9/16 9:50 + */ + public function getAvatarByWechat(): string + { + // 存储引擎 + $config = [ + 'default' => ConfigService::get('storage', 'default', 'local'), + 'engine' => ConfigService::get('storage') + ]; + if ($config['default'] == 'local') { + // 本地存储 + $file_name = md5($this->openid . time()) . '.jpeg'; + $avatar = download_file($this->headimgurl, 'uploads/user/avatar/', $file_name); + } else { + // 第三方存储 + $avatar = 'uploads/user/avatar/' . md5($this->openid . time()) . '.jpeg'; + $StorageDriver = new StorageDriver($config); + if (!$StorageDriver->fetch($this->headimgurl, $avatar)) { + throw new Exception('头像保存失败:' . $StorageDriver->getError()); + } + } + return $avatar; + } + + +} \ No newline at end of file diff --git a/app/api/validate/LoginAccountValidate.php b/app/api/validate/LoginAccountValidate.php new file mode 100644 index 0000000..655fe3a --- /dev/null +++ b/app/api/validate/LoginAccountValidate.php @@ -0,0 +1,148 @@ + 'require|in:' . UserTerminalEnum::WECHAT_MMP . ',' . UserTerminalEnum::WECHAT_OA . ',' + . UserTerminalEnum::H5 . ',' . UserTerminalEnum::PC . ',' . UserTerminalEnum::IOS . + ',' . UserTerminalEnum::ANDROID, + 'scene' => 'require|in:' . LoginEnum::ACCOUNT_PASSWORD . ',' . LoginEnum::MOBILE_CAPTCHA . '|checkConfig', + 'account' => 'require', + ]; + + + protected $message = [ + 'terminal.require' => '终端参数缺失', + 'terminal.in' => '终端参数状态值不正确', + 'scene.require' => '场景不能为空', + 'scene.in' => '场景值错误', + 'account.require' => '请输入账号', + 'password.require' => '请输入密码', + ]; + + + /** + * @notes 登录场景相关校验 + * @param $scene + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/9/15 14:37 + */ + public function checkConfig($scene, $rule, $data) + { + $config = ConfigService::get('login', 'login_way'); + if (!in_array($scene, $config)) { + return '不支持的登录方式'; + } + + // 账号密码登录 + if (LoginEnum::ACCOUNT_PASSWORD == $scene) { + if (!isset($data['password'])) { + return '请输入密码'; + } + return $this->checkPassword($data['password'], [], $data); + } + + // 手机验证码登录 + if (LoginEnum::MOBILE_CAPTCHA == $scene) { + if (!isset($data['code'])) { + return '请输入手机验证码'; + } + return $this->checkCode($data['code'], [], $data); + } + + return true; + } + + + /** + * @notes 登录密码校验 + * @param $password + * @param $other + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/9/15 14:39 + */ + public function checkPassword($password, $other, $data) + { + //账号安全机制，连续输错后锁定，防止账号密码暴力破解 + $userAccountSafeCache = new UserAccountSafeCache(); + if (!$userAccountSafeCache->isSafe()) { + return '密码连续' . $userAccountSafeCache->count . '次输入错误，请' . $userAccountSafeCache->minute . '分钟后重试'; + } + + $where = []; + if ($data['scene'] == LoginEnum::ACCOUNT_PASSWORD) { + // 手机号密码登录 + $where = ['account|mobile' => $data['account']]; + } + + $userInfo = User::where($where) + ->field(['password,is_disable']) + ->findOrEmpty(); + + if ($userInfo->isEmpty()) { + return '用户不存在'; + } + + if ($userInfo['is_disable'] === YesNoEnum::YES) { + return '用户已禁用'; + } + + if (empty($userInfo['password'])) { + $userAccountSafeCache->record(); + return '用户不存在'; + } + + $passwordSalt = Config::get('project.unique_identification'); + if ($userInfo['password'] !== create_password($password, $passwordSalt)) { + $userAccountSafeCache->record(); + return '密码错误'; + } + + $userAccountSafeCache->relieve(); + + return true; + } + + + /** + * @notes 校验验证码 + * @param $code + * @param $rule + * @param $data + * @return bool|string + * @author Tab + * @date 2021/8/25 15:43 + */ + public function checkCode($code, $rule, $data) + { + // $smsDriver = new SmsDriver(); + // $result = $smsDriver->verify($data['account'], $code, NoticeEnum::LOGIN_CAPTCHA); + // if ($result) { + // return true; + // } + // return '验证码错误'; + } +} \ No newline at end of file diff --git a/app/ceshi/controller/IndexController.php b/app/ceshi/controller/IndexController.php new file mode 100644 index 0000000..845e8e4 --- /dev/null +++ b/app/ceshi/controller/IndexController.php @@ -0,0 +1,29 @@ + 'webman']); + } + + public function json(Request $request) + { + return json(['code' => 0, 'msg' => 'ok']); + } + +} diff --git a/app/common/cache/UserAccountSafeCache.php b/app/common/cache/UserAccountSafeCache.php new file mode 100644 index 0000000..408244f --- /dev/null +++ b/app/common/cache/UserAccountSafeCache.php @@ -0,0 +1,69 @@ +getLocalIp(); + $this->key = $this->tagName . $ip; + } + + /** + * @notes 记录登录错误次数 + * @author 令狐冲 + * @date 2021/6/30 01:51 + */ + public function record() + { + if (Cache::get($this->key)) { + //缓存存在，记录错误次数 + Cache::set($this->key, Cache::get($this->key) + 1); + } else { + //缓存不存在，第一次设置缓存 + Cache::set($this->key, 1, $this->minute * 60); + } + } + + /** + * @notes 判断是否安全 + * @return bool + * @author 令狐冲 + * @date 2021/6/30 01:53 + */ + public function isSafe() + { + $count = Cache::get($this->key); + if ($count >= $this->count) { + return false; + } + return true; + } + + /** + * @notes 删除该ip记录错误次数 + * @author 令狐冲 + * @date 2021/6/30 01:55 + */ + public function relieve() + { + Cache::delete($this->key); + } + + +} \ No newline at end of file diff --git a/app/common/cache/UserTokenCache.php b/app/common/cache/UserTokenCache.php new file mode 100644 index 0000000..13148a9 --- /dev/null +++ b/app/common/cache/UserTokenCache.php @@ -0,0 +1,107 @@ +prefix . $token); + if ($userInfo) { + return $userInfo; + } + + //从数据获取信息被设置缓存(可能后台清除缓存） + $userInfo = $this->setUserInfo($token); + if ($userInfo) { + return $userInfo; + } + + return false; + } + + + /** + * @notes 通过有效token设置用户信息缓存 + * @param $token + * @return array|false|mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/9/16 10:11 + */ + public function setUserInfo($token) + { + $userSession = UserSession::where([['token', '=', $token], ['expire_time', '>', time()]])->find(); + if (empty($userSession)) { + return []; + } + + $user = User::where('id', '=', $userSession->user_id) + ->find(); + + $userInfo = [ + 'user_id' => $user->id, + 'nickname' => $user->nickname, + 'token' => $token, + 'sn' => $user->sn, + 'mobile' => $user->mobile, + 'avatar' => $user->avatar, + 'terminal' => $userSession->terminal, + 'expire_time' => $userSession->expire_time, + ]; + + // $ttl = new \DateTime(Date('Y-m-d H:i:s', $userSession->expire_time)); + + $this->set($this->prefix . $token, $userInfo, $userSession->expire_time); + return $this->getUserInfo($token); + } + + + /** + * @notes 删除缓存 + * @param $token + * @return bool + * @author 段誉 + * @date 2022/9/16 10:13 + */ + public function deleteUserInfo($token) + { + return Cache::delete($this->prefix . $token); + } + + +} \ No newline at end of file diff --git a/app/common/controller/BaseLikeAdminController.php b/app/common/controller/BaseLikeController.php similarity index 97% rename from app/common/controller/BaseLikeAdminController.php rename to app/common/controller/BaseLikeController.php index 0574905..469fe59 100644 --- a/app/common/controller/BaseLikeAdminController.php +++ b/app/common/controller/BaseLikeController.php @@ -8,7 +8,7 @@ use app\BaseController; use app\common\lists\BaseDataLists; use app\common\service\JsonService; -class BaseLikeAdminController extends BaseController +class BaseLikeController extends BaseController { public $notNeedLogin = []; diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php new file mode 100644 index 0000000..0a1ef19 --- /dev/null +++ b/app/common/enum/OrderEnum.php @@ -0,0 +1,40 @@ + '余额支付', + self::WECHAT_PAY => '微信支付', + self::ALIPAY => '支付宝支付', + ]; + if ($value === true) { + return $data; + } + return $data[$value] ?? ''; + } + + + + /** + * @notes 支付状态 + * @param bool $value + * @return string|string[] + * @author 段誉 + * @date 2023/2/23 15:36 + */ + public static function getPayStatusDesc($value = true) + { + $data = [ + self::UNPAID => '未支付', + self::ISPAID => '已支付', + ]; + if ($value === true) { + return $data; + } + return $data[$value] ?? ''; + } + + + /** + * @notes 支付场景 + * @param bool $value + * @return string|string[] + * @author 段誉 + * @date 2023/2/23 15:36 + */ + public static function getPaySceneDesc($value = true) + { + $data = [ + self::SCENE_H5 => 'H5', + self::SCENE_OA => '微信公众号', + self::SCENE_MNP => '微信小程序', + self::SCENE_APP => 'APP', + self::SCENE_PC => 'PC', + ]; + if ($value === true) { + return $data; + } + return $data[$value] ?? ''; + } +} diff --git a/app/common/logic/order/RetailOrderLogic.php b/app/common/logic/order/RetailOrderLogic.php new file mode 100644 index 0000000..2a87437 --- /dev/null +++ b/app/common/logic/order/RetailOrderLogic.php @@ -0,0 +1,105 @@ +user_money = bcsub($user->user_money, $order['actual'], 2); + $user->save(); + //用户支出流水 + $record[] = [ + 'financial_record_sn' => time(), + 'order_id' => $order['id'], + 'number_sn' => $order['number'], + 'user_id' => $order['customer'], + 'financial_type' => OrderEnum::USER_ORDER_PAY, + 'financial_pm' => OrderEnum::EXPENDITURE, + 'number' => $order['actual'], + 'status' => 1, + 'type' => OrderEnum::USER, + 'mer_id' => $order['merchant'], + ]; + //商户获得流水 + $record[] = [ + 'financial_record_sn' => time(), + 'order_id' => $order['id'], + 'number_sn' => $order['number'], + 'user_id' => $order['customer'], + 'financial_type' => OrderEnum::MERCHANT_ORDER_OBTAINS, + 'financial_pm' => OrderEnum::INCOME, + 'number' => $order['actual'], + 'status' => 0, + 'type' => OrderEnum::MERCHANT, + 'mer_id' => $order['merchant'], + ]; + (new FinancialRecord())->saveAll($record); + $CallbackData = ['money' => $order['actual']]; + self::paySuccess($order, $CallbackData); + Db::commit(); + return true; + } catch (Exception $e) { + Db::rollback(); + Log::error('余额支付失败' . $e->getMessage() . '。line:' . $e->getLine() . '。file:' . $e->getFile()); + self::setError('余额支付失败' . $e->getMessage()); + return false; + } + } + + /** + * @notes 订单支付成功 + * @param $order 订单 + * @param $CallbackData 回调数据 + * @date 2021/7/8 00:40 + */ + static function paySuccess($order, $CallbackData = []) + { + Db::startTrans(); + try { + $order->money = $CallbackData['money']; + $order->paid = 1; + $order->save(); + if($order['cart_id']){ + $cart_arr=implode(',',$order['cart_id']); + Cart::whereIn('id',$cart_arr)->update(['is_pay'=>1]); + } + // 提交事务 + Db::commit(); + } catch (\Exception $e) { + // 回滚事务 + Db::rollback(); + } + // TODO: Implement paySuccess() method. + + } +} diff --git a/app/common/model/order/Cart.php b/app/common/model/order/Cart.php new file mode 100644 index 0000000..b67ba78 --- /dev/null +++ b/app/common/model/order/Cart.php @@ -0,0 +1,22 @@ +value('name'); + } + + /** + * @notes 关联支配配置模型 + * @return \think\model\relation\HasOne + * @author ljj + * @date 2021/10/11 3:04 下午 + */ + public function payConfig() + { + return $this->hasOne(PayConfig::class,'id','pay_config_id'); + } +} \ No newline at end of file diff --git a/app/common/model/retail/Cashierclass.php b/app/common/model/retail/Cashierclass.php new file mode 100644 index 0000000..a2f8910 --- /dev/null +++ b/app/common/model/retail/Cashierclass.php @@ -0,0 +1,22 @@ +moduleName == 'admin') { $tpl = "use app\\" . $this->moduleName . "\\controller\\BaseAdminController;" . PHP_EOL; } else { - $tpl = "use app\\common\\controller\\BaseLikeAdminController;" . PHP_EOL; + $tpl = "use app\\common\\controller\\BaseLikeController;" . PHP_EOL; } if (!empty($this->classDir)) { @@ -151,7 +151,7 @@ class ControllerGenerator extends BaseGenerator implements GenerateInterface { $tpl = 'BaseAdminController'; if ($this->moduleName != 'admin') { - $tpl = 'BaseLikeAdminController'; + $tpl = 'BaseLikeController'; } return $tpl; } diff --git a/app/common/service/generator/stub/vue/details.stub b/app/common/service/generator/stub/vue/details.stub index 99bcf05..948e6b7 100644 --- a/app/common/service/generator/stub/vue/details.stub +++ b/app/common/service/generator/stub/vue/details.stub @@ -2,20 +2,20 @@
- + {FORM_VIEW}
-