From d9d3e4edf8515d250337598c7d5b155ca7afb9c9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 09:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index e55dcac..c9e98a6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -13,26 +13,24 @@
import com.dsh.account.feignclient.competition.model.GetStuSourseList;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.feignclient.competition.model.SaveParticipant;
-import com.dsh.account.feignclient.course.CancelListClient;
-import com.dsh.account.feignclient.course.CoursePaymentClient;
-import com.dsh.account.feignclient.course.CourseRecordClient;
-import com.dsh.account.feignclient.course.CourseSessionNameClient;
+import com.dsh.account.feignclient.course.*;
import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.feignclient.other.NoticeClient;
import com.dsh.account.feignclient.other.QuestionClient;
+import com.dsh.account.feignclient.other.SiteClient;
import com.dsh.account.feignclient.other.StoreClient;
import com.dsh.account.feignclient.other.model.*;
import com.dsh.account.mapper.CoachMapper;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
+import com.dsh.account.model.vo.classDetails.AppointmentRecordVo;
import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
-import com.dsh.account.model.vo.exploreDetail.ExploreDatasVo;
import com.dsh.account.model.vo.exploreDetail.LonLatRequest;
-import com.dsh.account.model.vo.exploreDetails.QuestionDetailsVo;
-import com.dsh.account.model.vo.exploreDetails.QuestionIns;
+import com.dsh.account.model.vo.exploreDetail.QuestionIns;
+import com.dsh.account.model.vo.exploreDetail.StoreDetailsVo;
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
@@ -103,18 +101,31 @@
private PayMoneyUtil payMoneyUtil;
+ @Resource
+ private SiteClient steClient;
+
+ @Resource
+ private CourseListClient culisClient;
+
@Override
- public void addStuOfAppUser(StuDetailsReq stu,Integer appUserId) {
+ public ResultUtil addStuOfAppUser(StuDetailsReq stu,Integer appUserId) throws Exception {
TStudent student = new TStudent();
+ if(ToolUtil.isNotEmpty(stu.getName()) && ToolUtil.isNotEmpty(stu.getIdCard())){
+ Boolean aBoolean = JuHeUtil.idcardAuthentication(stu.getIdCard(), stu.getName());
+ if(!aBoolean){
+ return ResultUtil.error("身份证和姓名不匹配");
+ }
+ }
student.setAppUserId(appUserId);
student.setName(stu.getName());
student.setHeadImg(stu.getHeadImg());
student.setPhone(ToolUtil.isNotEmpty(stu.getPhone()) ? stu.getPhone() : "");
student.setSex(stu.getSex());
student.setIdCard(ToolUtil.isNotEmpty(stu.getIdCard())?stu.getIdCard() : "");
- student.setBirthday(new Date(stu.getBirthday()));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ student.setBirthday(sdf.parse(stu.getBirthday()));
student.setHeight(stu.getHeight());
student.setWeight(stu.getWeight());
BigDecimal bigDecimal = BigDecimal.valueOf(stu.getWeight());
@@ -136,6 +147,7 @@
saveParticipant.setPhone(student.getPhone());
saveParticipant.setIdcard(student.getIdCard());
participantClient.saveParticipant(saveParticipant);
+ return ResultUtil.success();
}
@Override
@@ -296,7 +308,7 @@
}
@Override
- public QuestionDetailsVo queryQuestionData() {
+ public List<QuestionIns> queryQuestionData() {
return quesClient.getSysQuestionDetails();
}
@@ -311,16 +323,11 @@
}
@Override
- public ExploreDatasVo queryIndexOfExplores(LonLatRequest llrequest) {
- ExploreDatasVo datasVo = new ExploreDatasVo();
+ public List<StoreInfo> queryIndexOfExplores(LonLatRequest llrequest) {
GetAllNearbyStoreList getAllNearbyStoreList = new GetAllNearbyStoreList();
getAllNearbyStoreList.setLongitude(llrequest.getLongitude());
getAllNearbyStoreList.setLatitude(llrequest.getLatitude());
- List<StoreInfo> allNearbyStoreList = storeClient.getAllNearbyStoreList(getAllNearbyStoreList);
- List<StoreLonLatList> allStoreLonLats = storeClient.getAllStoreLonLats(getAllNearbyStoreList);
- datasVo.setStoreLists(allNearbyStoreList);
- datasVo.setLonLatLists(allStoreLonLats);
- return datasVo;
+ return storeClient.getAllNearbyStoreList(getAllNearbyStoreList);
}
@Override
@@ -480,7 +487,7 @@
}
public ResultUtil AlipayPayment(String code,BigDecimal amount){
- ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, amount.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("课包续费", "课包续费", "", code, amount.toString(),
"/base/coursePackage/alipayPaymentCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@@ -555,4 +562,66 @@
return ResultUtil.success();
}
+ @Override
+ public AppointmentRecordVo getAppointmentRecords(Integer stuId, Integer appUserId) {
+ AppointmentRecordVo recordVo = new AppointmentRecordVo();
+ TStudent tStudent = this.baseMapper.selectOne(new QueryWrapper<TStudent>()
+ .eq("id",stuId )
+ .eq("appUserId",appUserId));
+ if (ToolUtil.isNotEmpty(tStudent)){
+ recordVo.setStuId(tStudent.getId());
+ recordVo.setStuName(tStudent.getName());
+ recordVo.setAppointList(couPayClient.obtainStudentClassDetailsData(stuId));
+ }
+ return recordVo;
+ }
+
+ @Override
+ public ResultUtil cancelReservationOfCourse(Integer courseStuRecordId) {
+ Integer integer = crClient.cancelCourseRecordClass(courseStuRecordId);
+ switch (integer){
+ case 1:
+ ResultUtil.success();
+ break;
+ case 2:
+ ResultUtil.error("开课前三小时不能取消！");
+ break;
+ default:
+ ResultUtil.runErr();
+ break;
+ }
+ return null;
+ }
+
+ @Override
+ public List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude) {
+ StoreOfCitycodeResp citycodeResp = new StoreOfCitycodeResp();
+ citycodeResp.setSpace(space);
+ citycodeResp.setCityCode(cityCode);
+ citycodeResp.setLongitude(latitude);
+ citycodeResp.setLatitude(longitude);
+ return storeClient.getQueryStoreList(citycodeResp);
+ }
+
+ @Override
+ public StoreDetailsVo getStoreDetail(Integer storeId) {
+ Store store = storeClient.queryStoreById(storeId);
+ StoreDetailsVo detailsVo = new StoreDetailsVo();
+ String realPicture = store.getRealPicture();
+ String[] split = realPicture.split(",");
+ detailsVo.setImages(Arrays.asList(split));
+ detailsVo.setStoreId(store.getId());
+ detailsVo.setStoreName(store.getName());
+ detailsVo.setStoreAddress(store.getAddress());
+ detailsVo.setStoreTime(store.getStartTime() + "至" +store.getEndTime());
+ detailsVo.setStoreInfo(store.getIntroduce());
+ detailsVo.setLon(store.getLon());
+ detailsVo.setLat(store.getLat());
+ detailsVo.setPhone(store.getPhone());
+ detailsVo.setVenueList(steClient.getAppUserSiteList());
+ detailsVo.setCourseVoList(culisClient.getStoreOfCourseList(storeId));
+ return detailsVo;
+ }
+
+
}
--
Gitblit v1.7.1