From e14290ef828ed8dfb112eb9892d3253b9f227aea Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 14 Jun 2024 15:53:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20API=20=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/user/UserLogic.php | 28 + app/admin/validate/user/UserValidate.php | 20 +- app/api/controller/BaseApiController.php | 3 +- app/api/controller/IndexController.php | 97 ++- app/api/controller/LoginController.php | 3 +- app/api/controller/PayController.php | 3 +- app/api/controller/UploadController.php | 3 +- app/api/controller/cate/CateController.php | 3 +- app/api/controller/order/CartController.php | 3 +- app/api/controller/order/OrderController.php | 274 ++++--- .../controller/product/ProductController.php | 3 +- app/api/controller/shop/IndexController.php | 3 +- .../store/ProductRecordController.php | 2 - app/api/controller/store/StoreController.php | 3 +- .../store/TransactionRecordController.php | 3 +- app/api/controller/user/AddressController.php | 3 +- app/api/controller/user/UserController.php | 113 ++- .../user/UserFeedbackController.php | 3 +- .../controller/user/UserVisitController.php | 42 +- app/common/controller/BaseLikeController.php | 11 +- app/common/controller/Definitions.php | 15 +- app/common/lists/user/UserShipLists.php | 60 ++ app/store/controller/BaseAdminController.php | 4 +- app/store/controller/ConfigController.php | 126 ++- app/store/controller/DeliveryController.php | 160 ++-- app/store/controller/DownloadController.php | 3 +- app/store/controller/FileController.php | 119 ++- app/store/controller/LoginController.php | 49 +- app/store/controller/StaffController.php | 187 +++-- app/store/controller/UploadController.php | 4 +- app/store/controller/WorkbenchController.php | 179 +++-- app/store/controller/auth/AdminController.php | 115 ++- app/store/controller/auth/MenuController.php | 3 +- app/store/controller/auth/RoleController.php | 4 +- app/store/controller/cart/CartController.php | 3 +- app/store/controller/cate/CateController.php | 3 +- .../controller/finance/FinanceController.php | 77 +- .../finance/StoreBillController.php | 61 +- .../store_order/StoreOrderController.php | 135 ++-- .../StoreRefundOrderController.php | 111 ++- .../store_product/StoreProductController.php | 245 +++--- .../store_product/StoreStorageController.php | 45 +- .../StoreProductAttrValueController.php | 111 ++- .../SystemStoreStorageController.php | 15 +- app/store/controller/user/UserController.php | 41 + .../controller/user/UserShipController.php | 18 + app/store/lists/user/UserLists.php | 60 ++ composer.json | 1 - composer.lock | 71 +- config/plugin/hg/apidoc/app.php | 105 --- config/plugin/hg/apidoc/route.php | 3 - vendor/composer/autoload_psr4.php | 1 - vendor/composer/autoload_static.php | 8 - vendor/composer/installed.json | 72 -- vendor/composer/installed.php | 21 +- vendor/hg/apidoc/.gitignore | 1 - vendor/hg/apidoc/LICENSE | 21 - vendor/hg/apidoc/README.md | 88 --- vendor/hg/apidoc/composer.json | 50 -- vendor/hg/apidoc/src/Auth.php | 192 ----- vendor/hg/apidoc/src/ConfigProvider.php | 24 - vendor/hg/apidoc/src/Controller.php | 451 ----------- vendor/hg/apidoc/src/Install.php | 56 -- vendor/hg/apidoc/src/annotation/AddField.php | 84 -- vendor/hg/apidoc/src/annotation/After.php | 59 -- vendor/hg/apidoc/src/annotation/Author.php | 25 - vendor/hg/apidoc/src/annotation/Before.php | 57 -- .../hg/apidoc/src/annotation/ContentType.php | 25 - vendor/hg/apidoc/src/annotation/Desc.php | 25 - vendor/hg/apidoc/src/annotation/EventBase.php | 80 -- vendor/hg/apidoc/src/annotation/Field.php | 25 - vendor/hg/apidoc/src/annotation/Group.php | 24 - vendor/hg/apidoc/src/annotation/Header.php | 50 -- vendor/hg/apidoc/src/annotation/Md.php | 35 - vendor/hg/apidoc/src/annotation/Method.php | 25 - vendor/hg/apidoc/src/annotation/NotDebug.php | 22 - .../src/annotation/NotDefaultAuthor.php | 22 - .../hg/apidoc/src/annotation/NotHeaders.php | 22 - vendor/hg/apidoc/src/annotation/NotParams.php | 22 - vendor/hg/apidoc/src/annotation/NotParse.php | 24 - vendor/hg/apidoc/src/annotation/NotQuerys.php | 22 - .../src/annotation/NotResponseError.php | 22 - .../src/annotation/NotResponseSuccess.php | 22 - .../hg/apidoc/src/annotation/NotResponses.php | 22 - vendor/hg/apidoc/src/annotation/Param.php | 62 -- vendor/hg/apidoc/src/annotation/ParamBase.php | 88 --- vendor/hg/apidoc/src/annotation/ParamType.php | 25 - vendor/hg/apidoc/src/annotation/Property.php | 62 -- vendor/hg/apidoc/src/annotation/Query.php | 61 -- .../apidoc/src/annotation/ResponseError.php | 52 -- .../apidoc/src/annotation/ResponseErrorMd.php | 35 - .../apidoc/src/annotation/ResponseSuccess.php | 60 -- .../src/annotation/ResponseSuccessMd.php | 35 - vendor/hg/apidoc/src/annotation/Returned.php | 62 -- .../apidoc/src/annotation/RouteMiddleware.php | 26 - .../hg/apidoc/src/annotation/RouteParam.php | 51 -- vendor/hg/apidoc/src/annotation/Sort.php | 25 - vendor/hg/apidoc/src/annotation/Tag.php | 25 - vendor/hg/apidoc/src/annotation/Title.php | 25 - vendor/hg/apidoc/src/annotation/Url.php | 25 - .../hg/apidoc/src/annotation/WithoutField.php | 25 - vendor/hg/apidoc/src/config.php | 106 --- .../src/config/plugin/hg/apidoc/app.php | 97 --- .../src/config/plugin/hg/apidoc/route.php | 3 - .../apidoc/src/exception/ErrorException.php | 64 -- .../hg/apidoc/src/exception/HttpException.php | 33 - vendor/hg/apidoc/src/generator/Index.php | 358 --------- .../hg/apidoc/src/generator/ParseTemplate.php | 341 -------- .../src/middleware/HyperfMiddleware.php | 81 -- .../src/middleware/LaravelMiddleware.php | 17 - .../src/middleware/ThinkPHPMiddleware.php | 17 - .../src/middleware/WebmanMiddleware.php | 88 --- .../hg/apidoc/src/parses/ParseAnnotation.php | 218 ----- .../hg/apidoc/src/parses/ParseApiDetail.php | 743 ------------------ vendor/hg/apidoc/src/parses/ParseApiMenus.php | 318 -------- .../apidoc/src/parses/ParseCodeTemplate.php | 100 --- vendor/hg/apidoc/src/parses/ParseMarkdown.php | 139 ---- vendor/hg/apidoc/src/parses/ParseModel.php | 162 ---- .../hg/apidoc/src/providers/BaseService.php | 172 ---- .../hg/apidoc/src/providers/CommonService.php | 56 -- .../hg/apidoc/src/providers/HyperfService.php | 52 -- .../apidoc/src/providers/LaravelService.php | 110 --- .../apidoc/src/providers/ThinkPHP5Service.php | 94 --- .../apidoc/src/providers/ThinkPHPService.php | 107 --- .../hg/apidoc/src/providers/WebmanService.php | 43 - .../apidoc/src/utils/AbstractAnnotation.php | 36 - vendor/hg/apidoc/src/utils/ApiCrossDomain.php | 22 - vendor/hg/apidoc/src/utils/ApiShare.php | 165 ---- .../hg/apidoc/src/utils/AutoRegisterRouts.php | 154 ---- vendor/hg/apidoc/src/utils/Cache.php | 298 ------- vendor/hg/apidoc/src/utils/ConfigProvider.php | 99 --- vendor/hg/apidoc/src/utils/DirAndFile.php | 258 ------ vendor/hg/apidoc/src/utils/Helper.php | 578 -------------- vendor/hg/apidoc/src/utils/Lang.php | 59 -- vendor/hg/apidoc/src/utils/Request.php | 46 -- 135 files changed, 1390 insertions(+), 9043 deletions(-) create mode 100644 app/common/lists/user/UserShipLists.php create mode 100644 app/store/controller/user/UserController.php create mode 100644 app/store/controller/user/UserShipController.php create mode 100644 app/store/lists/user/UserLists.php delete mode 100644 config/plugin/hg/apidoc/app.php delete mode 100644 config/plugin/hg/apidoc/route.php delete mode 100644 vendor/hg/apidoc/.gitignore delete mode 100644 vendor/hg/apidoc/LICENSE delete mode 100644 vendor/hg/apidoc/README.md delete mode 100644 vendor/hg/apidoc/composer.json delete mode 100644 vendor/hg/apidoc/src/Auth.php delete mode 100644 vendor/hg/apidoc/src/ConfigProvider.php delete mode 100644 vendor/hg/apidoc/src/Controller.php delete mode 100644 vendor/hg/apidoc/src/Install.php delete mode 100644 vendor/hg/apidoc/src/annotation/AddField.php delete mode 100644 vendor/hg/apidoc/src/annotation/After.php delete mode 100644 vendor/hg/apidoc/src/annotation/Author.php delete mode 100644 vendor/hg/apidoc/src/annotation/Before.php delete mode 100644 vendor/hg/apidoc/src/annotation/ContentType.php delete mode 100644 vendor/hg/apidoc/src/annotation/Desc.php delete mode 100644 vendor/hg/apidoc/src/annotation/EventBase.php delete mode 100644 vendor/hg/apidoc/src/annotation/Field.php delete mode 100644 vendor/hg/apidoc/src/annotation/Group.php delete mode 100644 vendor/hg/apidoc/src/annotation/Header.php delete mode 100644 vendor/hg/apidoc/src/annotation/Md.php delete mode 100644 vendor/hg/apidoc/src/annotation/Method.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotDebug.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotDefaultAuthor.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotHeaders.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotParams.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotParse.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotQuerys.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotResponseError.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotResponseSuccess.php delete mode 100644 vendor/hg/apidoc/src/annotation/NotResponses.php delete mode 100644 vendor/hg/apidoc/src/annotation/Param.php delete mode 100644 vendor/hg/apidoc/src/annotation/ParamBase.php delete mode 100644 vendor/hg/apidoc/src/annotation/ParamType.php delete mode 100644 vendor/hg/apidoc/src/annotation/Property.php delete mode 100644 vendor/hg/apidoc/src/annotation/Query.php delete mode 100644 vendor/hg/apidoc/src/annotation/ResponseError.php delete mode 100644 vendor/hg/apidoc/src/annotation/ResponseErrorMd.php delete mode 100644 vendor/hg/apidoc/src/annotation/ResponseSuccess.php delete mode 100644 vendor/hg/apidoc/src/annotation/ResponseSuccessMd.php delete mode 100644 vendor/hg/apidoc/src/annotation/Returned.php delete mode 100644 vendor/hg/apidoc/src/annotation/RouteMiddleware.php delete mode 100644 vendor/hg/apidoc/src/annotation/RouteParam.php delete mode 100644 vendor/hg/apidoc/src/annotation/Sort.php delete mode 100644 vendor/hg/apidoc/src/annotation/Tag.php delete mode 100644 vendor/hg/apidoc/src/annotation/Title.php delete mode 100644 vendor/hg/apidoc/src/annotation/Url.php delete mode 100644 vendor/hg/apidoc/src/annotation/WithoutField.php delete mode 100644 vendor/hg/apidoc/src/config.php delete mode 100644 vendor/hg/apidoc/src/config/plugin/hg/apidoc/app.php delete mode 100644 vendor/hg/apidoc/src/config/plugin/hg/apidoc/route.php delete mode 100644 vendor/hg/apidoc/src/exception/ErrorException.php delete mode 100644 vendor/hg/apidoc/src/exception/HttpException.php delete mode 100644 vendor/hg/apidoc/src/generator/Index.php delete mode 100644 vendor/hg/apidoc/src/generator/ParseTemplate.php delete mode 100644 vendor/hg/apidoc/src/middleware/HyperfMiddleware.php delete mode 100644 vendor/hg/apidoc/src/middleware/LaravelMiddleware.php delete mode 100644 vendor/hg/apidoc/src/middleware/ThinkPHPMiddleware.php delete mode 100644 vendor/hg/apidoc/src/middleware/WebmanMiddleware.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseAnnotation.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseApiDetail.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseApiMenus.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseCodeTemplate.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseMarkdown.php delete mode 100644 vendor/hg/apidoc/src/parses/ParseModel.php delete mode 100644 vendor/hg/apidoc/src/providers/BaseService.php delete mode 100644 vendor/hg/apidoc/src/providers/CommonService.php delete mode 100644 vendor/hg/apidoc/src/providers/HyperfService.php delete mode 100644 vendor/hg/apidoc/src/providers/LaravelService.php delete mode 100644 vendor/hg/apidoc/src/providers/ThinkPHP5Service.php delete mode 100644 vendor/hg/apidoc/src/providers/ThinkPHPService.php delete mode 100644 vendor/hg/apidoc/src/providers/WebmanService.php delete mode 100644 vendor/hg/apidoc/src/utils/AbstractAnnotation.php delete mode 100644 vendor/hg/apidoc/src/utils/ApiCrossDomain.php delete mode 100644 vendor/hg/apidoc/src/utils/ApiShare.php delete mode 100644 vendor/hg/apidoc/src/utils/AutoRegisterRouts.php delete mode 100644 vendor/hg/apidoc/src/utils/Cache.php delete mode 100644 vendor/hg/apidoc/src/utils/ConfigProvider.php delete mode 100644 vendor/hg/apidoc/src/utils/DirAndFile.php delete mode 100644 vendor/hg/apidoc/src/utils/Helper.php delete mode 100644 vendor/hg/apidoc/src/utils/Lang.php delete mode 100644 vendor/hg/apidoc/src/utils/Request.php diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index aaa9bf58e..353b97607 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -63,6 +63,34 @@ class UserLogic extends BaseLogic return false; } } + + public static function StoreAdd(array $params) + { + $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 { + $res=User::create([ + 'avatar' => $avatar, + 'real_name' =>'', + 'nickname' => '用户'.time(), + 'account' => $params['mobile'], + 'password' => $password, + 'mobile' => $params['mobile'], + 'user_money' => $params['user_money'] + ]); + + Db::commit(); + return $res; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } /** * @notes 编辑用户列表 * @param array $params diff --git a/app/admin/validate/user/UserValidate.php b/app/admin/validate/user/UserValidate.php index b6a91c8ee..43df446b7 100644 --- a/app/admin/validate/user/UserValidate.php +++ b/app/admin/validate/user/UserValidate.php @@ -27,7 +27,14 @@ class UserValidate extends BaseValidate 'mobile' => 'require|mobile', 'is_disable' => 'in:0,1', 'sex' => 'in:1,2', - 'user_money' => 'float' + 'user_money' => 'float', + 'province' => 'require', + 'city' => 'require', + 'district' => 'require', + 'street' => 'require', + 'village' => 'require', + 'brigade' => 'require', + 'user_ship' => 'require', ]; @@ -45,6 +52,13 @@ class UserValidate extends BaseValidate 'is_disable' => '是否禁用', 'sex' => '用户性别', 'user_money' => '用户余额', + 'province' => '省', + 'city' => '市', + 'district' => '区', + 'street' => '街道', + 'village' => '村', + 'brigade' => ' 队', + 'user_ship' => ' 会员类型', ]; @@ -59,6 +73,10 @@ class UserValidate extends BaseValidate return $this->remove('id',true); } + public function scenestoreAdd() + { + return $this->only(['mobile','province','city','district','street','village','brigade','user_ship']); + } /** * @notes 编辑场景 diff --git a/app/api/controller/BaseApiController.php b/app/api/controller/BaseApiController.php index e3d9026ad..516bf8bec 100644 --- a/app/api/controller/BaseApiController.php +++ b/app/api/controller/BaseApiController.php @@ -2,8 +2,7 @@ namespace app\api\controller; use app\common\controller\BaseLikeController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseApiController extends BaseLikeController { diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 8a31ce440..8dd609b2b 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -13,13 +13,12 @@ use Exception; use support\Cache; use think\facade\Db; use Webman\Config; -use hg\apidoc\annotation as ApiDoc; use support\Log; use Yansongda\Pay\Exception\InvalidSignException; use Monolog\Handler\RotatingFileHandler; use Webman\RedisQueue\Redis; -#[ApiDoc\NotParse()] + class IndexController extends BaseApiController { @@ -27,36 +26,35 @@ class IndexController extends BaseApiController public function index() { - $arr=StoreBranchProduct::where('store_id',5)->select(); - foreach ($arr as $item){ - StoreProductLogic::updateGoodsclass($item['cate_id'],5); - + $arr = StoreBranchProduct::where('store_id', 5)->select(); + foreach ($arr as $item) { + StoreProductLogic::updateGoodsclass($item['cate_id'], 5); } try { - $wechat = new PayService(1); - $time = time(); - $order = [ - 'out_trade_no' => 'PF1717558027664507', - 'out_refund_no' => 'BO'.$time, - 'amount' => [ - 'refund' => 1, - 'total' => 1, - 'currency' => 'CNY', - ], - // '_action' => 'jsapi', // jsapi 退款,默认 - // '_action' => 'app', // app 退款 - // '_action' => 'combine', // 合单退款 - // '_action' => 'h5', // h5 退款 - // '_action' => 'miniapp', // 小程序退款 - // '_action' => 'native', // native 退款 + $wechat = new PayService(1); + $time = time(); + $order = [ + 'out_trade_no' => 'PF1717558027664507', + 'out_refund_no' => 'BO' . $time, + 'amount' => [ + 'refund' => 1, + 'total' => 1, + 'currency' => 'CNY', + ], + // '_action' => 'jsapi', // jsapi 退款,默认 + // '_action' => 'app', // app 退款 + // '_action' => 'combine', // 合单退款 + // '_action' => 'h5', // h5 退款 + // '_action' => 'miniapp', // 小程序退款 + // '_action' => 'native', // native 退款 - ]; + ]; - $res = $wechat->wechat->refund($order); - Cache::set('kk',json_decode($res,true)); + $res = $wechat->wechat->refund($order); + Cache::set('kk', json_decode($res, true)); } catch (Exception $e) { - \support\Log::info($e->extra['message']?? $e->getMessage()); - throw new \Exception($e->extra['message']?? $e->getMessage()); + \support\Log::info($e->extra['message'] ?? $e->getMessage()); + throw new \Exception($e->extra['message'] ?? $e->getMessage()); } d(1); @@ -67,15 +65,15 @@ class IndexController extends BaseApiController - try{ - $a=new WechatTemplate(); - $a->NewQuotationNotification(['openid'=>'ocqhF6UfFQXE-SbzbP5YVQJlQAh0','data1'=>'阿萨','data2'=>date('Y-m-d H:i:s'),'data3'=>'占山','data3'=>18982406440]); - }catch (Exception $e){ + try { + $a = new WechatTemplate(); + $a->NewQuotationNotification(['openid' => 'ocqhF6UfFQXE-SbzbP5YVQJlQAh0', 'data1' => '阿萨', 'data2' => date('Y-m-d H:i:s'), 'data3' => '占山', 'data3' => 18982406440]); + } catch (Exception $e) { d($e); } -d(22); + d(22); $auth_code = $this->request->get('code'); $pay = (new PayService()); $order = [ @@ -85,7 +83,7 @@ d(22); 'auth_code' => (string)$auth_code ], 'amount' => [ - 'total' =>1, + 'total' => 1, ], 'scene_info' => [ "store_info" => [ @@ -93,14 +91,13 @@ d(22); ] ], ]; - - try{ - $a= $pay->wechat->pos($order); - }catch (\Exception $th) { - d($th); + try { + $a = $pay->wechat->pos($order); + } catch (\Exception $th) { + d($th); } -d($a); + d($a); $params = ['store_id' => 2, 'pay_type' => 17]; $a = StoreOrderLogic::createOrder([1], 0, null, $params); d($a); @@ -143,7 +140,7 @@ d($a); */ public function city() { - $province_code = $this->request->get('code'); + $province_code = $this->request->get('province_code'); $list = Db::name('geo_city')->where('province_code', $province_code)->select()?->toArray(); return $this->success('ok', $list); } @@ -152,7 +149,7 @@ d($a); */ public function area() { - $city_code = $this->request->get('code'); + $city_code = $this->request->get('city_code'); $list = Db::name('geo_area')->where('city_code', $city_code)->select()?->toArray(); return $this->success('ok', $list); } @@ -165,4 +162,22 @@ d($a); $list = Db::name('geo_street')->where('area_code', $area_code)->select()?->toArray(); return $this->success('ok', $list); } + + /** + * @notes 获取村列表 + */ + public function village() + { + $area_code = $this->request->get('street_code'); + $list = Db::name('geo_village')->where('street_code', $area_code)->select()?->toArray(); + return $this->success('ok', $list); + } + /** + * @notes 获取队列表 + */ + public function brigade() + { + $list = Db::name('geo_brigade')->select()?->toArray(); + return $this->success('ok', $list); + } } diff --git a/app/api/controller/LoginController.php b/app/api/controller/LoginController.php index d58b2ab1f..8143a4182 100644 --- a/app/api/controller/LoginController.php +++ b/app/api/controller/LoginController.php @@ -6,8 +6,7 @@ use app\api\logic\LoginLogic; use app\common\model\system_store\SystemStore; use app\api\validate\{LoginAccountValidate, WechatLoginValidate}; use app\common\model\user\UserAuth; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class LoginController extends BaseApiController { diff --git a/app/api/controller/PayController.php b/app/api/controller/PayController.php index bcff5cf6d..6603df95e 100644 --- a/app/api/controller/PayController.php +++ b/app/api/controller/PayController.php @@ -9,8 +9,7 @@ use app\common\model\store_order\StoreOrder; use app\common\service\pay\PayService; use support\Cache; use support\Log; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + /** * 支付 diff --git a/app/api/controller/UploadController.php b/app/api/controller/UploadController.php index 6ca026202..dc2993465 100644 --- a/app/api/controller/UploadController.php +++ b/app/api/controller/UploadController.php @@ -4,8 +4,7 @@ use app\common\service\UploadService; use Exception; - use hg\apidoc\annotation as ApiDoc; - #[ApiDoc\NotParse()] + class UploadController extends BaseApiController { diff --git a/app/api/controller/cate/CateController.php b/app/api/controller/cate/CateController.php index 17e573afe..5f6e4bb87 100644 --- a/app/api/controller/cate/CateController.php +++ b/app/api/controller/cate/CateController.php @@ -5,8 +5,7 @@ namespace app\api\controller\cate; use app\api\controller\BaseApiController; use app\api\lists\cate\CateLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + /** * 商品分类控制器 diff --git a/app/api/controller/order/CartController.php b/app/api/controller/order/CartController.php index 06ad4b0d1..7c74e03fc 100644 --- a/app/api/controller/order/CartController.php +++ b/app/api/controller/order/CartController.php @@ -8,9 +8,8 @@ use app\api\controller\BaseApiController; use app\api\lists\order\CartList; use app\common\model\order\Cart; use app\common\model\store_branch_product\StoreBranchProduct; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class CartController extends BaseApiController { public function list() diff --git a/app/api/controller/order/OrderController.php b/app/api/controller/order/OrderController.php index 70ec3e5a5..c8a6a62c3 100644 --- a/app/api/controller/order/OrderController.php +++ b/app/api/controller/order/OrderController.php @@ -16,9 +16,7 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use Webman\RedisQueue\Redis; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('订单')] class OrderController extends BaseApiController { public $notNeedLogin = ['refund_reason']; @@ -32,15 +30,15 @@ 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"), - ] + // #[ + // 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'); @@ -54,18 +52,18 @@ class OrderController extends BaseApiController return $this->success('ok', $res); } - #[ - ApiDoc\Title('核销订单列表'), - 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(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销订单列表'), + // 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(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function write_list() { $status = (int)$this->request->post('status', 1); @@ -83,15 +81,15 @@ 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"), - ] + // #[ + // 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; @@ -100,41 +98,41 @@ class OrderController extends BaseApiController return $this->success('ok', $res); } - #[ - ApiDoc\Title('订单校验'), - ApiDoc\url('/api/order/order/checkOrder'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), - ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"), - ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [ - ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'], - ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'], - ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'], - ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'], - ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'], - ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'], - ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'], - ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'], - ]], - ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [ - ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'], - ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'], - ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'], - ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'], - ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'], - ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'], - ]], - ]), - ] + // #[ + // ApiDoc\Title('订单校验'), + // ApiDoc\url('/api/order/order/checkOrder'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "购物车id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), + // ApiDoc\Param(name: "verify_code", type: "int", require: true, desc: "校验码"), + // ApiDoc\Param(name: "shipping_type", type: "int", require: true, desc: "配送方式"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'order', 'desc' => '订单信息', 'type' => 'array', 'children' => [ + // ['name' => 'create_time', 'desc' => '订单创建时间', 'type' => 'int'], + // ['name' => 'order_id', 'desc' => '订单id', 'type' => 'int'], + // ['name' => 'total_price', 'desc' => '订单总金额', 'type' => 'float'], + // ['name' => 'pay_price', 'desc' => '实际支付金额', 'type' => 'float'], + // ['name' => 'total_num', 'desc' => '订单总数量', 'type' => 'int'], + // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'int'], + // ['name' => 'cart_id', 'desc' => '购物车id', 'type' => 'string'], + // ['name' => 'store_id', 'desc' => '店铺id', 'type' => 'int'], + // ['name' => 'shipping_type', 'desc' => '配送方式', 'type' => 'int'], + // ]], + // ['name' => 'cart_list', 'desc' => '购物车商品列表', 'type' => 'array', 'children' => [ + // ['name' => 'goods', 'desc' => '商品id', 'type' => 'int'], + // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'int'], + // ['name' => 'total', 'desc' => '商品总价', 'type' => 'float'], + // ['name' => 'price', 'desc' => '商品单价', 'type' => 'float'], + // ['name' => 'product_id', 'desc' => '商品id', 'type' => 'int'], + // ['name' => 'old_cart_id', 'desc' => '原购物车id', 'type' => 'string'], + // ['name' => 'verify_code', 'desc' => '校验码', 'type' => 'string'], + // ]], + // ]), + // ] public function checkOrder() { $cartId = (array)$this->request->post('cart_id', []); @@ -154,19 +152,19 @@ class OrderController extends BaseApiController return $this->data($res); } - #[ - ApiDoc\Title('创建订单'), - ApiDoc\url('/api/order/order/createOrder'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"), - ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('创建订单'), + // ApiDoc\url('/api/order/order/createOrder'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "cart_id", type: "int", require: true, desc: "id"), + // ApiDoc\Param(name: "store_id", type: "int", require: true, desc: "店铺id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function createOrder() { $cartId = (array)$this->request->post('cart_id', []); @@ -263,18 +261,18 @@ class OrderController extends BaseApiController return $this->success('ok', ['no_pay' => $no_pay, 'waiting' => $waiting, 'receiving' => $receiving, 'all' => $all, 'applyRefund' => $applyRefund, 'refund' => $refund]); } - #[ - ApiDoc\Title('订单支付'), - ApiDoc\url('/api/order/order/pay'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), - ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), - ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单支付'), + // ApiDoc\url('/api/order/order/pay'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\Param(name: "address_id", type: "int", require: true, desc: "地址id"), + // ApiDoc\Param(name: "auth_code", type: "string", require: true, desc: "付款码"), + // ApiDoc\Param(name: "pay_type", type: "int", require: true, desc: "支付类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function pay() { $order_id = (int)$this->request->post('order_id'); @@ -352,14 +350,14 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/api/order/order/detail'), - ApiDoc\Method('GET'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单详情'), + // ApiDoc\url('/api/order/order/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { $order_id = (int)$this->request->get('order_id'); @@ -447,15 +445,15 @@ class OrderController extends BaseApiController } } - #[ - ApiDoc\Title('核销'), - ApiDoc\url('/api/order/order/writeoff_order'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('核销'), + // ApiDoc\url('/api/order/order/writeoff_order'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "verify_code", type: "string", require: true, desc: "验证码"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function writeoff_order() { $params = (new OrderValidate())->post()->goCheck('check'); @@ -487,19 +485,19 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('订单退款申请'), - ApiDoc\url('/api/order/order/apply_refund'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"), - ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"), - ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"), - ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单退款申请'), + // ApiDoc\url('/api/order/order/apply_refund'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "refund_message", type: "string", require: true, desc: "退款原因"), + // ApiDoc\Param(name: "refund_num", type: "int", require: true, desc: "退款数量"), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "订单id"), + // ApiDoc\Param(name: "old_cart_id", type: "int", require: true, desc: "购物车id"), + // ApiDoc\Param(name: "refund_type", type: "int", require: true, desc: "退款申请类型"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function apply_refund() { $params = (new OrderValidate())->post()->goCheck('add'); @@ -509,14 +507,14 @@ class OrderController extends BaseApiController return $this->success('申请成功'); } - #[ - ApiDoc\Title('订单退款原因'), - ApiDoc\url('/api/order/order/refund_reason'), - ApiDoc\Method('GET'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单退款原因'), + // ApiDoc\url('/api/order/order/refund_reason'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function refund_reason() { $data = DictData::where('type_value', 'reason')->where('status', YesNoEnum::YES) @@ -525,14 +523,14 @@ class OrderController extends BaseApiController } - #[ - ApiDoc\Title('取消售后'), - ApiDoc\url('/api/order/order/cancel_sale'), - ApiDoc\Method('GET'), - ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('取消售后'), + // ApiDoc\url('/api/order/order/cancel_sale'), + // ApiDoc\Method('GET'), + // ApiDoc\Param(name: "order_id", type: "int", require: true, desc: "订单id"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function cancel_sale() { $order_id = (int)$this->request->get('order_id'); diff --git a/app/api/controller/product/ProductController.php b/app/api/controller/product/ProductController.php index d1d54fa36..c10aeaceb 100644 --- a/app/api/controller/product/ProductController.php +++ b/app/api/controller/product/ProductController.php @@ -3,8 +3,7 @@ namespace app\api\controller\product; use app\api\controller\BaseApiController; use app\api\lists\product\ProductLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class ProductController extends BaseApiController{ public $notNeedLogin = ['lists']; diff --git a/app/api/controller/shop/IndexController.php b/app/api/controller/shop/IndexController.php index 9f797da5e..b1cf77793 100644 --- a/app/api/controller/shop/IndexController.php +++ b/app/api/controller/shop/IndexController.php @@ -9,8 +9,7 @@ use app\common\model\dict\DictData; use app\common\model\merchant\Merchant; use app\common\model\supplier\Supplier; use think\facade\Db; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class IndexController extends BaseApiController{ public $notNeedLogin = ['apply','get_token','merchat_type','record','apply_detail']; diff --git a/app/api/controller/store/ProductRecordController.php b/app/api/controller/store/ProductRecordController.php index f9d1f6e46..660de6eed 100644 --- a/app/api/controller/store/ProductRecordController.php +++ b/app/api/controller/store/ProductRecordController.php @@ -3,8 +3,6 @@ namespace app\api\controller\store; use app\api\controller\BaseApiController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('收银机商品统计')] class ProductRecordController extends BaseApiController { diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php index 6b4dd010d..ef5b21d04 100644 --- a/app/api/controller/store/StoreController.php +++ b/app/api/controller/store/StoreController.php @@ -7,8 +7,7 @@ use app\api\controller\BaseApiController; use app\api\logic\store\StoreLogic; use app\common\service\pay\PayService; use Webman\Config; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class StoreController extends BaseApiController { diff --git a/app/api/controller/store/TransactionRecordController.php b/app/api/controller/store/TransactionRecordController.php index c0b2bb023..37dd6b288 100644 --- a/app/api/controller/store/TransactionRecordController.php +++ b/app/api/controller/store/TransactionRecordController.php @@ -3,8 +3,7 @@ namespace app\api\controller\store; use app\api\controller\BaseApiController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('收银机盈收统计')] + class TransactionRecordController extends BaseApiController { diff --git a/app/api/controller/user/AddressController.php b/app/api/controller/user/AddressController.php index 931446ade..781f6f9e3 100644 --- a/app/api/controller/user/AddressController.php +++ b/app/api/controller/user/AddressController.php @@ -6,8 +6,7 @@ use app\api\controller\BaseApiController; use app\api\lists\user\UserAddressList; use app\api\logic\user\AddressLogic; use app\api\validate\UserAddressValidate; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class AddressController extends BaseApiController { diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php index 67c7efbd1..b21be4f69 100644 --- a/app/api/controller/user/UserController.php +++ b/app/api/controller/user/UserController.php @@ -7,10 +7,7 @@ use app\api\logic\user\UserLogic; use app\api\validate\UserValidate; use app\common\enum\PayEnum; use app\common\logic\PaymentLogic; -use hg\apidoc\annotation as ApiDoc; -use taoser\Validate; -#[ApiDoc\title('用户')] /** * 用户控制器 @@ -19,15 +16,15 @@ use taoser\Validate; */ class UserController extends BaseApiController { - #[ - ApiDoc\Title('获取小程序手机号'), - ApiDoc\url('/api/user/user/getMobileByMnp'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('获取小程序手机号'), + // ApiDoc\url('/api/user/user/getMobileByMnp'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "code", type: "string", require: true, desc: "换取手机的code"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function getMobileByMnp() { $params = (new UserValidate())->post()->goCheck('getMobileByMnp'); @@ -41,45 +38,45 @@ class UserController extends BaseApiController } - #[ - ApiDoc\Title('用户个人信息'), - ApiDoc\url('/api/user/user/info'), - ApiDoc\Method('POST'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('用户个人信息'), + // ApiDoc\url('/api/user/user/info'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function info() { return $this->success('success', UserLogic::info($this->userId)); } - #[ - ApiDoc\Title('充值金额'), - ApiDoc\url('/api/user/user/rechange_amount'), - ApiDoc\Method('Get'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('充值金额'), + // ApiDoc\url('/api/user/user/rechange_amount'), + // ApiDoc\Method('Get'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function rechange_amount() { $res = UserLogic::rechange_level(); return $this->success('ok',$res); } - #[ - ApiDoc\Title('小程序充值'), - ApiDoc\url('/api/user/user/recharge'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('小程序充值'), + // ApiDoc\url('/api/user/user/recharge'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "price", type: "string", require: true, desc: "金额"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function recharge() { $params = (new UserValidate())->post()->goCheck('rechargeMoney'); @@ -95,16 +92,16 @@ class UserController extends BaseApiController } - #[ - ApiDoc\Title('会员账户详情'), - ApiDoc\url('/api/user/user/capital_flow'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), - ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('会员账户详情'), + // ApiDoc\url('/api/user/user/capital_flow'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "page_no", type: "int", require: true, desc: "默认1页数"), + // ApiDoc\Param(name: "page_size", type: "int", require: false, desc: "条数默认15"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function capital_flow() { $page_no = (int)$this->request->post('page_no',1); @@ -122,15 +119,15 @@ class UserController extends BaseApiController return $this->success('ok',$res); } - #[ - ApiDoc\Title('会员账户统计'), - ApiDoc\url('/api/user/user/capital_count'), - ApiDoc\Method('POST'), - ApiDoc\Param(), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('会员账户统计'), + // ApiDoc\url('/api/user/user/capital_count'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function capital_count() { $res = UserLogic::capital_count($this->userId); diff --git a/app/api/controller/user/UserFeedbackController.php b/app/api/controller/user/UserFeedbackController.php index 3ad0f9030..46cedd303 100644 --- a/app/api/controller/user/UserFeedbackController.php +++ b/app/api/controller/user/UserFeedbackController.php @@ -6,8 +6,7 @@ use app\api\logic\user\UserFeedbackLogic; use app\admin\validate\user\UserFeedbackValidate; use app\api\controller\BaseApiController; - use hg\apidoc\annotation as ApiDoc; - #[ApiDoc\NotParse()] + class UserFeedbackController extends BaseApiController { diff --git a/app/api/controller/user/UserVisitController.php b/app/api/controller/user/UserVisitController.php index 5570e2efe..d777c094a 100644 --- a/app/api/controller/user/UserVisitController.php +++ b/app/api/controller/user/UserVisitController.php @@ -5,25 +5,23 @@ namespace app\api\controller\user; use app\api\controller\BaseApiController; use app\api\logic\user\UserVisitLogic; use app\api\validate\VisitValidate; -use hg\apidoc\annotation as ApiDoc; use Illuminate\Support\Facades\Request; use support\Response; -#[ApiDoc\title('用户访问')] class UserVisitController extends BaseApiController { public $notNeedLogin = ['productLog']; - #[ - ApiDoc\Title('添加访问商品记录'), - ApiDoc\url('/api/user/UserVisit/productLog'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"), - ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加访问商品记录'), + // ApiDoc\url('/api/user/UserVisit/productLog'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "product_id", type: "int", require: true, desc: "product_id商品id"), + // ApiDoc\Param(name: "cate_id", type: "int", require: true, desc: "分类id"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function productLog(): Response { $params = (new VisitValidate())->post()->goCheck('add'); @@ -37,16 +35,16 @@ class UserVisitController extends BaseApiController } - #[ - ApiDoc\Title('用户访问页面记录'), - ApiDoc\url('/api/user/UserVisit/htmlLog'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"), - ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('用户访问页面记录'), + // ApiDoc\url('/api/user/UserVisit/htmlLog'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "url", type: "string", require: true, desc: "路径"), + // ApiDoc\Param(name: "stay_time", type: "int", require: true, desc: "停留时间"), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function htmlLog() { $ip = $this->request->getRealIp(); diff --git a/app/common/controller/BaseLikeController.php b/app/common/controller/BaseLikeController.php index 79cf2b9f9..8b020b6e3 100644 --- a/app/common/controller/BaseLikeController.php +++ b/app/common/controller/BaseLikeController.php @@ -7,9 +7,8 @@ namespace app\common\controller; use app\BaseController; use app\common\lists\BaseDataLists; use app\common\service\JsonService; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseLikeController extends BaseController { public $notNeedLogin = []; @@ -74,10 +73,10 @@ class BaseLikeController extends BaseController return JsonService::fail($msg, $data, $code, $show); } - #[ApiDoc\NotParse()] - #[ - ApiDoc\Title('是否免登录验证'), - ] + + // #[ + // ApiDoc\Title('是否免登录验证'), + // ] public function isNotNeedLogin() : bool { $notNeedLogin = $this->notNeedLogin; diff --git a/app/common/controller/Definitions.php b/app/common/controller/Definitions.php index 8e1e81085..11d053590 100644 --- a/app/common/controller/Definitions.php +++ b/app/common/controller/Definitions.php @@ -2,22 +2,21 @@ namespace app\common\controller; -use hg\apidoc\annotation as ApiDoc; class Definitions { - #[ - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ] + // #[ + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ] public function token() { } - #[ - ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"), - ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"), - ] + // #[ + // ApiDoc\Query("page_no", type: "int", require: false, default: 1, desc: "页码"), + // ApiDoc\Query("page_size", type: "int", require: false, default: 25, desc: "每页条数"), + // ] public function page() { diff --git a/app/common/lists/user/UserShipLists.php b/app/common/lists/user/UserShipLists.php new file mode 100644 index 000000000..c33e1f700 --- /dev/null +++ b/app/common/lists/user/UserShipLists.php @@ -0,0 +1,60 @@ +searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->field($field) + ->order('sort desc') + ->select()->toArray(); + return $lists; + } + + + /** + * @notes 获取数量 + * @return int + * @author 乔峰 + * @date 2022/9/22 15:51 + */ + public function count(): int + { + return UserShip::where($this->searchWhere)->count(); + } +} \ No newline at end of file diff --git a/app/store/controller/BaseAdminController.php b/app/store/controller/BaseAdminController.php index 4ccd24c80..b35b0d401 100644 --- a/app/store/controller/BaseAdminController.php +++ b/app/store/controller/BaseAdminController.php @@ -5,9 +5,7 @@ namespace app\store\controller; use app\common\controller\BaseLikeController; -use app\common\lists\BaseDataLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class BaseAdminController extends BaseLikeController { diff --git a/app/store/controller/ConfigController.php b/app/store/controller/ConfigController.php index c13dec726..a8220b243 100644 --- a/app/store/controller/ConfigController.php +++ b/app/store/controller/ConfigController.php @@ -19,7 +19,6 @@ use app\admin\logic\system_store\SystemStoreLogic; use app\common\controller\Definitions; use app\common\service\ConfigService; use app\common\service\FileService; -use hg\apidoc\annotation as ApiDoc; use think\facade\Db; /** @@ -27,27 +26,26 @@ use think\facade\Db; * Class ConfigController * @package app\admin\controller */ -#[ApiDoc\title('站点配置')] class ConfigController extends BaseAdminController { public $notNeedLogin = ['getConfig', 'dict']; - #[ - ApiDoc\Title('站点配置'), - ApiDoc\url('/store/config/getConfig'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'oss_domain', 'desc' => 'oss域名', 'type' => 'string'], - ['name' => 'web_name', 'desc' => '站点名称', 'type' => 'string'], - ['name' => 'web_favicon', 'desc' => '站点图标', 'type' => 'string'], - ['name' => 'web_logo', 'desc' => '站点logo', 'type' => 'string'], - ['name' => 'login_image', 'desc' => '登录页背景图', 'type' => 'string'], - ['name' => 'copyright_config', 'desc' => '版权信息', 'type' => 'array'], - ]), - ] + // #[ + // ApiDoc\Title('站点配置'), + // ApiDoc\url('/store/config/getConfig'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'oss_domain', 'desc' => 'oss域名', 'type' => 'string'], + // ['name' => 'web_name', 'desc' => '站点名称', 'type' => 'string'], + // ['name' => 'web_favicon', 'desc' => '站点图标', 'type' => 'string'], + // ['name' => 'web_logo', 'desc' => '站点logo', 'type' => 'string'], + // ['name' => 'login_image', 'desc' => '登录页背景图', 'type' => 'string'], + // ['name' => 'copyright_config', 'desc' => '版权信息', 'type' => 'array'], + // ]), + // ] public function getConfig() { // $data = ConfigLogic::getConfig(); @@ -70,15 +68,15 @@ class ConfigController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('门店配置'), - ApiDoc\url('/store/config/store'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('门店配置'), + // ApiDoc\url('/store/config/store'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function store() { $params['id'] = $this->request->adminInfo['store_id']; @@ -86,15 +84,15 @@ class ConfigController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('保存门店配置'), - ApiDoc\url('/store/config/saveStore'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('保存门店配置'), + // ApiDoc\url('/store/config/saveStore'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function saveStore() { $params = $this->request->post(); @@ -103,31 +101,31 @@ class ConfigController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('省列表'), - ApiDoc\url('/store/config/province'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('省列表'), + // ApiDoc\url('/store/config/province'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function province() { $list = Db::name('geo_province')->select()->toArray(); return $this->success('ok', $list); } - #[ - ApiDoc\Title('市列表'), - ApiDoc\url('/store/config/city'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '省份代码'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('市列表'), + // ApiDoc\url('/store/config/city'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '省份代码'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function city() { $province_code = $this->request->get('code'); @@ -135,16 +133,16 @@ class ConfigController extends BaseAdminController return $this->success('ok', $list); } - #[ - ApiDoc\Title('区列表'), - ApiDoc\url('/store/config/area'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '城市代码'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('区列表'), + // ApiDoc\url('/store/config/area'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'code', type: 'int', require: true, desc: '城市代码'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function area() { $city_code = $this->request->get('code'); diff --git a/app/store/controller/DeliveryController.php b/app/store/controller/DeliveryController.php index 0811d69f0..d0a747e67 100644 --- a/app/store/controller/DeliveryController.php +++ b/app/store/controller/DeliveryController.php @@ -5,41 +5,39 @@ namespace app\store\controller; use app\common\controller\Definitions; use app\common\lists\DeliveryServiceLists; use app\common\logic\DeliveryServiceLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('配送员管理')] class DeliveryController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/delivery/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '名称/手机号'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/delivery/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '名称/手机号'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new DeliveryServiceLists()); } - #[ - ApiDoc\Title('添加'), - ApiDoc\url('/store/delivery/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加'), + // ApiDoc\url('/store/delivery/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add(DeliveryServiceLogic $logic) { $params = $this->request->post(); @@ -47,20 +45,20 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑'), - ApiDoc\url('/store/delivery/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑'), + // ApiDoc\url('/store/delivery/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'nickname', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); @@ -69,16 +67,16 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/delivery/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/delivery/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); @@ -86,27 +84,27 @@ class DeliveryController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/delivery/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'verify_status', 'desc' => '核销开关,1开启,0关闭', 'type' => 'int'], - ['name' => 'order_status', 'desc' => '订单状态,1开启,0关闭', 'type' => 'int'], - ['name' => 'is_admin', 'desc' => '是否管理员,1是,0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], - ['name' => 'status', 'desc' => '状态,1启用,0禁用', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/delivery/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'verify_status', 'desc' => '核销开关,1开启,0关闭', 'type' => 'int'], + // ['name' => 'order_status', 'desc' => '订单状态,1开启,0关闭', 'type' => 'int'], + // ['name' => 'is_admin', 'desc' => '是否管理员,1是,0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], + // ['name' => 'status', 'desc' => '状态,1启用,0禁用', 'type' => 'int'], + // ]), + // ] public function detail(DeliveryServiceLogic $logic) { $id = $this->request->get('id'); @@ -114,16 +112,16 @@ class DeliveryController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('开启/关闭'), - ApiDoc\url('/store/delivery/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('开启/关闭'), + // ApiDoc\url('/store/delivery/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status(DeliveryServiceLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/DownloadController.php b/app/store/controller/DownloadController.php index faf1a11ed..93ce7f38b 100644 --- a/app/store/controller/DownloadController.php +++ b/app/store/controller/DownloadController.php @@ -7,8 +7,7 @@ namespace app\store\controller; use app\common\cache\ExportCache; use app\common\service\JsonService; use support\Cache; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class DownloadController extends BaseAdminController { diff --git a/app/store/controller/FileController.php b/app/store/controller/FileController.php index d1a50d9a4..e531cd65b 100644 --- a/app/store/controller/FileController.php +++ b/app/store/controller/FileController.php @@ -7,33 +7,32 @@ use app\admin\lists\file\FileLists; use app\admin\logic\FileLogic; use app\admin\validate\FileValidate; use app\common\controller\Definitions; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('文件管理')] +// #[ApiDoc\title('文件管理')] class FileController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/file/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/file/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new FileLists()); } - #[ - ApiDoc\Title('移动'), - ApiDoc\url('/store/file/move'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('移动'), + // ApiDoc\url('/store/file/move'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function move() { $params = (new FileValidate())->post()->goCheck('move'); @@ -41,13 +40,13 @@ class FileController extends BaseAdminController return $this->success('移动成功', [], 1, 1); } - #[ - ApiDoc\Title('重命名'), - ApiDoc\url('/store/file/rename'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('重命名'), + // ApiDoc\url('/store/file/rename'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function rename() { $params = (new FileValidate())->post()->goCheck('rename'); @@ -55,13 +54,13 @@ class FileController extends BaseAdminController return $this->success('重命名成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/file/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/file/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete() { $params = (new FileValidate())->post()->goCheck('delete'); @@ -69,25 +68,25 @@ class FileController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('分类列表'), - ApiDoc\url('/store/file/listCate'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('分类列表'), + // ApiDoc\url('/store/file/listCate'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function listCate() { return $this->dataLists(new FileCateLists()); } - #[ - ApiDoc\Title('添加文件分类'), - ApiDoc\url('/store/file/addCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加文件分类'), + // ApiDoc\url('/store/file/addCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function addCate() { $params = (new FileValidate())->post()->goCheck('addCate'); @@ -95,13 +94,13 @@ class FileController extends BaseAdminController return $this->success('添加成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑文件分类'), - ApiDoc\url('/store/file/editCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑文件分类'), + // ApiDoc\url('/store/file/editCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function editCate() { $params = (new FileValidate())->post()->goCheck('editCate'); @@ -109,13 +108,13 @@ class FileController extends BaseAdminController return $this->success('编辑成功', [], 1, 1); } - #[ - ApiDoc\Title('删除文件分类'), - ApiDoc\url('/store/file/delCate'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除文件分类'), + // ApiDoc\url('/store/file/delCate'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delCate() { $params = (new FileValidate())->post()->goCheck('id'); diff --git a/app/store/controller/LoginController.php b/app/store/controller/LoginController.php index 151e52bbe..b35adac66 100644 --- a/app/store/controller/LoginController.php +++ b/app/store/controller/LoginController.php @@ -17,34 +17,33 @@ namespace app\store\controller; use app\store\logic\LoginLogic; use app\store\validate\LoginValidate; use think\facade\Cache; -use hg\apidoc\annotation as ApiDoc; /** * 管理员登录控制器 * Class LoginController * @package app\store\controller */ -#[ApiDoc\title('登入登出')] +// #[ApiDoc\title('登入登出')] class LoginController extends BaseAdminController { public $notNeedLogin = ['account']; - #[ - ApiDoc\Title('账号登录'), - ApiDoc\url('/store/login/account'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "account", type: "string", require: true, desc: "账号"), - ApiDoc\Param(name: "password", type: "string", require: true, desc: "密码"), - ApiDoc\Param(name: "terminal", type: "integer", require: true, default: 1, desc: "终端类型:1-PC,2-H5"), - ApiDoc\NotHeaders(), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'name', 'desc' => '用户名', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'token', 'desc' => 'token', 'type' => 'string'], - ['name' => 'role_name', 'desc' => '角色名称', 'type' => 'integer'], - ]), - ] + // #[ + // ApiDoc\Title('账号登录'), + // ApiDoc\url('/store/login/account'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "account", type: "string", require: true, desc: "账号"), + // ApiDoc\Param(name: "password", type: "string", require: true, desc: "密码"), + // ApiDoc\Param(name: "terminal", type: "integer", require: true, default: 1, desc: "终端类型:1-PC,2-H5"), + // ApiDoc\NotHeaders(), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'name', 'desc' => '用户名', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'token', 'desc' => 'token', 'type' => 'string'], + // ['name' => 'role_name', 'desc' => '角色名称', 'type' => 'integer'], + // ]), + // ] public function account() { $params = (new LoginValidate())->post()->goCheck(); @@ -52,14 +51,14 @@ class LoginController extends BaseAdminController return $this->data((new LoginLogic())->login($params)); } - #[ - ApiDoc\Title('退出登录'), - ApiDoc\url('/store/login/logout'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('退出登录'), + // ApiDoc\url('/store/login/logout'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function logout() { //退出登录情况特殊,只有成功的情况,也不需要token验证 diff --git a/app/store/controller/StaffController.php b/app/store/controller/StaffController.php index 60e604c45..8dc4d3a0b 100644 --- a/app/store/controller/StaffController.php +++ b/app/store/controller/StaffController.php @@ -5,53 +5,52 @@ namespace app\store\controller; use app\common\controller\Definitions; use app\common\lists\StoreStaffLists; use app\common\logic\SystemStoreStaffLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('店员管理')] +// #[ApiDoc\title('店员管理')] class StaffController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/staff/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '店员名称/手机号/账号'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'id', 'type' => 'int'], - ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'is_admin', 'desc' => '是否是管理员,1是,0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/staff/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '店员名称/手机号/账号'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'id', 'type' => 'int'], + // ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'is_admin', 'desc' => '是否是管理员,1是,0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], + // ]), + // ] public function lists() { return $this->dataLists(new StoreStaffLists()); } - #[ - ApiDoc\Title('添加'), - ApiDoc\url('/store/staff/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), - ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关,1开启,0关闭'), - ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态,1开启,0关闭'), - ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长,1是,0不是'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('添加'), + // ApiDoc\url('/store/staff/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), + // ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关,1开启,0关闭'), + // ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态,1开启,0关闭'), + // ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长,1是,0不是'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add(SystemStoreStaffLogic $staffLogic) { $params = $this->request->post(); @@ -59,24 +58,24 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('编辑'), - ApiDoc\url('/store/staff/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), - ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), - ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), - ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), - ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), - ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关,1开启,0关闭'), - ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态,1开启,0关闭'), - ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长,1是,0不是'), - ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑'), + // ApiDoc\url('/store/staff/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Param(name: 'account', type: 'string', require: true, desc: '账号'), + // ApiDoc\Param(name: 'pwd', type: 'string', require: true, desc: '密码'), + // ApiDoc\Param(name: 'avatar', type: 'string', require: true, desc: '头像'), + // ApiDoc\Param(name: 'staff_name', type: 'string', require: true, desc: '店员名称'), + // ApiDoc\Param(name: 'phone', type: 'string', require: true, desc: '手机号'), + // ApiDoc\Param(name: 'verify_status', type: 'string', require: true, desc: '核销开关,1开启,0关闭'), + // ApiDoc\Param(name: 'order_status', type: 'string', require: true, desc: '订单状态,1开启,0关闭'), + // ApiDoc\Param(name: 'is_manager', type: 'string', require: true, desc: '是否是店长,1是,0不是'), + // ApiDoc\Param(name: 'status', type: 'string', require: true, desc: '状态,1启用,0禁用'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit(SystemStoreStaffLogic $staffLogic) { $id = $this->request->post('id'); @@ -85,15 +84,15 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('删除'), - ApiDoc\url('/store/staff/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('删除'), + // ApiDoc\url('/store/staff/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete(SystemStoreStaffLogic $staffLogic) { $id = $this->request->post('id'); @@ -101,26 +100,26 @@ class StaffController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/staff/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'account', 'desc' => '账号', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], - ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], - ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], - ['name' => 'verify_status', 'desc' => '核销开关,1开启,0关闭', 'type' => 'int'], - ['name' => 'order_status', 'desc' => '订单状态,1开启,0关闭', 'type' => 'int'], - ['name' => 'is_admin', 'desc' => '是否管理员,1是,0不是', 'type' => 'int'], - ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], - ['name' => 'status', 'desc' => '状态,1启用,0禁用', 'type' => 'int'], - ]), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/staff/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'account', 'desc' => '账号', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '头像', 'type' => 'string'], + // ['name' => 'staff_name', 'desc' => '店员名称', 'type' => 'string'], + // ['name' => 'phone', 'desc' => '手机号', 'type' => 'string'], + // ['name' => 'verify_status', 'desc' => '核销开关,1开启,0关闭', 'type' => 'int'], + // ['name' => 'order_status', 'desc' => '订单状态,1开启,0关闭', 'type' => 'int'], + // ['name' => 'is_admin', 'desc' => '是否管理员,1是,0不是', 'type' => 'int'], + // ['name' => 'is_manager', 'desc' => '是否是店长,1是,0不是', 'type' => 'int'], + // ['name' => 'status', 'desc' => '状态,1启用,0禁用', 'type' => 'int'], + // ]), + // ] public function detail(SystemStoreStaffLogic $staffLogic) { $id = $this->request->get('id'); @@ -128,15 +127,15 @@ class StaffController extends BaseAdminController return $this->data($data); } - #[ - ApiDoc\Title('开启/关闭'), - ApiDoc\url('/store/staff/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('开启/关闭'), + // ApiDoc\url('/store/staff/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status(SystemStoreStaffLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/UploadController.php b/app/store/controller/UploadController.php index 2cfc92110..cd00fde5a 100644 --- a/app/store/controller/UploadController.php +++ b/app/store/controller/UploadController.php @@ -6,9 +6,7 @@ namespace app\store\controller; use app\common\service\UploadService; use Exception; -use Tinywan\Storage\Storage; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class UploadController extends BaseAdminController { diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php index 6788b71ca..3ca20e3cb 100644 --- a/app/store/controller/WorkbenchController.php +++ b/app/store/controller/WorkbenchController.php @@ -5,23 +5,22 @@ namespace app\store\controller; use app\common\controller\Definitions; use app\store\lists\store_order\StoreOrderLists; use app\store\logic\WorkbenchLogic; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\Title('工作台')] +// #[ApiDoc\Title('工作台')] class WorkbenchController extends BaseAdminController { - #[ - ApiDoc\Title('交易统计'), - ApiDoc\url('/store/workbench/index'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('交易统计'), + // ApiDoc\url('/store/workbench/index'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function index() { $params = $this->request->get(); @@ -30,17 +29,17 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品统计(暂时不用)'), - ApiDoc\url('/store/workbench/product'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计(暂时不用)'), + // ApiDoc\url('/store/workbench/product'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function product() { $params = $this->request->get(); @@ -49,17 +48,17 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('配送统计'), - ApiDoc\url('/store/workbench/delivery'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('配送统计'), + // ApiDoc\url('/store/workbench/delivery'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delivery() { $params = $this->request->get(); @@ -68,18 +67,18 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('配送订单统计'), - ApiDoc\url('/store/workbench/deliveryOrder'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('配送订单统计'), + // ApiDoc\url('/store/workbench/deliveryOrder'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function deliveryOrder() { $params = $this->request->get(); @@ -88,17 +87,17 @@ class WorkbenchController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品统计-概况'), - ApiDoc\url('/store/workbench/get_basic'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计-概况'), + // ApiDoc\url('/store/workbench/get_basic'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function get_basic(\app\admin\controller\WorkbenchController $workbench) { $params = $this->request->get(); @@ -106,17 +105,17 @@ class WorkbenchController extends BaseAdminController return $workbench->get_basic(); } - #[ - ApiDoc\Title('商品统计-图表'), - ApiDoc\url('/store/workbench/get_trend'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计-图表'), + // ApiDoc\url('/store/workbench/get_trend'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function get_trend(\app\admin\controller\WorkbenchController $workbench) { $params = $this->request->get(); @@ -124,17 +123,17 @@ class WorkbenchController extends BaseAdminController return $workbench->get_trend(); } - #[ - ApiDoc\Title('商品统计-排行'), - ApiDoc\url('/store/workbench/get_product_ranking'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品统计-排行'), + // ApiDoc\url('/store/workbench/get_product_ranking'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function get_product_ranking(\app\admin\controller\WorkbenchController $workbench) { $params = $this->request->get(); @@ -143,16 +142,16 @@ class WorkbenchController extends BaseAdminController } - #[ - ApiDoc\Title('收银台数据统计'), - ApiDoc\url('/store/workbench/business_statistics'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('收银台数据统计'), + // ApiDoc\url('/store/workbench/business_statistics'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function business_statistics() { $params = $this->request->get(); diff --git a/app/store/controller/auth/AdminController.php b/app/store/controller/auth/AdminController.php index 50c75f336..0ec1f6cbf 100644 --- a/app/store/controller/auth/AdminController.php +++ b/app/store/controller/auth/AdminController.php @@ -19,38 +19,37 @@ use app\store\lists\auth\AdminLists; use app\store\validate\auth\AdminValidate; use app\store\logic\auth\AdminLogic; use app\store\validate\auth\editSelfValidate; -use hg\apidoc\annotation as ApiDoc; /** * 管理员控制器 * Class AdminController * @package app\store\controller\auth */ -#[ApiDoc\title('管理员信息')] +// #[ApiDoc\title('管理员信息')] class AdminController extends BaseAdminController { - #[ - ApiDoc\Title("查看管理员列表"), - ApiDoc\url('/store/auth/admin/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("查看管理员列表"), + // ApiDoc\url('/store/auth/admin/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new AdminLists()); } - #[ - ApiDoc\Title("添加管理员"), - ApiDoc\url('/store/auth/admin/add'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("添加管理员"), + // ApiDoc\url('/store/auth/admin/add'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function add() { $params = (new AdminValidate())->post()->goCheck('add'); @@ -61,14 +60,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("编辑管理员"), - ApiDoc\url('/store/auth/admin/edit'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("编辑管理员"), + // ApiDoc\url('/store/auth/admin/edit'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit() { $params = (new AdminValidate())->post()->goCheck('edit'); @@ -79,14 +78,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("删除管理员"), - ApiDoc\url('/store/auth/admin/delete'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("删除管理员"), + // ApiDoc\url('/store/auth/admin/delete'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function delete() { $params = (new AdminValidate())->post()->goCheck('delete'); @@ -97,14 +96,14 @@ class AdminController extends BaseAdminController return $this->fail(AdminLogic::getError()); } - #[ - ApiDoc\Title("查看管理员详情"), - ApiDoc\url('/store/auth/admin/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("查看管理员详情"), + // ApiDoc\url('/store/auth/admin/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { $params = (new AdminValidate())->goCheck('detail'); @@ -112,28 +111,28 @@ class AdminController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title("获取当前管理员信息"), - ApiDoc\url('/store/auth/admin/mySelf'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("获取当前管理员信息"), + // ApiDoc\url('/store/auth/admin/mySelf'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function mySelf() { $result = AdminLogic::detail(['id' => $this->adminId], 'auth'); return $this->data($result); } - #[ - ApiDoc\Title("编辑超级管理员信息"), - ApiDoc\url('/store/auth/admin/editSelf'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title("编辑超级管理员信息"), + // ApiDoc\url('/store/auth/admin/editSelf'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(name: "token", type: "string", require: true, desc: "token"), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function editSelf() { $params = (new editSelfValidate())->post()->goCheck('', ['admin_id' => $this->adminId]); diff --git a/app/store/controller/auth/MenuController.php b/app/store/controller/auth/MenuController.php index 0dd8ff82b..caa58acf6 100644 --- a/app/store/controller/auth/MenuController.php +++ b/app/store/controller/auth/MenuController.php @@ -19,7 +19,6 @@ use app\store\controller\BaseAdminController; use app\store\lists\auth\MenuLists; use app\store\logic\auth\MenuLogic; use app\store\validate\auth\MenuValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -27,7 +26,7 @@ use hg\apidoc\annotation as ApiDoc; * Class MenuController * @package app\store\controller\setting\system */ -#[ApiDoc\NotParse()] + class MenuController extends BaseAdminController { diff --git a/app/store/controller/auth/RoleController.php b/app/store/controller/auth/RoleController.php index 8cd0ee800..02557bb03 100644 --- a/app/store/controller/auth/RoleController.php +++ b/app/store/controller/auth/RoleController.php @@ -20,14 +20,12 @@ use app\store\{ validate\auth\RoleValidate, controller\BaseAdminController }; -use hg\apidoc\annotation as ApiDoc; - /** * 角色控制器 * Class RoleController * @package app\store\controller\auth */ -#[ApiDoc\NotParse()] + class RoleController extends BaseAdminController { diff --git a/app/store/controller/cart/CartController.php b/app/store/controller/cart/CartController.php index 6f3e640d8..e190a385b 100644 --- a/app/store/controller/cart/CartController.php +++ b/app/store/controller/cart/CartController.php @@ -8,9 +8,8 @@ use app\common\model\store_branch_product\StoreBranchProduct; use app\store\lists\cart\CartList; use app\common\model\order\Cart; use app\store\controller\BaseAdminController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + class CartController extends BaseAdminController { public function list() diff --git a/app/store/controller/cate/CateController.php b/app/store/controller/cate/CateController.php index 870d369b9..d44b62da3 100644 --- a/app/store/controller/cate/CateController.php +++ b/app/store/controller/cate/CateController.php @@ -5,8 +5,7 @@ namespace app\store\controller\cate; use app\store\controller\BaseAdminController; use app\api\lists\cate\CateLists; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\NotParse()] + /** * 商品分类控制器 diff --git a/app/store/controller/finance/FinanceController.php b/app/store/controller/finance/FinanceController.php index 2ed913b22..fb0e2f2ef 100644 --- a/app/store/controller/finance/FinanceController.php +++ b/app/store/controller/finance/FinanceController.php @@ -6,54 +6,53 @@ use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; use app\common\controller\Definitions; use app\common\logic\StoreFinanceFlowLogic; use app\store\controller\BaseAdminController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('财务')] +// #[ApiDoc\title('财务')] class FinanceController extends BaseAdminController { - #[ - ApiDoc\Title('财务流水'), - ApiDoc\url('/store/finance/finance/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '订单编号'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'financial_record_sn', 'desc' => '流水号', 'type' => 'string'], - ['name' => 'order_sn', 'desc' => '订单号', 'type' => 'string'], - ['name' => 'number', 'desc' => '金额', 'type' => 'float'], - ['name' => 'create_time', 'desc' => '创建时间', 'type' => 'string'], - ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - ['name' => 'staff_name', 'desc' => '店员', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '店铺名称', 'type' => 'string'], - ['name' => 'pay_type_name', 'desc' => '支付方式', 'type' => 'string'], - ['name' => 'financial_type_name', 'desc' => '流水类型', 'type' => 'string'], - ['name' => 'remark', 'desc' => '备注', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('财务流水'), + // ApiDoc\url('/store/finance/finance/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '订单编号'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'financial_record_sn', 'desc' => '流水号', 'type' => 'string'], + // ['name' => 'order_sn', 'desc' => '订单号', 'type' => 'string'], + // ['name' => 'number', 'desc' => '金额', 'type' => 'float'], + // ['name' => 'create_time', 'desc' => '创建时间', 'type' => 'string'], + // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], + // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '店铺名称', 'type' => 'string'], + // ['name' => 'pay_type_name', 'desc' => '支付方式', 'type' => 'string'], + // ['name' => 'financial_type_name', 'desc' => '流水类型', 'type' => 'string'], + // ['name' => 'remark', 'desc' => '备注', 'type' => 'string'], + // ]), + // ] public function lists() { return $this->dataLists(new StoreFinanceFlowLists()); } - #[ - ApiDoc\Title('备注'), - ApiDoc\url('/store/finance/finance/remark'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Param(name: 'remark', type: 'string', require: true, desc: '备注'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('备注'), + // ApiDoc\url('/store/finance/finance/remark'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Param(name: 'remark', type: 'string', require: true, desc: '备注'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function remark(StoreFinanceFlowLogic $logic) { $id = $this->request->post('id'); diff --git a/app/store/controller/finance/StoreBillController.php b/app/store/controller/finance/StoreBillController.php index 426f7cddd..50c7fb34c 100644 --- a/app/store/controller/finance/StoreBillController.php +++ b/app/store/controller/finance/StoreBillController.php @@ -6,46 +6,45 @@ use app\admin\lists\store_finance_flow\StoreFinanceFlowLists; use app\common\controller\Definitions; use app\common\lists\StoreBillLists; use app\store\controller\BaseAdminController; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('账单记录')] +// #[ApiDoc\title('账单记录')] class StoreBillController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/finance/storeBill/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'type', type: 'int', require: false, desc: '类型:1日账单,2周账单,3月账单'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - ApiDoc\Query(name: 'export', type: 'int', require: false, desc: '是否导出:2是'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/finance/storeBill/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'type', type: 'int', require: false, desc: '类型:1日账单,2周账单,3月账单'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), + // ApiDoc\Query(name: 'export', type: 'int', require: false, desc: '是否导出:2是'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new StoreBillLists()); } - #[ - ApiDoc\Title('详情'), - ApiDoc\url('/store/finance/storeBill/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\Query(name: 'date_type', type: 'int', require: false, desc: '日期类型:1日账单,2周账单,3月账单'), - ApiDoc\Query(name: 'date', type: 'string', require: false, desc: '日期,日账单:2021-01-01,周账单:2024-W23,月账单:2021-01'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '流水号/用户昵称'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('详情'), + // ApiDoc\url('/store/finance/storeBill/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\Query(name: 'date_type', type: 'int', require: false, desc: '日期类型:1日账单,2周账单,3月账单'), + // ApiDoc\Query(name: 'date', type: 'string', require: false, desc: '日期,日账单:2021-01-01,周账单:2024-W23,月账单:2021-01'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'keyword', type: 'string', require: false, desc: '流水号/用户昵称'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail() { return $this->dataLists(new StoreFinanceFlowLists()); diff --git a/app/store/controller/store_order/StoreOrderController.php b/app/store/controller/store_order/StoreOrderController.php index 0dda0ad55..f8043f220 100644 --- a/app/store/controller/store_order/StoreOrderController.php +++ b/app/store/controller/store_order/StoreOrderController.php @@ -14,7 +14,6 @@ use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; use app\common\model\store_order\StoreOrder; use app\store\validate\store_order\StoreOrderValidate; -use hg\apidoc\annotation as ApiDoc; use support\Log; use Webman\RedisQueue\Redis; @@ -23,59 +22,59 @@ use Webman\RedisQueue\Redis; * Class StoreOrderController * @package app\store\controller\store_order */ -#[ApiDoc\title('订单')] +// #[ApiDoc\title('订单')] class StoreOrderController extends BaseAdminController { - #[ - ApiDoc\Title('订单列表'), - ApiDoc\url('/store/store_order/storeOrder/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'delivery_phone', type: 'int', require: false, desc: '配送员手机号'), - ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式:1配送订单,2核销订单,3收银台订单'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:-1待支付,0待发货,1待收货,2已完成'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], - ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], - ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], - ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], - ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], - ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], - ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], - ['name' => 'price', 'desc' => '单价', 'type' => 'string'], - ]], - ]], - ]), - ] + // #[ + // ApiDoc\Title('订单列表'), + // ApiDoc\url('/store/store_order/storeOrder/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'delivery_phone', type: 'int', require: false, desc: '配送员手机号'), + // ApiDoc\Query(name: 'shipping_type', type: 'int', require: false, desc: '订单配送方式:1配送订单,2核销订单,3收银台订单'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间'), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间'), + // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:-1待支付,0待发货,1待收货,2已完成'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], + // ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], + // ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], + // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], + // ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], + // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], + // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], + // ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], + // ['name' => 'price', 'desc' => '单价', 'type' => 'string'], + // ]], + // ]], + // ]), + // ] public function lists() { return $this->dataLists(new StoreOrderLists()); } - #[ - ApiDoc\Title('订单统计'), - ApiDoc\url('/store/store_order/storeOrder/title'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单统计'), + // ApiDoc\url('/store/store_order/storeOrder/title'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function title(SystemStoreStaffLogic $staffLogic, StoreOrderLogic $orderLogic) { return $this->data([ @@ -90,17 +89,17 @@ class StoreOrderController extends BaseAdminController ]); } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/store/store_order/storeOrder/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'), - ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单详情'), + // ApiDoc\url('/store/store_order/storeOrder/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'), + // ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail(StoreOrderLogic $orderLogic) { $params = (new StoreOrderValidate())->goCheck('detail'); @@ -253,17 +252,17 @@ class StoreOrderController extends BaseAdminController } - #[ - ApiDoc\Title('订单已核销列表'), - ApiDoc\url('/store/store_order/storeOrder/writeoff_list'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'page_no', type: 'int', require: false, desc: '页数 默认1'), - ApiDoc\Query(name: 'page_size', type: 'int', require: false, desc: '每页条数 默认15'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单已核销列表'), + // ApiDoc\url('/store/store_order/storeOrder/writeoff_list'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'page_no', type: 'int', require: false, desc: '页数 默认1'), + // ApiDoc\Query(name: 'page_size', type: 'int', require: false, desc: '每页条数 默认15'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function writeoff_list(StoreOrderLogic $orderLogic) { $page_no = (int)$this->request->post('page_no', 1); diff --git a/app/store/controller/store_order/StoreRefundOrderController.php b/app/store/controller/store_order/StoreRefundOrderController.php index 14ffbb3ec..5857b772c 100644 --- a/app/store/controller/store_order/StoreRefundOrderController.php +++ b/app/store/controller/store_order/StoreRefundOrderController.php @@ -7,66 +7,65 @@ use app\common\lists\order\StoreRefundOrderLists; use app\store\controller\BaseAdminController; use app\common\logic\store_order\StoreOrderLogic; use app\store\validate\store_order\StoreOrderValidate; -use hg\apidoc\annotation as ApiDoc; /** * 订单列表控制器 * Class StoreOrderController * @package app\store\controller\store_order */ -#[ApiDoc\title('退款订单')] +// #[ApiDoc\title('退款订单')] class StoreRefundOrderController extends BaseAdminController { - #[ - ApiDoc\Title('订单列表'), - ApiDoc\url('/store/store_order/storeRefundOrder/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), - ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间', mock: "@datetime('yyyy-MM-dd')"), - ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间', mock: "@datetime('yyyy-MM-dd')"), - ApiDoc\Query(name: 'refund_type', type: 'int', require: false, desc: '状态:1仅退款,2退款退货,3拒绝退款,4商品待退货,5退货待收货,6已退款', mock: "@integer(1, 6)"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], - ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], - ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], - ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], - ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], - ['name' => 'refund_status_name', 'desc' => '退款状态', 'type' => 'string'], - ['name' => 'refund_type_name', 'desc' => '退款类型', 'type' => 'string'], - ['name' => 'refund_reason_time', 'desc' => '退款时间', 'type' => 'int'], - ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], - ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], - ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], - ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ - ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], - ['name' => 'price', 'desc' => '单价', 'type' => 'string'], - ]], - ]], - ]), - ] + // #[ + // ApiDoc\Title('订单列表'), + // ApiDoc\url('/store/store_order/storeRefundOrder/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Query(name: 'order_id', type: 'string', require: false, desc: '订单编号'), + // ApiDoc\Query(name: 'start_time', type: 'string', require: false, desc: '开始时间', mock: "@datetime('yyyy-MM-dd')"), + // ApiDoc\Query(name: 'end_time', type: 'string', require: false, desc: '结束时间', mock: "@datetime('yyyy-MM-dd')"), + // ApiDoc\Query(name: 'refund_type', type: 'int', require: false, desc: '状态:1仅退款,2退款退货,3拒绝退款,4商品待退货,5退货待收货,6已退款', mock: "@integer(1, 6)"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'order_id', 'desc' => '订单编号', 'type' => 'string'], + // ['name' => 'pay_price', 'desc' => '支付金额', 'type' => 'string'], + // ['name' => 'pay_time', 'desc' => '支付时间', 'type' => 'float'], + // ['name' => 'pay_type', 'desc' => '支付方式', 'type' => 'float'], + // ['name' => 'status_name', 'desc' => '状态', 'type' => 'int'], + // ['name' => 'refund_status_name', 'desc' => '退款状态', 'type' => 'string'], + // ['name' => 'refund_type_name', 'desc' => '退款类型', 'type' => 'string'], + // ['name' => 'refund_reason_time', 'desc' => '退款时间', 'type' => 'int'], + // ['name' => 'staff_name', 'desc' => '店员', 'type' => 'int'], + // ['name' => 'nickname', 'desc' => '用户昵称', 'type' => 'string'], + // ['name' => 'avatar', 'desc' => '用户头像', 'type' => 'string'], + // ['name' => 'product', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'cart_info', 'desc' => '商品信息', 'type' => 'array', 'children' => [ + // ['name' => 'name', 'desc' => '商品名称', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'cart_num', 'desc' => '购买数量', 'type' => 'string'], + // ['name' => 'price', 'desc' => '单价', 'type' => 'string'], + // ]], + // ]], + // ]), + // ] public function lists() { return $this->dataLists(new StoreRefundOrderLists()); } - #[ - ApiDoc\Title('编辑订单'), - ApiDoc\url('/store/store_order/storeRefundOrder/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('编辑订单'), + // ApiDoc\url('/store/store_order/storeRefundOrder/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function edit() { $params = (new StoreOrderValidate())->post()->goCheck('edit'); @@ -77,16 +76,16 @@ class StoreRefundOrderController extends BaseAdminController return $this->fail(StoreOrderLogic::getError()); } - #[ - ApiDoc\Title('订单详情'), - ApiDoc\url('/store/store_order/storeRefundOrder/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Author('中国队长'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '订单id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('订单详情'), + // ApiDoc\url('/store/store_order/storeRefundOrder/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Author('中国队长'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '订单id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function detail(StoreOrderLogic $orderLogic) { $params = (new StoreOrderValidate())->goCheck('detail'); diff --git a/app/store/controller/store_product/StoreProductController.php b/app/store/controller/store_product/StoreProductController.php index c1aa3e16e..780430b60 100644 --- a/app/store/controller/store_product/StoreProductController.php +++ b/app/store/controller/store_product/StoreProductController.php @@ -9,7 +9,6 @@ use app\store\controller\BaseAdminController; use app\store\logic\store_branch_product\StoreBranchProductLogic; use app\store\logic\store_product\StoreProductLogic; use app\store\validate\store_product\StoreProductValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -17,57 +16,57 @@ use hg\apidoc\annotation as ApiDoc; * Class StoreProductController * @package app\store\controller\store_product */ -#[ApiDoc\title('商品列表')] +// #[ApiDoc\title('商品列表')] class StoreProductController extends BaseAdminController { - #[ - ApiDoc\Title('商品列表'), - ApiDoc\url('/store/store_product/storeProduct/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: 'cate_id', type: 'int', require: false, desc: '分类id'), - ApiDoc\Query(name: 'store_name', type: 'string', require: false, desc: '商品名称'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:1上架,2下架,3售罄,4库存告警'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ['name' => 'status', 'desc' => '状态:1上架,0下架', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('商品列表'), + // ApiDoc\url('/store/store_product/storeProduct/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: 'cate_id', type: 'int', require: false, desc: '分类id'), + // ApiDoc\Query(name: 'store_name', type: 'string', require: false, desc: '商品名称'), + // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:1上架,2下架,3售罄,4库存告警'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ['name' => 'status', 'desc' => '状态:1上架,0下架', 'type' => 'string'], + // ]), + // ] public function lists() { return $this->dataLists(new StoreBranchProductLists()); } - #[ - ApiDoc\Title('添加商品'), - ApiDoc\url('/store/store_product/storeProduct/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('添加商品'), + // ApiDoc\url('/store/store_product/storeProduct/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function add() { $params = (new StoreProductValidate())->post()->goCheck('add'); @@ -78,25 +77,25 @@ class StoreProductController extends BaseAdminController return $this->fail(StoreProductLogic::getError()); } - #[ - ApiDoc\Title('编辑商品'), - ApiDoc\url('/store/store_product/storeProduct/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('编辑商品'), + // ApiDoc\url('/store/store_product/storeProduct/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function edit() { $params = (new StoreProductValidate())->post()->goCheck('edit'); @@ -107,25 +106,25 @@ class StoreProductController extends BaseAdminController return $this->fail(StoreProductLogic::getError()); } - #[ - ApiDoc\Title('删除商品'), - ApiDoc\url('/store/store_product/storeProduct/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('删除商品'), + // ApiDoc\url('/store/store_product/storeProduct/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function delete() { $params = (new StoreProductValidate())->post()->goCheck('delete'); @@ -133,25 +132,25 @@ class StoreProductController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('商品详情'), - ApiDoc\url('/store/store_product/storeProduct/detail'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'image', 'desc' => '图片', 'type' => 'string'], - ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], - ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], - ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], - ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], - ]), - ] + // #[ + // ApiDoc\Title('商品详情'), + // ApiDoc\url('/store/store_product/storeProduct/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'image', 'desc' => '图片', 'type' => 'string'], + // ['name' => 'store_name', 'desc' => '商品名称', 'type' => 'string'], + // ['name' => 'price', 'desc' => '零售价', 'type' => 'float'], + // ['name' => 'cost', 'desc' => '成本价', 'type' => 'float'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unit_name', 'desc' => '单位', 'type' => 'string'], + // ['name' => 'cate_name', 'desc' => '分类', 'type' => 'string'], + // ]), + // ] public function detail() { $params = (new StoreProductValidate())->goCheck('detail'); @@ -159,15 +158,15 @@ class StoreProductController extends BaseAdminController return $this->data($result); } - #[ - ApiDoc\Title('商品上下架'), - ApiDoc\url('/store/store_product/storeProduct/status'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品上下架'), + // ApiDoc\url('/store/store_product/storeProduct/status'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Param(name: "id", type: "int", require: true, desc: "id"), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function status() { $params = (new StoreProductValidate())->post()->goCheck('detail'); @@ -175,19 +174,19 @@ class StoreProductController extends BaseAdminController return $this->success('操作成功', [], 1, 1); } - #[ - ApiDoc\Title('商品库存增减'), - ApiDoc\url('/store/store_product/storeProduct/stock'), - ApiDoc\Method('POST'), - ApiDoc\Param(name: "attrs", type: "array", require: true, desc: "id", children: [ - ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], - ['name' => 'type', 'desc' => '类型:1增加,2减少', 'type' => 'int'], - ['name' => 'number', 'desc' => '数量', 'type' => 'int'], - ]), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('商品库存增减'), + // ApiDoc\url('/store/store_product/storeProduct/stock'), + // ApiDoc\Method('POST'), + // ApiDoc\Param(name: "attrs", type: "array", require: true, desc: "id", children: [ + // ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], + // ['name' => 'type', 'desc' => '类型:1增加,2减少', 'type' => 'int'], + // ['name' => 'number', 'desc' => '数量', 'type' => 'int'], + // ]), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function stock() { $params = (new StoreProductValidate())->post()->goCheck('stock'); diff --git a/app/store/controller/store_product/StoreStorageController.php b/app/store/controller/store_product/StoreStorageController.php index 0fc5a2509..77ade604c 100644 --- a/app/store/controller/store_product/StoreStorageController.php +++ b/app/store/controller/store_product/StoreStorageController.php @@ -7,38 +7,37 @@ use app\store\controller\BaseAdminController; use app\admin\lists\system_store_storage\SystemStoreStorageLists; use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; -use hg\apidoc\annotation as ApiDoc; -#[ApiDoc\title('入库管理')] +// #[ApiDoc\title('入库管理')] class StoreStorageController extends BaseAdminController { - #[ - ApiDoc\Title('入库记录'), - ApiDoc\url('/store/store_product/storeStorage/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Query(name: 'store_id', type: 'int', require: false, desc: '门店id'), - ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), - ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:0-待确认,1-已确认'), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('入库记录'), + // ApiDoc\url('/store/store_product/storeStorage/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Query(name: 'store_id', type: 'int', require: false, desc: '门店id'), + // ApiDoc\Query(name: 'staff_id', type: 'int', require: false, desc: '店员id'), + // ApiDoc\Query(name: 'status', type: 'int', require: false, desc: '状态:0-待确认,1-已确认'), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function lists() { return $this->dataLists(new SystemStoreStorageLists()); } - #[ - ApiDoc\Title('确认入库'), - ApiDoc\url('/store/store_product/storeStorage/confirm'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), - ApiDoc\ResponseSuccess("data", type: "array"), - ] + // #[ + // ApiDoc\Title('确认入库'), + // ApiDoc\url('/store/store_product/storeStorage/confirm'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Param(name: 'id', type: 'int', require: true, desc: 'id'), + // ApiDoc\ResponseSuccess("data", type: "array"), + // ] public function confirm() { $params = (new SystemStoreStorageValidate())->post()->goCheck('edit'); diff --git a/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php b/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php index ae7c08238..9b99546ac 100644 --- a/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php +++ b/app/store/controller/store_product_attr_value/StoreProductAttrValueController.php @@ -8,7 +8,6 @@ use app\store\controller\BaseAdminController; use app\store\lists\store_product_attr_value\StoreProductAttrValueLists; use app\store\logic\store_product_attr_value\StoreProductAttrValueLogic; use app\store\validate\store_product_attr_value\StoreProductAttrValueValidate; -use hg\apidoc\annotation as ApiDoc; /** @@ -16,47 +15,47 @@ use hg\apidoc\annotation as ApiDoc; * Class StoreProductAttrValueController * @package app\store\controller\store_product_attr_value */ -#[ApiDoc\title('商品属性值')] +// #[ApiDoc\title('商品属性值')] class StoreProductAttrValueController extends BaseAdminController { - #[ - ApiDoc\Title('商品属性值列表'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ApiDoc\Query(ref: [Definitions::class, "page"]), - ApiDoc\Query(name: 'product_id', type: 'int', require: true, desc: '商品ID'), - ApiDoc\Query(name: 'store_id', type: 'int', require: true, desc: '门店ID'), - ApiDoc\ResponseSuccess("data", type: "array", children: [ - ['name' => 'count', 'desc' => '总数', 'type' => 'int'], - ['name' => 'page_no', 'desc' => '页码', 'type' => 'int'], - ['name' => 'page_size', 'desc' => '每页数量', 'type' => 'int'], - ['name' => 'extend', 'desc' => '扩展数据', 'type' => 'array'], - ['name' => 'lists', 'desc' => '列表数据', 'type' => 'array', 'children' => [ - ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], - ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], - ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], - ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], - ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], - ['name' => 'bar_code', 'desc' => '条码', 'type' => 'string'], - ['name' => 'image', 'desc' => '规格图片', 'type' => 'string'], - ]], - ]), - ] + // #[ + // ApiDoc\Title('商品属性值列表'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ApiDoc\Query(ref: [Definitions::class, "page"]), + // ApiDoc\Query(name: 'product_id', type: 'int', require: true, desc: '商品ID'), + // ApiDoc\Query(name: 'store_id', type: 'int', require: true, desc: '门店ID'), + // ApiDoc\ResponseSuccess("data", type: "array", children: [ + // ['name' => 'count', 'desc' => '总数', 'type' => 'int'], + // ['name' => 'page_no', 'desc' => '页码', 'type' => 'int'], + // ['name' => 'page_size', 'desc' => '每页数量', 'type' => 'int'], + // ['name' => 'extend', 'desc' => '扩展数据', 'type' => 'array'], + // ['name' => 'lists', 'desc' => '列表数据', 'type' => 'array', 'children' => [ + // ['name' => 'id', 'desc' => 'ID', 'type' => 'int'], + // ['name' => 'product_id', 'desc' => '商品ID', 'type' => 'int'], + // ['name' => 'stock', 'desc' => '库存', 'type' => 'int'], + // ['name' => 'unique', 'desc' => '唯一值', 'type' => 'string'], + // ['name' => 'sales', 'desc' => '销量', 'type' => 'int'], + // ['name' => 'bar_code', 'desc' => '条码', 'type' => 'string'], + // ['name' => 'image', 'desc' => '规格图片', 'type' => 'string'], + // ]], + // ]), + // ] public function lists() { return $this->dataLists(new StoreProductAttrValueLists()); } - #[ - ApiDoc\Title('添加商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/add'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('添加商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/add'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function add() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('add'); @@ -67,13 +66,13 @@ class StoreProductAttrValueController extends BaseAdminController return $this->fail(StoreProductAttrValueLogic::getError()); } - #[ - ApiDoc\Title('编辑商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/edit'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('编辑商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/edit'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function edit() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('edit'); @@ -84,13 +83,13 @@ class StoreProductAttrValueController extends BaseAdminController return $this->fail(StoreProductAttrValueLogic::getError()); } - #[ - ApiDoc\Title('删除商品属性值'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/delete'), - ApiDoc\Method('POST'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('删除商品属性值'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/delete'), + // ApiDoc\Method('POST'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function delete() { $params = (new StoreProductAttrValueValidate())->post()->goCheck('delete'); @@ -98,14 +97,14 @@ class StoreProductAttrValueController extends BaseAdminController return $this->success('删除成功', [], 1, 1); } - #[ - ApiDoc\Title('获取商品属性值详情'), - ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/detail'), - ApiDoc\Method('GET'), - ApiDoc\Author('中国队长'), - ApiDoc\NotHeaders(), - ApiDoc\Header(ref: [Definitions::class, "token"]), - ] + // #[ + // ApiDoc\Title('获取商品属性值详情'), + // ApiDoc\url('/store/store_product_attr_value/storeProductAttrValue/detail'), + // ApiDoc\Method('GET'), + // ApiDoc\Author('中国队长'), + // ApiDoc\NotHeaders(), + // ApiDoc\Header(ref: [Definitions::class, "token"]), + // ] public function detail() { $params = (new StoreProductAttrValueValidate())->goCheck('detail'); diff --git a/app/store/controller/system_store_storage/SystemStoreStorageController.php b/app/store/controller/system_store_storage/SystemStoreStorageController.php index 11389cf74..b910e9a4e 100644 --- a/app/store/controller/system_store_storage/SystemStoreStorageController.php +++ b/app/store/controller/system_store_storage/SystemStoreStorageController.php @@ -9,7 +9,6 @@ use app\admin\logic\system_store_storage\SystemStoreStorageLogic; use app\admin\validate\system_store_storage\SystemStoreStorageValidate; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\system_store_storage\SystemStoreStorage; -use hg\apidoc\annotation as ApiDoc; /** @@ -17,16 +16,16 @@ use hg\apidoc\annotation as ApiDoc; * Class SystemStoreStorageController * @package app\admin\controller\system_store_storage */ -#[ApiDoc\title('门店入库记录')] +// #[ApiDoc\title('门店入库记录')] class SystemStoreStorageController extends BaseAdminController { - #[ - ApiDoc\Title('列表'), - ApiDoc\url('/store/system_store_storage/systemstorestorage/lists'), - ApiDoc\Method('GET'), - ApiDoc\NotHeaders(), - ] + // #[ + // ApiDoc\Title('列表'), + // ApiDoc\url('/store/system_store_storage/systemstorestorage/lists'), + // ApiDoc\Method('GET'), + // ApiDoc\NotHeaders(), + // ] public function lists() { return $this->dataLists(new SystemStoreStorageLists()); diff --git a/app/store/controller/user/UserController.php b/app/store/controller/user/UserController.php new file mode 100644 index 000000000..547f4f366 --- /dev/null +++ b/app/store/controller/user/UserController.php @@ -0,0 +1,41 @@ +dataLists(new UserLists()); + } + + + public function add() + { + $params = (new UserValidate())->post()->goCheck('storeAdd'); + d($params); + $result = UserLogic::StoreAdd($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(UserLogic::getError()); + } + + + public function detail() + { + $params = (new UserValidate())->goCheck('detail'); + $detail = UserLogic::detail($params['id']); + return $this->success('', $detail); + } + +} \ No newline at end of file diff --git a/app/store/controller/user/UserShipController.php b/app/store/controller/user/UserShipController.php new file mode 100644 index 000000000..e6bd8cdca --- /dev/null +++ b/app/store/controller/user/UserShipController.php @@ -0,0 +1,18 @@ +dataLists(new UserShipLists()); + } +} \ No newline at end of file diff --git a/app/store/lists/user/UserLists.php b/app/store/lists/user/UserLists.php new file mode 100644 index 000000000..379d078f8 --- /dev/null +++ b/app/store/lists/user/UserLists.php @@ -0,0 +1,60 @@ + ['mobile'], + ]; + } + + /** + * @notes 获取用户列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 乔峰 + * @date 2022/9/22 15:50 + */ + public function lists(): array + { + + $field = "id,nickname,real_name,sex,avatar,account,mobile,user_money,create_time"; + $lists = User::where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->field($field) + ->order('id desc') + ->select()->each(function($data){ + $data['sex_text'] = $data->sex_text; + $data['mobile'] = substr_replace($data['mobile'], '****', 3, 4); + })->toArray(); + return $lists; + } + + + /** + * @notes 获取数量 + * @return int + * @author 乔峰 + * @date 2022/9/22 15:51 + */ + public function count(): int + { + return User::where($this->searchWhere)->count(); + } +} \ No newline at end of file diff --git a/composer.json b/composer.json index 7ed7add65..6906f2cef 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,6 @@ "ext-bcmath": "*", "jpush/jpush": "^3.6", "workerman/crontab": "^1.0", - "hg/apidoc": "^5.2", "intervention/image": "^3.6", "picqer/php-barcode-generator": "^2.4" }, diff --git a/composer.lock b/composer.lock index 2b148506f..6d7daedd7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8c97deb23217033cd0ab2cb6e5b5d195", + "content-hash": "974978f64812f55d8825aabadc43739f", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -1240,75 +1240,6 @@ ], "time": "2023-12-03T19:50:20+00:00" }, - { - "name": "hg/apidoc", - "version": "v5.2.3", - "source": { - "type": "git", - "url": "https://github.com/HGthecode/apidoc-php.git", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/HGthecode/apidoc-php/zipball/328aa4fe177ed7393f680724bf3eeb485052c2fe", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1 || ^2", - "php": "^7.1 || ^8.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "hg\\apidoc\\providers\\LaravelService" - ] - }, - "think": { - "services": [ - "hg\\apidoc\\providers\\ThinkPHPService" - ], - "config": { - "apidoc": "src/config.php" - } - }, - "hyperf": { - "config": "hg\\apidoc\\ConfigProvider" - } - }, - "autoload": { - "psr-4": { - "hg\\apidoc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "hg-code", - "email": "376401263@qq.com" - } - ], - "description": "根据注解生成API文档,兼容Laravel、ThinkPHP、Hyperf、Webman等框架;在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能", - "keywords": [ - "apidoc", - "api文档", - "markdown", - "php接口文档", - "接口文档", - "注解", - "注释生成", - "自动生成api" - ], - "support": { - "issues": "https://github.com/HGthecode/apidoc-php/issues", - "source": "https://github.com/HGthecode/apidoc-php/tree/v5.2.3" - }, - "time": "2024-03-22T02:25:31+00:00" - }, { "name": "hyperf/context", "version": "v3.1.15", diff --git a/config/plugin/hg/apidoc/app.php b/config/plugin/hg/apidoc/app.php deleted file mode 100644 index 6af1865fc..000000000 --- a/config/plugin/hg/apidoc/app.php +++ /dev/null @@ -1,105 +0,0 @@ - true, - 'apidoc' => [ - // (选配)文档标题,显示在左上角与首页 - 'title' => '接口文档', - // (选配)文档描述,显示在首页 - 'desc' => '', - // (必须)设置文档的应用/版本 - 'apps' => [ - [ - // (必须)标题 - 'title' => 'store接口', - // (必须)控制器目录地址 - 'path' => 'app\store\controller', - // (必须)唯一的key - 'key' => 'storeApi', - ], - [ - // (必须)标题 - 'title' => 'api接口', - // (必须)控制器目录地址 - 'path' => 'app\api\controller', - // (必须)唯一的key - 'key' => 'apiApi', - ] - ], - // (必须)指定通用注释定义的文件地址 - 'definitions' => "app\common\controller\Definitions", - // (必须)自动生成url规则,当接口不添加@Apidoc\Url ("xxx")注解时,使用以下规则自动生成 - 'auto_url' => [ - // 字母规则,lcfirst=首字母小写;ucfirst=首字母大写; - 'letter_rule' => "lcfirst", - // url前缀 - 'prefix' => "", - ], - // (选配)是否自动注册路由 - 'auto_register_routes' => true, - // (必须)缓存配置 - 'cache' => [ - // 是否开启缓存 - 'enable' => false, - ], - // (必须)权限认证配置 - 'auth' => [ - // 是否启用密码验证 - 'enable' => true, - // 全局访问密码 - 'password' => "qwe123", - // 密码加密盐 - 'secret_key' => "qwe123", - // 授权访问后的有效期 - 'expire' => 86400 * 7 - ], - // 全局参数 - 'params' => [ - // (选配)全局的请求Header - 'header' => [ - // name=字段名,type=字段类型,require=是否必须,default=默认值,desc=字段描述 - ['name' => 'Authorization', 'type' => 'string', 'require' => true, 'desc' => '身份令牌Token'], - ], - // (选配)全局的请求Query - 'query' => [ - // 同上 header - ], - // (选配)全局的请求Body - 'body' => [ - // 同上 header - ], - ], - // 全局响应体 - 'responses' => [ - // 成功响应体 - 'success' => [ - ['name' => 'code', 'desc' => '业务代码', 'type' => 'int', 'require' => 1], - ['name' => 'message', 'desc' => '业务信息', 'type' => 'string', 'require' => 1], - //参数同上 headers;main=true来指定接口Returned参数挂载节点 - ['name' => 'data', 'desc' => '业务数据', 'main' => true, 'type' => 'object', 'require' => 1], - ], - // 异常响应体 - 'error' => [ - ['name' => 'code', 'desc' => '业务代码', 'type' => 'int', 'require' => 1, 'md' => '/docs/HttpError.md'], - ['name' => 'message', 'desc' => '业务信息', 'type' => 'string', 'require' => 1], - ] - ], - //(选配)默认作者 - 'default_author' => '', - //(选配)默认请求类型 - 'default_method' => 'GET', - //(选配)Apidoc允许跨域访问 - 'allowCrossDomain' => false, - /** - * (选配)解析时忽略带@注解的关键词,当注解中存在带@字符并且非Apidoc注解,如 @key test,此时Apidoc页面报类似以下错误时: - * [Semantical Error] The annotation "@key" in method xxx() was never imported. Did you maybe forget to add a "use" statement for this annotation? - */ - 'ignored_annitation' => [], - - // (选配)数据库配置 - 'database' => [], - // (选配)Markdown文档 - 'docs' => [], - // (选配)接口生成器配置 注意:是一个二维数组 - 'generator' => [] - ] -]; diff --git a/config/plugin/hg/apidoc/route.php b/config/plugin/hg/apidoc/route.php deleted file mode 100644 index 1b03a1f35..000000000 --- a/config/plugin/hg/apidoc/route.php +++ /dev/null @@ -1,3 +0,0 @@ - array($vendorDir . '/topthink/think-container/src', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src'), 'taoser\\' => array($vendorDir . '/taoser/webman-validate/src'), 'support\\' => array($vendorDir . '/workerman/webman-framework/src/support'), - 'hg\\apidoc\\' => array($vendorDir . '/hg/apidoc/src'), 'app\\View\\Components\\' => array($baseDir . '/app/view/components'), 'app\\' => array($baseDir . '/app'), 'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b4a008779..e2aa1e0ff 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -57,10 +57,6 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 'support\\' => 8, ), - 'h' => - array ( - 'hg\\apidoc\\' => 10, - ), 'a' => array ( 'app\\View\\Components\\' => 20, @@ -247,10 +243,6 @@ class ComposerStaticInitcefecbcff919f3c1c8084830bbb72adc array ( 0 => __DIR__ . '/..' . '/workerman/webman-framework/src/support', ), - 'hg\\apidoc\\' => - array ( - 0 => __DIR__ . '/..' . '/hg/apidoc/src', - ), 'app\\View\\Components\\' => array ( 0 => __DIR__ . '/../..' . '/app/view/components', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7c04a8972..fc3ca9341 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1282,78 +1282,6 @@ ], "install-path": "../guzzlehttp/uri-template" }, - { - "name": "hg/apidoc", - "version": "v5.2.3", - "version_normalized": "5.2.3.0", - "source": { - "type": "git", - "url": "https://github.com/HGthecode/apidoc-php.git", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/HGthecode/apidoc-php/zipball/328aa4fe177ed7393f680724bf3eeb485052c2fe", - "reference": "328aa4fe177ed7393f680724bf3eeb485052c2fe", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1 || ^2", - "php": "^7.1 || ^8.0" - }, - "time": "2024-03-22T02:25:31+00:00", - "type": "library", - "extra": { - "laravel": { - "providers": [ - "hg\\apidoc\\providers\\LaravelService" - ] - }, - "think": { - "services": [ - "hg\\apidoc\\providers\\ThinkPHPService" - ], - "config": { - "apidoc": "src/config.php" - } - }, - "hyperf": { - "config": "hg\\apidoc\\ConfigProvider" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "hg\\apidoc\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "hg-code", - "email": "376401263@qq.com" - } - ], - "description": "根据注解生成API文档,兼容Laravel、ThinkPHP、Hyperf、Webman等框架;在线调试、Markdown文档、多应用/多版本、Mock数据、授权访问、接口生成器、代码生成器等众多实用功能", - "keywords": [ - "apidoc", - "api文档", - "markdown", - "php接口文档", - "接口文档", - "注解", - "注释生成", - "自动生成api" - ], - "support": { - "issues": "https://github.com/HGthecode/apidoc-php/issues", - "source": "https://github.com/HGthecode/apidoc-php/tree/v5.2.3" - }, - "install-path": "../hg/apidoc" - }, { "name": "hyperf/context", "version": "v3.1.15", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 43e1d6ee2..83a57723f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => 'workerman/webman', - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '4b5122f1ac239cde50650106617717ac4ed3db2b', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -154,15 +154,6 @@ 'aliases' => array(), 'dev_requirement' => false, ), - 'hg/apidoc' => array( - 'pretty_version' => 'v5.2.3', - 'version' => '5.2.3.0', - 'reference' => '328aa4fe177ed7393f680724bf3eeb485052c2fe', - 'type' => 'library', - 'install_path' => __DIR__ . '/../hg/apidoc', - 'aliases' => array(), - 'dev_requirement' => false, - ), 'hyperf/context' => array( 'pretty_version' => 'v3.1.15', 'version' => '3.1.15.0', @@ -1038,9 +1029,9 @@ 'dev_requirement' => false, ), 'workerman/webman' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => '4b5122f1ac239cde50650106617717ac4ed3db2b', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/hg/apidoc/.gitignore b/vendor/hg/apidoc/.gitignore deleted file mode 100644 index 485dee64b..000000000 --- a/vendor/hg/apidoc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea diff --git a/vendor/hg/apidoc/LICENSE b/vendor/hg/apidoc/LICENSE deleted file mode 100644 index 367a697be..000000000 --- a/vendor/hg/apidoc/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 HG - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/vendor/hg/apidoc/README.md b/vendor/hg/apidoc/README.md deleted file mode 100644 index 0f8ace596..000000000 --- a/vendor/hg/apidoc/README.md +++ /dev/null @@ -1,88 +0,0 @@ -