java/PlayPai.git

			@@ -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;

			/**
			@@ -179,7 +202,6 @@
			return appUser;
			}

			// todo 短信验证码
			@ResponseBody
			@PostMapping("/base/appUser/getSMSCode")
			@ApiOperation(value = "获取短信验证码", tags = {"APP-登录注册"})
			@@ -268,8 +290,7 @@
			@ResponseBody
			@PostMapping("/base/appUser/loginSMSCode")
			@ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"})
			@ApiImplicitParams({
			})

			public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) {
			try {
			return appUserService.loginSMSCode(loginSMSCodeVo);
			@@ -505,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;
			@@ -519,15 +550,18 @@
			@PostMapping("/base/appUser/updateAppUser")
			public void updateAppUser(@RequestBody TAppUser appUser) {
			try {
			TAppUser appUser1 = appUserService.getById(appUser.getId());
			appUserService.updateById(appUser);
			UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
			userIntegralChanges.setAppUserId(appUser.getId());
			userIntegralChanges.setOldIntegral(appUser.getIntegral() + appUser.getPoints());
			userIntegralChanges.setType(5);
			userIntegralChanges.setNewIntegral(appUser.getIntegral());
			userIntegralChanges.setInsertTime(new Date());
			userIntegralChanges.setCategory(2);
			userIntegralChangesService.save(userIntegralChanges);
			if(appUser.getIntegral().compareTo(appUser1.getIntegral()) != 0){
			UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
			userIntegralChanges.setAppUserId(appUser.getId());
			userIntegralChanges.setOldIntegral(appUser1.getIntegral());
			userIntegralChanges.setType(5);
			userIntegralChanges.setNewIntegral(appUser.getIntegral());
			userIntegralChanges.setInsertTime(new Date());
			userIntegralChanges.setCategory(2);
			userIntegralChangesService.save(userIntegralChanges);
			}

			} catch (Exception e) {
			e.printStackTrace();
			@@ -622,4 +656,23 @@
			List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
			return list.stream().map(TAppUser::getId).collect(Collectors.toList());
			}


			/**
			* 根据省市名称所有用户
			* @param appUserIdsByCityName
			* @return
			*/
			@PostMapping("/appUser/getAppUserIdsByCityName")
			public List<Integer> getAppUserIdsByCityName(@RequestBody AppUserIdsByCityName appUserIdsByCityName){
			QueryWrapper<TAppUser> queryWrapper = new QueryWrapper<TAppUser>().eq("state", 1);
			if(ToolUtil.isNotEmpty(appUserIdsByCityName.getProvince())){
			queryWrapper.like("province", appUserIdsByCityName.getProvince());
			}
			if(ToolUtil.isNotEmpty(appUserIdsByCityName.getCity())){
			queryWrapper.like("city", appUserIdsByCityName.getCity());
			}
			List<TAppUser> list = appUserService.list(queryWrapper);
			return list.stream().map(TAppUser::getId).collect(Collectors.toList());
			}
			}