From 28b988ca5dc4b51de34c6ebf996579723b2db414 Mon Sep 17 00:00:00 2001
From: lisy <java@lishouyideAir.lan>
Date: 星期五, 16 六月 2023 09:13:09 +0800
Subject: [PATCH] other模块——门店实体的添加；account模块——查询附近门店接口
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 341 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 322 insertions(+), 19 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 1bc34c5..2d198db 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -3,27 +3,35 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsh.account.feignclient.course.CoursePaymentClient;
-import com.dsh.account.feignclient.course.model.StuCourseResp;
-import com.dsh.account.feignclient.course.model.TCoursePackagePayment;
-import com.dsh.account.mapper.TStudentMapper;
-import com.dsh.account.feignclient.other.ImgConfigClient;
-import com.dsh.account.feignclient.other.model.TImgConfig;
-import com.dsh.account.model.vo.classDetails.RegisteredCourse;
-import com.dsh.account.service.TAppUserService;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TStudent;
+import com.dsh.account.enums.WeeksEnum;
+import com.dsh.account.feignclient.course.CoursePaymentClient;
+import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
+import com.dsh.account.feignclient.course.model.StuCourseResp;
+import com.dsh.account.feignclient.other.ImgConfigClient;
+import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.TAppUserMapper;
+import com.dsh.account.mapper.TStudentMapper;
+import com.dsh.account.model.AddAppUserVo;
+import com.dsh.account.model.LoginSMSCodeVo;
+import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.vo.classDetails.CourseVenue;
+import com.dsh.account.model.vo.classDetails.RegisteredCourse;
+import com.dsh.account.model.vo.classDetails.WeekedCourse;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
-
-import com.dsh.account.util.DateUtil;
-import com.dsh.account.util.ToolUtil;
+import com.dsh.account.service.TAppUserService;
+import com.dsh.account.util.*;
+import com.dsh.account.util.akeylogin.Md5Util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -35,18 +43,34 @@
*/
@Service
public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
-
- @Autowired
+
+ @Resource
private TStudentMapper tsmapper;
@Resource
private ImgConfigClient configClient;
+ @Autowired
+ private ALiSendSms aLiSendSms;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Autowired
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
+
+ @Autowired
+ private JwtTokenUtil jwtTokenUtil;
+
@Resource
private CoursePaymentClient paymentClient;
+
+
+
+
@Override
- public ClassInfoVo queryUserOfStus(Integer id) {
+ public ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude) {
TAppUser tAppUser = this.baseMapper.selectById(id);
if (ToolUtil.isNotEmpty(tAppUser)){
List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
@@ -78,16 +102,38 @@
RegisteredCourse course = new RegisteredCourse();
course.setCourseId(tCoursePackagePayment.getCourseId());
course.setCourseName(tCoursePackagePayment.getCourseName());
- total = total + tCoursePackagePayment.getTotalCourseNums();
- deduct = deduct + tCoursePackagePayment.getDeductionNums();
- remain = remain + tCoursePackagePayment.getResidueNums();
+ total = total + (ToolUtil.isEmpty(tCoursePackagePayment.getTotalCourseNums()) ? 0 : tCoursePackagePayment.getTotalCourseNums());
+ deduct = deduct + (ToolUtil.isEmpty(tCoursePackagePayment.getDeductionNums()) ? 0 : tCoursePackagePayment.getDeductionNums());
+ remain = remain + (ToolUtil.isEmpty(tCoursePackagePayment.getResidueNums())? 0 : tCoursePackagePayment.getResidueNums());
courseList.add(course);
}
}
classInfoVo.setCourseList(courseList);
+
classInfoVo.setTotalNums(total);
classInfoVo.setDeductedNums(deduct);
classInfoVo.setRemainingNums(remain);
+
+ List<CourseOfStoreVo> storeOfCourses = paymentClient.getStoreOfCourses();
+
+ List<WeekedCourse> courses = new ArrayList<>();
+
+
+
+
+ if (storeOfCourses.size() > 0){
+ Map<Integer, List<CourseOfStoreVo>> map = storeOfCourses.stream().collect(Collectors.groupingBy(CourseOfStoreVo::getStoreId));
+ for (Map.Entry<Integer, List<CourseOfStoreVo>> integerListEntry : map.entrySet()) {
+ WeekedCourse weekedCourse = new WeekedCourse();
+
+ Integer key = integerListEntry.getKey();
+ System.out.println(key);
+ List<CourseOfStoreVo> value = integerListEntry.getValue();
+ System.out.println(value);
+ }
+
+ }
+// classInfoVo.setWeekCourseList();
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -99,8 +145,265 @@
return null;
}
+ /**
+ * 处理数据
+ * @param storeOfCourses
+ * @return
+ */
+ public List<WeekedCourse> dealDatas(List<CourseOfStoreVo> storeOfCourses){
+ List<WeekedCourse> weekedCourses = new ArrayList<>();
+
+ int weekStr = LocalDateTimeUtils.getWeekStr();
+ for (int i = 1; i < 8; i++) {
+ if (weekStr == i){
+ for (CourseOfStoreVo storeOfCours : storeOfCourses) {
+ String[] split = storeOfCours.getClassWeeks().split(";");
+ List<String> list = Arrays.asList(split);
+ if (list.contains(weekStr)){
+ WeekedCourse weekedCourse = new WeekedCourse();
+ weekedCourse.setIsToday(1);
+ weekedCourse.setWeekNum(weekStr);
+ weekedCourse.setWeekStr(WeeksEnum.getStr(weekStr));
+ String weekOfDays = LocalDateTimeUtils.getWeekOfDays(weekStr);
+ weekedCourse.setDayStr(weekOfDays);
+
+ List<CourseVenue> courseVenues = new ArrayList<>();
+// courseVenues.add();
+ weekedCourse.setDetails(courseVenues);
+ }
+ }
+ }else {
+ for (CourseOfStoreVo storeOfCours : storeOfCourses) {
+ String[] split = storeOfCours.getClassWeeks().split(";");
+ List<String> list = Arrays.asList(split);
+ if (list.contains(i)){
+ WeekedCourse weekedCourse = new WeekedCourse();
+ weekedCourse.setIsToday(1);
+ weekedCourse.setWeekNum(weekStr);
+ weekedCourse.setWeekStr(WeeksEnum.getStr(weekStr));
+ String weekOfDays = LocalDateTimeUtils.getWeekOfDays(weekStr);
+ weekedCourse.setDayStr(weekOfDays);
+
+ }
+ }
+ }
+ }
+ return weekedCourses;
+ }
+
+
+ /**
+ * 获取短信验证码
+ * @param type 1：登录，2：注册，3：修改密码，4：忘记密码
+ * @param phone
+ * @return
+ * @throws Exception
+ */
@Override
- public boolean save(TAppUser entity) {
- return super.save(entity);
+ public ResultUtil getSMSCode(Integer type, String phone) throws Exception {
+ if(type == 2){
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(null != tAppUser){
+ return ResultUtil.error("账号已存在");
+ }
+ }
+ String numberRandom = UUIDUtil.getNumberRandom(6);
+ aLiSendSms.sendSms(phone, "SMS_161275250", "{\"code\":\"" + numberRandom + "\"}");
+ redisUtil.setStrValue(phone, numberRandom, 300);
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 注册用户
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil addAppUser(AddAppUserVo addAppUserVo) throws Exception {
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", addAppUserVo.getPhone()).ne("state", 3));
+ if(null != tAppUser){
+ return ResultUtil.error("账号已存在");
+ }
+ String value = redisUtil.getValue(addAppUserVo.getPhone());
+ if(ToolUtil.isEmpty(value) || !value.equals(addAppUserVo.getCode())){
+ return ResultUtil.error("验证码无效");
+ }
+
+ tAppUser = new TAppUser();
+ tAppUser.setPhone(addAppUserVo.getPhone());
+ tAppUser.setPassword(Md5Util.MD5Encode(addAppUserVo.getPassword(), null));
+ tAppUser.setIsVip(0);
+ tAppUser.setState(1);
+ if(ToolUtil.isNotEmpty(addAppUserVo.getLatitude()) && ToolUtil.isNotEmpty(addAppUserVo.getLongitude())){
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(addAppUserVo.getLongitude(), addAppUserVo.getLatitude());
+ if(null != geocode){
+ String province = geocode.get("province");
+ String provinceCode = geocode.get("provinceCode");
+ String city = geocode.get("city");
+ String cityCode = geocode.get("cityCode");
+ tAppUser.setProvince(province);
+ tAppUser.setProvinceCode(provinceCode);
+ tAppUser.setCity(city);
+ tAppUser.setCityCode(cityCode);
+ }
+ }
+ this.baseMapper.insert(tAppUser);
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 账号密码登录
+ * @param phone
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil loginPassword(String phone, String password) throws Exception {
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(null == tAppUser){
+ return ResultUtil.error("请先注册", "");
+ }
+ if(tAppUser.getState() == 2){
+ return ResultUtil.error("您的账号已被冻结", "");
+ }
+ password = Md5Util.MD5Encode(password, null);
+ if(!tAppUser.getPassword().equals(password)){
+ return ResultUtil.error("账号密码错误", "");
+ }
+ String token = getToken(tAppUser);
+ return ResultUtil.success(token);
+ }
+
+
+ /**
+ * 验证码登录
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) throws Exception {
+ String value = redisUtil.getValue(loginSMSCodeVo.getPhone());
+ if(ToolUtil.isEmpty(value) || !value.equals(loginSMSCodeVo.getCode())){
+ return ResultUtil.error("验证码无效");
+ }
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginSMSCodeVo.getPhone()).ne("state", 3));
+ if(null == tAppUser){
+ tAppUser = new TAppUser();
+ tAppUser.setPhone(loginSMSCodeVo.getPhone());
+ tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
+ tAppUser.setIsVip(0);
+ tAppUser.setState(1);
+ if(ToolUtil.isNotEmpty(loginSMSCodeVo.getLatitude()) && ToolUtil.isNotEmpty(loginSMSCodeVo.getLongitude())){
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(loginSMSCodeVo.getLongitude(), loginSMSCodeVo.getLatitude());
+ if(null != geocode){
+ String province = geocode.get("province");
+ String provinceCode = geocode.get("provinceCode");
+ String city = geocode.get("city");
+ String cityCode = geocode.get("cityCode");
+ tAppUser.setProvince(province);
+ tAppUser.setProvinceCode(provinceCode);
+ tAppUser.setCity(city);
+ tAppUser.setCityCode(cityCode);
+ }
+ }
+ this.baseMapper.insert(tAppUser);
+ }
+ if(tAppUser.getState() == 2){
+ return ResultUtil.error("您的账号已被冻结", "");
+ }
+ String token = getToken(tAppUser);
+ return ResultUtil.success(token);
+ }
+
+
+ /**
+ * 微信登录
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil loginWechat(LoginWeChatVo loginWechatVo) throws Exception {
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("openid", loginWechatVo.getOpenId()).ne("state", 3));
+ if(null == tAppUser){
+ tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", loginWechatVo.getPhone()).ne("state", 3));
+ if(null == tAppUser){
+ tAppUser = new TAppUser();
+ tAppUser.setOpenid(loginWechatVo.getOpenId());
+ tAppUser.setPhone(loginWechatVo.getPhone());
+ tAppUser.setPassword(Md5Util.MD5Encode("111111", null));
+ tAppUser.setIsVip(0);
+ tAppUser.setState(1);
+ if(ToolUtil.isNotEmpty(loginWechatVo.getLatitude()) && ToolUtil.isNotEmpty(loginWechatVo.getLongitude())){
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(loginWechatVo.getLongitude(), loginWechatVo.getLatitude());
+ if(null != geocode){
+ String province = geocode.get("province");
+ String provinceCode = geocode.get("provinceCode");
+ String city = geocode.get("city");
+ String cityCode = geocode.get("cityCode");
+ tAppUser.setProvince(province);
+ tAppUser.setProvinceCode(provinceCode);
+ tAppUser.setCity(city);
+ tAppUser.setCityCode(cityCode);
+ }
+ }
+ this.baseMapper.insert(tAppUser);
+ }
+ }
+ if(tAppUser.getState() == 2){
+ return ResultUtil.error("您的账号已被冻结", "");
+ }
+
+ if(ToolUtil.isNotEmpty(tAppUser.getOpenid())){
+ tAppUser.setOpenid(loginWechatVo.getOpenId());
+ }
+ if(ToolUtil.isNotEmpty(tAppUser.getPhone())){
+ tAppUser.setPhone(loginWechatVo.getPhone());
+ }
+ this.updateById(tAppUser);
+
+ String token = getToken(tAppUser);
+ return ResultUtil.success(token);
+ }
+
+
+ /**
+ * 获取JWT token和存储个人信息
+ * @param appUser
+ * @return
+ */
+ private String getToken(TAppUser appUser){
+ String randomKey = jwtTokenUtil.getRandomKey();
+ String token = jwtTokenUtil.generateToken(appUser.getId().toString(), randomKey);
+ redisUtil.setStrValue(token.substring(token.length() - 32), String.valueOf(appUser.getId()), 7 * 24 * 60 * 60);
+ redisUtil.setStrValue("USER_" + appUser.getPhone(), token.substring(token.length() - 32));
+ redisUtil.setStrValue("USER_" + appUser.getId(), token);
+ return token;
+ }
+
+
+ /**
+ * 修改密码
+ * @param phone
+ * @param code
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil updatePassword(String phone, String code, String password) throws Exception {
+ String value = redisUtil.getValue(phone);
+ if(ToolUtil.isEmpty(value) || !value.equals(code)){
+ return ResultUtil.error("验证码无效");
+ }
+ TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
+ if(tAppUser.getState() == 2){
+ return ResultUtil.error("您的账号已被冻结", "");
+ }
+ tAppUser.setPassword(Md5Util.MD5Encode(password, null));
+ this.updateById(tAppUser);
+ return ResultUtil.success();
}
}
--
Gitblit v1.7.1