From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index e3c1045..cc81f9f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,32 +1,33 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
+import com.ruoyi.account.api.model.UserSignRecord;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
+import com.ruoyi.account.service.UserSignRecordService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.StoreClient;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.util.List;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;
/**
@@ -53,6 +54,9 @@
@Resource
private UserCouponService userCouponService;
+ @Resource
+ private UserSignRecordService userSignRecordService;
+
@ResponseBody
@PostMapping("/mobileLogin")
@@ -60,10 +64,6 @@
public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
return appUserService.mobileLogin(mobileLogin);
}
-
-
-
-
@ResponseBody
@@ -153,6 +153,9 @@
public R<AppUser> info(){
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
+
+
+
return R.ok(user);
}
@Resource
@@ -178,7 +181,7 @@
@ResponseBody
- @PostMapping("/recommend")
+ @GetMapping("/recommend")
@ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
public R<AppUser> recommend(){
Long userId = tokenService.getLoginUserApplet().getUserid();
@@ -221,6 +224,22 @@
return R.ok(user);
}
+ @ResponseBody
+ @GetMapping("/change")
+ @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
+ public R<AppUser> change(@ApiParam("换绑用户手机号") String phone){
+ Long userId1 = tokenService.getLoginUserApplet().getUserid();
+ AppUser byId = appUserService.getById(userId1);
+ //获取绑定门店
+ AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one();
+ if (user==null){
+ return R.fail("当前手机号未注册");
+ }
+ byId.setInviteUserId(user.getId());
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
@GetMapping("/index")
@@ -256,6 +275,13 @@
user.setCount5(count5);
user.setCount6(count6);
user.setCount7(count7);
+
+ List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
+ if (!list.isEmpty()){
+ user.setIsSign(1);
+ }else {
+ user.setIsSign(0);
+ }
return R.ok(user);
@@ -281,6 +307,40 @@
return R.ok(list);
}
+ /**
+ * 获取用户的直帮上级用户
+ */
+ @ResponseBody
+ @PostMapping("/getSuperiorLeader")
+ @ApiOperation(value = "获取用户的直帮上级用户")
+ public R<AppUser> getSuperiorLeader(@RequestParam("id") Long id) {
+ AppUser superiorLeader = appUserService.getSuperiorLeader(id);
+ return R.ok(superiorLeader);
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/onlineRecord")
+ @ApiOperation(value = "10分钟定时任务调用，记录用户在线时长", tags = {"小程序-个人中心首页"})
+ public R onlineRecord(){
+ appUserService.onlineRecord();
+ return R.ok();
+ }
+
+ /**
+ * 获取用户列表
+ */
+ @GetMapping("/getAppuserPage")
+ @ApiOperation(value = "用户列表", tags = {"后台管理"})
+ public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ AppUser appUser)
+ {
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
+ return R.ok(appuserPage);
+ }
+
}
--
Gitblit v1.7.1