From 5057f69b0e7a31ea3f490a8d1416b8aae95c5b92 Mon Sep 17 00:00:00 2001 From: pengsz Date: Tue, 9 Dec 2025 15:05:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9A=20jar=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fightwine-admin/pom.xml | 6 +- .../yzt/admin/controller/UserController.java | 102 +++++++++--------- fightwine-common/pom.xml | 4 +- .../yzt/common/request/RegisterRequest.java | 1 + fightwine-front/pom.xml | 6 +- fightwine-service/pom.xml | 4 +- 6 files changed, 62 insertions(+), 61 deletions(-) diff --git a/fightwine-admin/pom.xml b/fightwine-admin/pom.xml index 96e3e79..06ddbca 100644 --- a/fightwine-admin/pom.xml +++ b/fightwine-admin/pom.xml @@ -9,7 +9,7 @@ 1.0-SNAPSHOT - fightwine-admin + zp-fightwine-admin jar @@ -21,7 +21,7 @@ com.yzt.fightwine - fightwine-service + zp-fightwine-service 1.0-SNAPSHOT @@ -57,7 +57,7 @@ - fightwine-admin + zp-fightwine-admin org.springframework.boot diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java index 35d39b0..c47b3d9 100644 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java +++ b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java @@ -57,21 +57,21 @@ public class UserController { return CommonResult.success(userCommonPage); } - @ApiOperation(value = "指定用户（uid）的被推广人列表") - @RequestMapping(value = "/promoted", method = RequestMethod.GET) - public CommonResult> getPromotedUserList(@ModelAttribute @Validated UserSearchRequest request, - @ModelAttribute PageParamRequest pageParamRequest) { - CommonPage userCommonPage = CommonPage.restPage(userService.getPromotedUserList(request, pageParamRequest)); - return CommonResult.success(userCommonPage); - } - - @ApiOperation(value = "获取指定用户的奖励记录列表") - @RequestMapping(value = "/brokerage/{uid}", method = RequestMethod.GET) - public CommonResult> getUserBrokerageRecords(@PathVariable Integer uid,String customerName, String phone, - @ModelAttribute PageParamRequest pageParamRequest) { - CommonPage userCommonPage = CommonPage.restPage(userBrokerageRecordService.getUserBrokerageRecords(uid, customerName,phone,pageParamRequest)); - return CommonResult.success(userCommonPage); - } +// @ApiOperation(value = "指定用户（uid）的被推广人列表") +// @RequestMapping(value = "/promoted", method = RequestMethod.GET) +// public CommonResult> getPromotedUserList(@ModelAttribute @Validated UserSearchRequest request, +// @ModelAttribute PageParamRequest pageParamRequest) { +// CommonPage userCommonPage = CommonPage.restPage(userService.getPromotedUserList(request, pageParamRequest)); +// return CommonResult.success(userCommonPage); +// } +// +// @ApiOperation(value = "获取指定用户的奖励记录列表") +// @RequestMapping(value = "/brokerage/{uid}", method = RequestMethod.GET) +// public CommonResult> getUserBrokerageRecords(@PathVariable Integer uid,String customerName, String phone, +// @ModelAttribute PageParamRequest pageParamRequest) { +// CommonPage userCommonPage = CommonPage.restPage(userBrokerageRecordService.getUserBrokerageRecords(uid, customerName,phone,pageParamRequest)); +// return CommonResult.success(userCommonPage); +// } /** * 创建用户表 * @param userRequest 创建参数 @@ -167,18 +167,18 @@ public class UserController { return CommonResult.success(userService.getTopDetail(userId)); } - /** - * 操作积分 - */ - @PreAuthorize("hasAuthority('admin:user:operate:founds')") - @ApiOperation(value = "积分余额") - @RequestMapping(value = "/operate/founds", method = RequestMethod.GET) - public CommonResult founds(@Validated UserOperateIntegralMoneyRequest request) { - if (userService.updateIntegralMoney(request)) { - return CommonResult.success(); - } - return CommonResult.failed(); - } +// /** +// * 操作积分 +// */ +// @PreAuthorize("hasAuthority('admin:user:operate:founds')") +// @ApiOperation(value = "积分余额") +// @RequestMapping(value = "/operate/founds", method = RequestMethod.GET) +// public CommonResult founds(@Validated UserOperateIntegralMoneyRequest request) { +// if (userService.updateIntegralMoney(request)) { +// return CommonResult.success(); +// } +// return CommonResult.failed(); +// } /** * 会员分组 @@ -210,31 +210,31 @@ public class UserController { return CommonResult.failed(); } - /** - * 修改上级推广人 - */ - @PreAuthorize("hasAuthority('admin:user:update:spread')") - @ApiOperation(value = "修改上级推广人") - @RequestMapping(value = "/update/spread", method = RequestMethod.POST) - public CommonResult editSpread(@Validated @RequestBody UserUpdateSpreadRequest request) { - if (userService.editSpread(request)) { - return CommonResult.success("修改成功"); - } - return CommonResult.failed("修改失败"); - } +// /** +// * 修改上级推广人 +// */ +// @PreAuthorize("hasAuthority('admin:user:update:spread')") +// @ApiOperation(value = "修改上级推广人") +// @RequestMapping(value = "/update/spread", method = RequestMethod.POST) +// public CommonResult editSpread(@Validated @RequestBody UserUpdateSpreadRequest request) { +// if (userService.editSpread(request)) { +// return CommonResult.success("修改成功"); +// } +// return CommonResult.failed("修改失败"); +// } - /** - * 更新用户会员等级 - */ - @PreAuthorize("hasAuthority('admin:user:update:level')") - @ApiOperation(value = "更新用户会员等级") - @RequestMapping(value = "/update/level", method = RequestMethod.POST) - public CommonResult updateUserLevel(@Validated @RequestBody UpdateUserLevelRequest request) { - if (userService.updateUserLevel(request)) { - return CommonResult.success("更新成功"); - } - return CommonResult.failed("更新失败"); - } +// /** +// * 更新用户会员等级 +// */ +// @PreAuthorize("hasAuthority('admin:user:update:level')") +// @ApiOperation(value = "更新用户会员等级") +// @RequestMapping(value = "/update/level", method = RequestMethod.POST) +// public CommonResult updateUserLevel(@Validated @RequestBody UpdateUserLevelRequest request) { +// if (userService.updateUserLevel(request)) { +// return CommonResult.success("更新成功"); +// } +// return CommonResult.failed("更新失败"); +// } /** * 后台管理用户搜索：通过手机号或企业名称模糊查询 diff --git a/fightwine-common/pom.xml b/fightwine-common/pom.xml index 90b7181..8957bb9 100644 --- a/fightwine-common/pom.xml +++ b/fightwine-common/pom.xml @@ -9,8 +9,8 @@ 1.0-SNAPSHOT - fightwine-common - fightwine-common + zp-fightwine-common + zp-fightwine-common 21 diff --git a/fightwine-common/src/main/java/com/yzt/common/request/RegisterRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/RegisterRequest.java index f2b2cf2..f0cd657 100644 --- a/fightwine-common/src/main/java/com/yzt/common/request/RegisterRequest.java +++ b/fightwine-common/src/main/java/com/yzt/common/request/RegisterRequest.java @@ -21,6 +21,7 @@ public class RegisterRequest { private String name; @ApiModelProperty("用户公司名称") + @NotBlank(message = "企业不能为空") private String companyName; @NotBlank(message = "登录密码不能为空") diff --git a/fightwine-front/pom.xml b/fightwine-front/pom.xml index ffa10c2..cf91b8c 100644 --- a/fightwine-front/pom.xml +++ b/fightwine-front/pom.xml @@ -9,7 +9,7 @@ 1.0-SNAPSHOT - fightwine-front + zp-fightwine-front jar @@ -21,7 +21,7 @@ com.yzt.fightwine - fightwine-service + zp-fightwine-service 1.0-SNAPSHOT @@ -33,7 +33,7 @@ - fightwine-front + zp-fightwine-front org.springframework.boot diff --git a/fightwine-service/pom.xml b/fightwine-service/pom.xml index 57ee344..f4a377d 100644 --- a/fightwine-service/pom.xml +++ b/fightwine-service/pom.xml @@ -9,7 +9,7 @@ 1.0-SNAPSHOT - fightwine-service + zp-fightwine-service 21 @@ -20,7 +20,7 @@ com.yzt.fightwine - fightwine-common + zp-fightwine-common 1.0-SNAPSHOT