From deb91eb570baecdae92aeeb105661209f59e06e2 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 01 四月 2025 14:23:46 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 51 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 9 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java index c4a454e..ab51ce9 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java +++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java @@ -1,17 +1,33 @@ package com.dsh.account.controller; -import com.alibaba.nacos.common.utils.Md5Utils; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.account.dto.BindDto; import com.dsh.account.dto.IntroduceUserQuery; import com.dsh.account.dto.SelectDto; import com.dsh.account.dto.UpdateInfoDto; -import com.dsh.account.entity.*; -import com.dsh.account.model.*; +import com.dsh.account.entity.IntroduceUser; +import com.dsh.account.entity.TAppGift; +import com.dsh.account.entity.TAppUser; +import com.dsh.account.entity.TCourseInfoRecord; +import com.dsh.account.entity.TStudent; +import com.dsh.account.entity.UserIntegralChanges; +import com.dsh.account.model.AddAppUserVo; +import com.dsh.account.model.AdvertisementChangeStateDTO; +import com.dsh.account.model.AppUserByNameAndPhoneDTO; +import com.dsh.account.model.AppUserIdsByCityName; +import com.dsh.account.model.JoinPlayPaiVo; +import com.dsh.account.model.LoginSMSCodeVo; +import com.dsh.account.model.LoginWeChatVo; +import com.dsh.account.model.QueryByNamePhone; import com.dsh.account.model.query.appUserQuery.QueryAppUser; import com.dsh.account.model.vo.QueryAppUserVO; -import com.dsh.account.service.*; +import com.dsh.account.service.IVipPaymentService; +import com.dsh.account.service.TAppGiftService; +import com.dsh.account.service.TAppUserService; +import com.dsh.account.service.TCourseInfoRecordService; +import com.dsh.account.service.TStudentService; +import com.dsh.account.service.UserIntegralChangesService; import com.dsh.account.util.PayMoneyUtil; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.TokenUtil; @@ -19,15 +35,22 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +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.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -503,7 +526,17 @@ return null; } } - + /** + * 根据用户id获取用户信息 + * + * @param appUserIdList + * @return + */ + @ResponseBody + @PostMapping("/base/appUser/queryAppUserBatch") + List<TAppUser> queryAppUserBatch(@RequestBody List<Integer> appUserIdList){ + return appUserService.listByIds(appUserIdList); + } @Autowired private UserIntegralChangesService userIntegralChangesService; -- Gitblit v1.7.1