ZP/zp-fightwine
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor： jar名称

Browse Source
This commit is contained in:
pengsz 2025-12-09 15:05:15 +08:00
parent b399e7f0b4
commit 5057f69b0e
6 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fightwine-admin/pom.xml
View File

@ -9,7 +9,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>fightwine-admin</artifactId>
<artifactId>zp-fightwine-admin</artifactId>
<packaging>jar</packaging>
<properties>
@ -21,7 +21,7 @@
<dependencies>
<dependency>
<groupId>com.yzt.fightwine</groupId>
<artifactId>fightwine-service</artifactId>
<artifactId>zp-fightwine-service</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@ -57,7 +57,7 @@
<build>
<!--打包配置-->
<finalName>fightwine-admin</finalName>
<finalName>zp-fightwine-admin</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

102
fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java
View File

@ -57,21 +57,21 @@ public class UserController {
return CommonResult.success(userCommonPage);
}
@ApiOperation(value = "指定用户（uid）的被推广人列表")
@RequestMapping(value = "/promoted", method = RequestMethod.GET)
public CommonResult<CommonPage<UserResponse>> getPromotedUserList(@ModelAttribute @Validated UserSearchRequest request,
@ModelAttribute PageParamRequest pageParamRequest) {
CommonPage<UserResponse> userCommonPage = CommonPage.restPage(userService.getPromotedUserList(request, pageParamRequest));
return CommonResult.success(userCommonPage);
}
@ApiOperation(value = "获取指定用户的奖励记录列表")
@RequestMapping(value = "/brokerage/{uid}", method = RequestMethod.GET)
public CommonResult<CommonPage<UserBrokerageRecordResponse>> getUserBrokerageRecords(@PathVariable Integer uid,String customerName, String phone,
@ModelAttribute PageParamRequest pageParamRequest) {
CommonPage<UserBrokerageRecordResponse> userCommonPage = CommonPage.restPage(userBrokerageRecordService.getUserBrokerageRecords(uid, customerName,phone,pageParamRequest));
return CommonResult.success(userCommonPage);
}
// @ApiOperation(value = "指定用户（uid）的被推广人列表")
// @RequestMapping(value = "/promoted", method = RequestMethod.GET)
// public CommonResult<CommonPage<UserResponse>> getPromotedUserList(@ModelAttribute @Validated UserSearchRequest request,
// @ModelAttribute PageParamRequest pageParamRequest) {
// CommonPage<UserResponse> userCommonPage = CommonPage.restPage(userService.getPromotedUserList(request, pageParamRequest));
// return CommonResult.success(userCommonPage);
// }
//
// @ApiOperation(value = "获取指定用户的奖励记录列表")
// @RequestMapping(value = "/brokerage/{uid}", method = RequestMethod.GET)
// public CommonResult<CommonPage<UserBrokerageRecordResponse>> getUserBrokerageRecords(@PathVariable Integer uid,String customerName, String phone,
// @ModelAttribute PageParamRequest pageParamRequest) {
// CommonPage<UserBrokerageRecordResponse> 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<Object> 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<Object> 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<String> 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<String> 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<Object> 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<Object> updateUserLevel(@Validated @RequestBody UpdateUserLevelRequest request) {
// if (userService.updateUserLevel(request)) {
// return CommonResult.success("更新成功");
// }
// return CommonResult.failed("更新失败");
// }
/**
* 后台管理用户搜索：通过手机号或企业名称模糊查询

4
fightwine-common/pom.xml
View File

@ -9,8 +9,8 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>fightwine-common</artifactId>
<name>fightwine-common</name>
<artifactId>zp-fightwine-common</artifactId>
<name>zp-fightwine-common</name>
<properties>
<maven.compiler.source>21</maven.compiler.source>

1
fightwine-common/src/main/java/com/yzt/common/request/RegisterRequest.java
View File

@ -21,6 +21,7 @@ public class RegisterRequest {
private String name;
@ApiModelProperty("用户公司名称")
@NotBlank(message = "企业不能为空")
private String companyName;
@NotBlank(message = "登录密码不能为空")

6
fightwine-front/pom.xml
View File

@ -9,7 +9,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>fightwine-front</artifactId>
<artifactId>zp-fightwine-front</artifactId>
<packaging>jar</packaging>
<properties>
@ -21,7 +21,7 @@
<dependencies>
<dependency>
<groupId>com.yzt.fightwine</groupId>
<artifactId>fightwine-service</artifactId>
<artifactId>zp-fightwine-service</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!--代码自动生成工具-->
@ -33,7 +33,7 @@
<build>
<!--打包配置-->
<finalName>fightwine-front</finalName>
<finalName>zp-fightwine-front</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

4
fightwine-service/pom.xml
View File

@ -9,7 +9,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>fightwine-service</artifactId>
<artifactId>zp-fightwine-service</artifactId>
<properties>
<maven.compiler.source>21</maven.compiler.source>
@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>com.yzt.fightwine</groupId>
<artifactId>fightwine-common</artifactId>
<artifactId>zp-fightwine-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>