From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 99 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 17 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index c7f2a49..9ef0f9b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -23,7 +23,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,6 +32,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -70,13 +70,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<ClassInfoVo> queryCouponRecord(){
+ public ResultUtil<ClassInfoVo> queryCouponRecord(Integer stuId){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(tappuService.queryUserOfStus(userIdFormRedis));
+ return ResultUtil.success(tappuService.queryUserOfStus(stuId,userIdFormRedis));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -107,6 +107,29 @@
}
}
+ @ResponseBody
+ @PostMapping("/api/startCource/weeksOfCourseDetailsList")
+ @ApiOperation(value = "上课首页-课程列表2.0", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "查询时间yyyy-MM-dd", name = "time", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "门店id", name = "storeId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "用户经度", name = "longitude", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "用户纬度", name = "latitude", required = false, dataType = "string"),
+ })
+ public ResultUtil<Map<String,Object>> weeksOfCourseDetailsList(String time, Integer stuId, Integer storeId, String longitude, String latitude){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success(tappuService.weeksOfCourseDetailsList(appUserId,stuId,time,storeId,longitude,latitude));
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
@ResponseBody
@PostMapping("/api/startCource/weeksOfGetHours")
@@ -135,9 +158,9 @@
@ApiOperation(value = "上课首页分配课时-课程列表", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "分配给课包id", name = "packetId", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "分配给课包id", name = "packetId", required = true, dataType = "Long"),
})
- public ResultUtil<Integer> weeksOfAddHours(Integer packetId){
+ public ResultUtil<Integer> weeksOfAddHours(Long packetId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -145,10 +168,12 @@
}
TAppGift one = appGiftService.getOne(new LambdaQueryWrapper<TAppGift>().eq(TAppGift::getUserId, appUserId));
Boolean b= false;
+ Integer i=0;
if(one!=null && one.getNum()>0){
- b =appGiftService.weeksOfAddHours(packetId,appUserId,one.getNum());
+ i=appGiftService.weeksOfAddHours(packetId,appUserId,one.getNum());
+
}
- if(b){
+ if(i==1){
// 送完清0
one.setNum(0);
appGiftService.updateById(one);
@@ -176,7 +201,10 @@
if (ToolUtil.isNotEmpty(tStudent)){
vo.setBmi(tStudent.getBmi());
vo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
- vo.setUrl(tStudent.getLateralSurface());
+ if (tStudent.getLateralSurface()!=null) {
+ String[] split = tStudent.getLateralSurface().split(";");
+ vo.setUrls(split);
+ }
vo.setHeight(tStudent.getHeight());
vo.setWeight(tStudent.getWeight());
}
@@ -222,7 +250,7 @@
}
List<StuListVo> stuListVos = new ArrayList<>();
List<TStudent> tStudents = istuService.list(new QueryWrapper<TStudent>()
- .eq("appUserId",userIdFormRedis));
+ .eq("appUserId",userIdFormRedis).eq("state",1));
if (tStudents.size() > 0){
tStudents.forEach(sts -> {
StuListVo vo = new StuListVo();
@@ -238,6 +266,7 @@
vo.setStuWeight(sts.getWeight());
vo.setIsNot(sts.getIsDefault());
vo.setStuPhone(sts.getPhone());
+ vo.setSex(sts.getSex());
stuListVos.add(vo);
});
}
@@ -316,13 +345,46 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "学员id", name = "stuId", required = true, dataType = "int"),
})
- public ResultUtil commitEditStu(StuEditInfoReq stu){
+ public ResultUtil commitEditStu(StuDetailsReq stu){
try {
Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
if(null == userIdFormRedis){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(istuService.commitEditStudentInfo(stu,userIdFormRedis));
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+ Double height = stu.getHeight();
+ Double squareHeight = Math.pow(height/100, 2);
+ Double weight = stu.getWeight();
+
+ Double bim = weight/squareHeight;
+
+ TStudent tStudent = new TStudent();
+
+
+
+
+ tStudent.setId(stu.getStuId());
+ tStudent.setBirthday(format.parse(stu.getBirthday()));
+ tStudent.setHeadImg(stu.getHeadImg());
+ tStudent.setHeight(stu.getHeight());
+ tStudent.setWeight(stu.getWeight());
+ tStudent.setPhone(stu.getPhone());
+ tStudent.setSex(stu.getSex());
+ tStudent.setName(stu.getName());
+ tStudent.setIdCard(stu.getIdCard());
+ tStudent.setBmi(bim);
+
+ if(ToolUtil.isNotEmpty(tStudent.getName()) && ToolUtil.isNotEmpty(tStudent.getIdCard())){
+ Boolean aBoolean = JuHeUtil.idcardAuthentication(tStudent.getIdCard(), tStudent.getName());
+ if(!aBoolean){
+ return ResultUtil.error("身份证和姓名不匹配");
+ }
+ }
+
+ return ResultUtil.success(istuService.updateById(tStudent));
+
+// return ResultUtil.success(istuService.commitEditStudentInfo(stu,userIdFormRedis));
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -521,6 +583,9 @@
})
public ResultUtil<List<StuMedalVo>> queryStuMedal( Integer stuId){
try {
+
+
+
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
@@ -567,16 +632,16 @@
@ApiImplicitParam(value = "时间类型 0=全部 1=近一周 2=近一个月 3=近一年", name = "timeType", required = false, dataType = "int"),
@ApiImplicitParam(value = "课程名称", name = "appointStatus", required = false, dataType = "string"),
})
- public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search){
- try {
+ public ResultUtil<List<RecordAppoint>> cgeClassAppointmentRecordList(Integer stuId, Integer appointStatus, Integer timeType, String search,Integer pageNum){
+// try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+ return ResultUtil.success(istuService.getAppointmentRecords(stuId,appUserId,appointStatus,timeType,search,pageNum));
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1