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