From cb490e56ee7bccbc3b56d6964e9b68e5aa8ec475 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 17:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 201 insertions(+), 6 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 8039b75..ce599a6 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,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
@@ -9,11 +10,22 @@
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.account.service.UserSignRecordService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.dto.DangerInfoDto;
+import com.ruoyi.account.service.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.StoreClient;
+import com.ruoyi.other.api.feignClient.VipSettingClient;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -56,6 +68,12 @@
@Resource
private UserSignRecordService userSignRecordService;
+ @Resource
+ private VipSettingClient vipSettingClient;
+ @Resource
+ private UserPointService userPointService;
+ @Resource
+ private VipSettingService vipSettingService;
@ResponseBody
@@ -170,12 +188,7 @@
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
- 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);
}
@@ -296,6 +309,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);
@@ -331,8 +351,183 @@
AppUser superiorLeader = appUserService.getSuperiorLeader(id);
return R.ok(superiorLeader);
}
+
+
+
+ @ResponseBody
+ @PostMapping("/onlineRecord")
+ @ApiOperation(value = "10分钟定时任务调用，记录用户在线时长", tags = {"小程序-个人中心首页"})
+ public R onlineRecord(){
+ appUserService.onlineRecord();
+ return R.ok();
+ }
+
+
+
+
+
+ /**
+ * 根据用户名称模糊搜索用户列表
+ * @param name
+ * @return
+ */
+ @PostMapping("/getAppUserByName")
+ public R<List<AppUser>> getAppUserByName(@RequestParam("name") String name){
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getName, name));
+ return R.ok(list);
+ }
+
+ /**
+ * 根据用户电话模糊搜索用户列表
+ * @param phone
+ * @return
+ */
+ @PostMapping("/getAppUserByPhone")
+ public R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone){
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getPhone, phone));
+ return R.ok(list);
+ }
+
+ /**
+ * 获取用户列表
+ */
+ @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);
+ }
+
+ @GetMapping("/danger/info")
+ @ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"})
+ public R<DangerInfoDto> dangerinfo(Long id)
+ {
+ AppUser byId = appUserService.getById(id);
+ LocalDate now = LocalDate.now();
+ R<VipSetting> vipSetting = vipSettingClient.getVipSetting(byId.getVipId());
+ VipSetting data = vipSetting.getData();
+ DangerInfoDto dangerInfoDto = new DangerInfoDto();
+ BeanUtils.copyProperties(data,dangerInfoDto);
+ List<UserPoint> list1 = userPointService.lambdaQuery().eq(UserPoint::getType,1).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getType,2).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getType,5).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ Integer userKeepBuyPoint = 0;
+ for (UserPoint userPoint : list1) {
+ userKeepBuyPoint = userPoint.getVariablePoint()+userKeepBuyPoint;
+ }
+ Integer userKeepSharePoint = 0;
+ for (UserPoint userPoint : list2) {
+ userKeepSharePoint = userPoint.getVariablePoint()+userKeepSharePoint;
+ }
+ Integer userKeepShopPoint = 0;
+ for (UserPoint userPoint : list3) {
+ userKeepShopPoint = userPoint.getVariablePoint()+userKeepShopPoint;
+ }
+ dangerInfoDto.setUserKeepBuyPoint(userKeepBuyPoint);
+ dangerInfoDto.setUserKeepSharePoint(userKeepSharePoint);
+ dangerInfoDto.setUserKeepShopPoint(userKeepShopPoint);
+ return R.ok(dangerInfoDto);
+ }
+ @GetMapping("/danger/down")
+ @ApiOperation(value = "用户列表-保级条件降级", tags = {"管理后台"})
+ public R down(Long id)
+ {
+ AppUser byId = appUserService.getById(id);
+ byId.setVipId(byId.getVipId()-1);
+ appUserService.updateById(byId);
+ //执行降级标记代码
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ {
+ vipSettingService.downUsers();
+ }
+ }
+ }
+ ).start();
+ return R.ok();
+ }
+ @GetMapping("/frozen")
+ @ApiOperation(value = "用户列表-冻结解冻", tags = {"管理后台"})
+ public R frozen(Long id,@ApiParam("1=正常，2=冻结")Integer status)
+ {
+ AppUser byId = appUserService.getById(id);
+ byId.setStatus(status);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+ @Resource
+ private ShopClient shopClient;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
+
+ @GetMapping("/detail")
+ @ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
+ public R<AppUser> detail(Long id)
+ {
+ AppUser byId = appUserService.getById(id);
+ if (byId.getShopId()!=null) {
+ R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
+ if (shopById.getData()!=null) {
+ byId.setShopName(shopById.getData().getName());
+ }
+ }
+ R<List<Shop>> shopByUserId = shopClient.getShopByUserId(id);
+ if (shopByUserId.getData()!=null) {
+ List<String> shopName = new ArrayList<>();
+ for (Shop datum : shopByUserId.getData()) {
+ shopName.add(datum.getName());
+ }
+ byId.setShopNames(shopName);
+ }
+ //推广人
+ if (byId.getInviteUserId()!=null) {
+ AppUser byId1 = appUserService.getById(byId.getInviteUserId());
+ byId1.setInviteUserName(byId1.getInviteUserName());
+ }
+ //最后下单时间
+ R<Order> lastOrder = remoteOrderGoodsClient.getLastOrder(id);
+ if (lastOrder.getData()!=null){
+ byId.setLastOrderTime(lastOrder.getData().getCreateTime());
+ }
+ return R.ok(byId);
+ }
+ @GetMapping("/bottom")
+ @ApiOperation(value = "用户列表-绑定下级列表", tags = {"管理后台"})
+ public R<Page<AppUser>> bottom(Long id,Integer pageNum,Integer pageSize)
+ {
+ //绑定下级
+ Page<AppUser> page = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+
+ }
+
+
+
+
+
+
+
+ @GetMapping("/listByIds")
+ List<AppUser> listByIds(List<String> list){
+ return appUserService.listByIds(list);
+ }
+
+
+
+ @PostMapping("/getAppUserByPhone1")
+ public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone){
+ AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .eq(AppUser::getPhone, phone));
+ return R.ok(appUser);
+ }
}
--
Gitblit v1.7.1