From 9144acea1ad8f6222ca2db17cf8ef7ffb18e7428 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 六月 2023 16:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 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 88c8ab8..a146320 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
@@ -1,14 +1,22 @@
package com.dsh.account.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+
+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.mapper.TAppUserMapper;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
+
+import com.dsh.account.util.DateUtil;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.ToolUtil;
@@ -16,6 +24,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -29,22 +38,62 @@
@Service
public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
+
@Autowired
private TStudentMapper tsmapper;
@Resource
private ImgConfigClient configClient;
+ @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 EntityWrapper<TStudent>()
+ List<TStudent> tStudents = tsmapper.selectList(new QueryWrapper<TStudent>()
.eq("appUserId",tAppUser.getId())
- .eq("state",1));
+ .eq("state",1)
+ .eq("isDefault",1));
ClassInfoVo classInfoVo = new ClassInfoVo();
- if (null != tStudents){
+ if (tStudents.size() > 0 ){
+ TStudent tStudent = tStudents.get(0);
+ classInfoVo.setIsThere(1);
+ classInfoVo.setStuImg(tStudent.getHeadImg());
+ classInfoVo.setStuSex(tStudent.getSex());
+ classInfoVo.setStuAge(DateUtil.age(tStudent.getBirthday()));
+ classInfoVo.setStuName(tStudent.getName());
+ classInfoVo.setHeight(tStudent.getHeight());
+ classInfoVo.setWeight(tStudent.getWeight());
+ classInfoVo.setBmi(tStudent.getBmi());
+ List<RegisteredCourse> courseList = new ArrayList<>();
+// 总学时数
+ int total = 0;
+// 已扣数
+ int deduct = 0;
+// 剩余数
+ int remain = 0;
+ List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment();
+ if (stuCoursePayment.size() > 0){
+ for (StuCourseResp tCoursePackagePayment : stuCoursePayment) {
+ RegisteredCourse course = new RegisteredCourse();
+ course.setCourseId(tCoursePackagePayment.getCourseId());
+ course.setCourseName(tCoursePackagePayment.getCourseName());
+ 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);
+
+
+// classInfoVo.setWeekCourseList();
}else {
classInfoVo.setIsThere(2);
List<TImgConfig> tImgConfigs = configClient.getNoneStuImgs();
@@ -57,6 +106,7 @@
}
+
/**
* 获取短信验证码
* @param type 1：登录，2：注册，3：修改密码，4：忘记密码
--
Gitblit v1.7.1