From 2b4511ca363e74343e1cb678c23a9e7638800a3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntrduceOfUserRequest.java | 21 ++
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java | 14 -
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java | 9
cloud-server-course/src/main/java/com/dsh/course/model/vo/StuCourseRequest.java | 15 +
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 16 +
cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java | 9
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuOfCoursesDetails.java | 13 +
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 11
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java | 7
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/RegisterCourseVo.java | 28 +++
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 38 ++++
cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java | 8
cloud-server-other/src/main/java/com/dsh/other/feignclient/model/GetAllNearbyStoreList.java | 13 +
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java | 7
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStudentCourse.java | 14 +
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java | 8
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntrduceOfUserRequest.java | 21 ++
cloud-server-course/src/main/java/com/dsh/course/model/vo/CourseDetailRequest.java | 23 ++
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 27 +++
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 11
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 10
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetStuSourseList.java | 19 ++
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 5
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java | 9
cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java | 6
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 18 ++
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java | 5
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java | 11 -
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java | 8
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuSessionList.java | 20 ++
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 3
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 11
32 files changed, 340 insertions(+), 98 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 a4dbd72..6eafa94 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
@@ -398,4 +398,31 @@
}
+
+ /**
+ * 已报名课程列表
+ */
+ @ResponseBody
+ @PostMapping("/api/startCource/registeredCourses")
+ @ApiOperation(value = "已报名课程列表", tags = {"APP-开始上课"})
+ @ApiImplicitParams({
+ @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<List<RegisterCourseVo>> queryRegisteredCoursesDetails(@RequestParam("stuId") Integer stuId){
+ try {
+ Integer appUserId = tokenUtil.getUserIdFormRedis();
+ if(null == appUserId){
+ return ResultUtil.tokenErr();
+ }
+ return ResultUtil.success();
+ }catch (Exception e){
+ return ResultUtil.runErr();
+ }
+
+
+ }
+
+
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
index a12ecfd..f3b9d0d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
@@ -1,12 +1,12 @@
package com.dsh.account.feignclient.activity;
+import com.dsh.account.feignclient.activity.model.IntrduceOfUserRequest;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-activity")
@@ -14,9 +14,7 @@
@PostMapping("/base/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("userIds") List<Integer> userIds);
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request);
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntrduceOfUserRequest.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntrduceOfUserRequest.java
new file mode 100644
index 0000000..cb16d49
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntrduceOfUserRequest.java
@@ -0,0 +1,21 @@
+package com.dsh.account.feignclient.activity.model;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class IntrduceOfUserRequest {
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ private List<Integer> userIds;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index f8a285f..a88b8de 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -7,12 +7,11 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
@PostMapping("/base/competition/getCompetitionsDetails")
- List<PurchaseRecordVo> getStuSourseList(GetStuSourseList getStuSourseList);
+ List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList getStuSourseList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
index 49c613f..963f06c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
@@ -1,20 +1,17 @@
package com.dsh.account.feignclient.course;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.feignclient.course.model.GetStuSessionList;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
@PostMapping("/base/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
index e18e253..011f6ac 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -3,6 +3,7 @@
import com.dsh.account.feignclient.course.model.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -19,10 +20,10 @@
List<CourseOfStoreVo> getStoreOfCourses();
@PostMapping("/base/coursePack/stuOfCourses")
- StuWithCoursesListVo getStuOfCoursesDetails(GetStuOfCoursesDetails getStuOfCoursesDetails);
+ StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody GetStuOfCoursesDetails getStuOfCoursesDetails);
@PostMapping("/base/coursePack/continuingCourse")
- StudentOfCourseVo getStudentCourse(GetStudentCourse getStudentCourse);
+ StudentOfCourseVo getStudentCourse(@RequestBody GetStudentCourse getStudentCourse);
@PostMapping("/base/coursePack/afterCourseTwos")
List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId);
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
index 03d286d..67b286f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
@@ -1,15 +1,14 @@
package com.dsh.account.feignclient.course;
+import com.dsh.account.feignclient.course.model.GetStudentCourse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
@PostMapping("/base/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ public Integer getDeductionClassHour(@RequestBody GetStudentCourse course);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
index b022910..5506604 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
@@ -8,7 +8,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-course")
@@ -16,9 +15,9 @@
@PostMapping("/base/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(GetStuSessionList getStuSessionList);
+ List<StuSessionDetailsVo> getStuSessionList(@RequestBody GetStuSessionList getStuSessionList);
@PostMapping("/base/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(GetStuSessionList getStuSessionList);
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestBody GetStuSessionList getStuSessionList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
index b9abe55..35bad4d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
@@ -4,14 +4,9 @@
import com.dsh.account.feignclient.other.model.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
-
-/**
- * @author zhibing.pu
- * @date 2023/6/24 15:54
- */
-import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(value = "mb-cloud-other")
@@ -38,9 +33,9 @@
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- List<StoreInfo> getAllNearbyStoreList(GetAllNearbyStoreList getAllNearbyStoreList);
+ List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList getAllNearbyStoreList);
@PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- List<StoreLonLatList> getAllStoreLonLats(GetAllNearbyStoreList getAllNearbyStoreList);
+ List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList getAllNearbyStoreList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/RegisterCourseVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/RegisterCourseVo.java
new file mode 100644
index 0000000..19e645f
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/RegisterCourseVo.java
@@ -0,0 +1,28 @@
+package com.dsh.account.model.vo.classDetails.classInsVo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RegisterCourseVo {
+
+ @ApiModelProperty(value = "课包id")
+ private Integer coursePackageId;
+
+ @ApiModelProperty(value = "课包封面图")
+ private String packageImg;
+
+ @ApiModelProperty(value = "课包名称+门店名称")
+ private String courseNameStore;
+
+ @ApiModelProperty(value = "上课时间段")
+ private String courseTime;
+
+ @ApiModelProperty(value = "授课老师")
+ private String courseTeacher;
+
+ @ApiModelProperty(value = "已上课时数")
+ private Integer courseNums;
+
+}
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 8e4636e..3ec7783 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
@@ -7,6 +7,7 @@
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
import com.dsh.account.feignclient.activity.UserConponClient;
+import com.dsh.account.feignclient.activity.model.IntrduceOfUserRequest;
import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
import com.dsh.account.feignclient.competition.model.GetStuSourseList;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
@@ -38,7 +39,6 @@
import com.dsh.account.util.DateUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.ToolUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -140,7 +140,14 @@
getStuSourseList.setAppUserId(userIdFormRedis);
List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
purchaseRecordVoList.addAll(stuSourseList);
- List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+
+ GetStuSessionList sessionList = new GetStuSessionList();
+ sessionList.setStartTime(localMonthStart);
+ sessionList.setEndTime(localMonthEnd);
+ sessionList.setStuId(stuId);
+ sessionList.setAppUserId(userIdFormRedis);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(sessionList);
+
purchaseRecordVoList.addAll(cancelCourseList);
List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
purchaseRecordVoList.addAll(purchaseRecordVos);
@@ -148,7 +155,11 @@
.eq("referralUserId",userIdFormRedis )
.between("insertTime",localMonthStart ,localMonthEnd));
List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
- List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(localMonthStart, localMonthEnd, userIds);
+ IntrduceOfUserRequest request = new IntrduceOfUserRequest();
+ request.setStartTime(localMonthStart);
+ request.setEndTime(localMonthEnd);
+ request.setUserIds(userIds);
+ List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
purchaseRecordVoList.addAll(purchaseRecordVos1);
insVo.setSessionNames(stuSessionList);
insVo.setDetails(dealDataOfTime(purchaseRecordVoList));
@@ -159,7 +170,11 @@
insVo.setTotalNums(stuOfCoursesDetails.getTotalNums());
insVo.setDeductedNums(stuOfCoursesDetails.getDeductedNums());
insVo.setRemainingNums(stuOfCoursesDetails.getRemainingNums());
- Integer deductionClassHour = crClient.getDeductionClassHour(lessonId, stuId, userIdFormRedis);
+ GetStudentCourse course = new GetStudentCourse();
+ course.setCourseId(lessonId);
+ course.setStuId(stuId);
+ course.setAppUserId(userIdFormRedis);
+ Integer deductionClassHour = crClient.getDeductionClassHour(course);
insVo.setDeductionClassHours(deductionClassHour);
}
@@ -177,7 +192,14 @@
getStuSourseList.setAppUserId(appUserId);
List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
purchaseRecordVoList.addAll(stuSourseList);
- List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(startTime,endTime,timeRequest.getStuId(),appUserId);
+
+ GetStuSessionList sessionList = new GetStuSessionList();
+ sessionList.setStartTime(startTime);
+ sessionList.setEndTime(endTime);
+ sessionList.setStuId(timeRequest.getStuId());
+ sessionList.setAppUserId(appUserId);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(sessionList);
+
purchaseRecordVoList.addAll(cancelCourseList);
GetStuSessionList getStuSessionList = new GetStuSessionList();
getStuSessionList.setStartTime(startTime);
@@ -190,7 +212,11 @@
.eq("referralUserId",appUserId )
.between("insertTime",startTime ,endTime));
List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
- List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(startTime, endTime, userIds);
+ IntrduceOfUserRequest request = new IntrduceOfUserRequest();
+ request.setStartTime(startTime);
+ request.setEndTime(endTime);
+ request.setUserIds(userIds);
+ List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
purchaseRecordVoList.addAll(purchaseRecordVos1);
purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
index 0493559..ec98b26 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.IntroduceRewards;
+import com.dsh.activity.feignclient.model.IntrduceOfUserRequest;
import com.dsh.activity.feignclient.model.PurchaseRecordVo;
import com.dsh.activity.service.IntroduceRewardsService;
import io.swagger.annotations.Api;
@@ -11,7 +12,6 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
@Api
@@ -28,13 +28,13 @@
@PostMapping("/base/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,@RequestParam("endTime") Date endTime,@RequestParam("userIds") List<Integer> userIds){
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
List<IntroduceRewards> list = idrService.list(new QueryWrapper<IntroduceRewards>()
- .ge("startTime",startTime)
- .lt("endTime",endTime));
+ .ge("startTime",request.getStartTime())
+ .lt("endTime",request.getEndTime()));
IntroduceRewards introduceRewards = list.get(0);
- userIds.forEach( userId -> {
+ request.getUserIds().forEach( userId -> {
PurchaseRecordVo recordVo = new PurchaseRecordVo();
recordVo.setPurchaseAmount("+"+introduceRewards.getGiveClass());
recordVo.setPurchaseType("介绍有礼");
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
index d51c91a..c76a020 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
@@ -1,19 +1,17 @@
package com.dsh.activity.feignclient;
+import com.dsh.activity.feignclient.model.IntrduceOfUserRequest;
import com.dsh.activity.feignclient.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-activity")
public interface IntroduceRewardsClient {
@PostMapping("/base/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("userIds") List<Integer> userIds);
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody IntrduceOfUserRequest request);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntrduceOfUserRequest.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntrduceOfUserRequest.java
new file mode 100644
index 0000000..385f102
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntrduceOfUserRequest.java
@@ -0,0 +1,21 @@
+package com.dsh.activity.feignclient.model;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class IntrduceOfUserRequest {
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ private List<Integer> userIds;
+
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 6d6a418..19a543e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.competition.entity.Competition;
import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.model.GetStuSourseList;
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
@@ -15,11 +16,13 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,7 +54,7 @@
@PostMapping("/base/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("appUserId") Integer appUserId){
+ public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
@@ -59,7 +62,7 @@
.eq("payType",3 )
.eq("auditStatus",2));
List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(startTime,endTime,appUserId,comIds);
+ List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(sourseList.getStartTime(),sourseList.getEndTime(),sourseList.getAppUserId(),comIds);
if (userCompetitions.size() > 0){
userCompetitions.forEach(coms ->{
PurchaseRecordVo recordVo = new PurchaseRecordVo();
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
new file mode 100644
index 0000000..e23d5b5
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
@@ -0,0 +1,18 @@
+package com.dsh.competition.feignclient;
+
+
+import com.dsh.competition.feignclient.model.GetStuSourseList;
+import com.dsh.competition.feignclient.model.PurchaseRecordVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(value = "mb-cloud-competition")
+public interface DeductionCompetitionsClient {
+
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList);
+
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetStuSourseList.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetStuSourseList.java
new file mode 100644
index 0000000..82c449c
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/model/GetStuSourseList.java
@@ -0,0 +1,19 @@
+package com.dsh.competition.feignclient.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/6 9:59
+ */
+@Data
+public class GetStuSourseList {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ private Integer appUserId;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
index 7f02e63..e6e427f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.entity.CancelledClasses;
import com.dsh.course.entity.TCoursePackagePayment;
+import com.dsh.course.feignclient.model.GetStuSessionList;
import com.dsh.course.feignclient.model.PurchaseRecordVo;
import com.dsh.course.service.CancelledClassesService;
import com.dsh.course.service.TCoursePackagePaymentService;
@@ -13,7 +14,6 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -36,20 +36,19 @@
/**
* 获取课包对应的消费记录
- * @param stuId 学员id
- * @param appUserId 用户id
+ * @param sessionList
* @return
*/
@PostMapping("/base/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList){
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
- List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
+ List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(sessionList.getStartTime(),sessionList.getEndTime(),null,sessionList.getStuId(), sessionList.getAppUserId());
List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
.in("coursePackageId", coursePackageIds)
- .between("insertTime",startTime,endTime));
+ .between("insertTime",sessionList.getStartTime(),sessionList.getEndTime()));
if (list.size() > 0){
list.forEach( canse -> {
PurchaseRecordVo purchaseRecordVo = new PurchaseRecordVo();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 3194c85..a31e3d3 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -7,6 +7,7 @@
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.model.*;
import com.dsh.course.model.dto.DiscountJsonDto;
+import com.dsh.course.model.vo.CourseDetailRequest;
import com.dsh.course.service.PostCourseVideoService;
import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackagePaymentService;
@@ -102,9 +103,9 @@
* 课程名称列表
*/
@PostMapping("/base/coursePack/sessionNames")
- public List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestBody CourseDetailRequest request){
List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
- List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId,appUserId);
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(request.getStartTime(),request.getEndTime(),null,request.getStuId(),request.getAppUserId());
if (byUserId.size() > 0){
List<Integer> collect = byUserId.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
List<TCoursePackage> list = tcpService.list(new QueryWrapper<TCoursePackage>()
@@ -140,12 +141,12 @@
@PostMapping("/base/coursePack/stuOfCourses")
- public StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
+ public StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody GetStuOfCoursesDetails getStuOfCoursesDetails){
StuWithCoursesListVo lisco = new StuWithCoursesListVo();
Integer totalNu = 0;
Integer dedutNu = 0;
Integer remainNu = 0;
- List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,stuId,appUserId);
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,getStuOfCoursesDetails.getStuId(),getStuOfCoursesDetails.getAppUserId());
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
totalNu = totalNu + tCoursePackagePayment.getTotalClassHours();
@@ -162,9 +163,9 @@
@PostMapping("/base/coursePack/continuingCourse")
- public StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
+ public StudentOfCourseVo getStudentCourse(@RequestBody GetStudentCourse getStudentCourse){
StudentOfCourseVo courseVo = new StudentOfCourseVo();
- List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,courseId,stuId,appUserId);
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,getStudentCourse.getCourseId(),getStudentCourse.getStuId(),getStudentCourse.getAppUserId());
if (tCoursePackagePayments.size() > 0 ){
List<CourseHoursType> typeList = new ArrayList<>();
@@ -270,4 +271,7 @@
+
+
+
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
index 4f0f11f..237d8e6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
@@ -5,6 +5,7 @@
import com.dsh.course.entity.CancelledClasses;
import com.dsh.course.entity.CoursePackageStudent;
import com.dsh.course.entity.TCoursePackage;
+import com.dsh.course.feignclient.model.GetStudentCourse;
import com.dsh.course.service.CancelledClassesService;
import com.dsh.course.service.CoursePackageStudentService;
import com.dsh.course.service.TCoursePackageService;
@@ -33,14 +34,14 @@
@PostMapping("/base/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
+ public Integer getDeductionClassHour(@RequestBody GetStudentCourse course){
Integer sult = 0;
- TCoursePackage coursePackage = tcpService.getById(courseId);
+ TCoursePackage coursePackage = tcpService.getById(course.getCourseId());
if (null != coursePackage && coursePackage.getStatus() == 3){
- List<CoursePackageStudent> coursePackageStudents = cosService.queryStuDeduClassHourNums(courseId, stuId, appUserId);
+ List<CoursePackageStudent> coursePackageStudents = cosService.queryStuDeduClassHourNums(course.getCourseId(), course.getStuId(), course.getAppUserId());
if (coursePackageStudents.size() > 0){
List<CancelledClasses> list = caccService.list(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageId",courseId ));
+ .eq("coursePackageId",course.getCourseId() ));
if (list.size() > 0){
for (CancelledClasses cancelledClasses : list) {
sult = sult + cancelledClasses.getCancelledClassesNumber();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
index 4dbd7cb..2539deb 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
@@ -1,20 +1,17 @@
package com.dsh.course.feignclient;
+import com.dsh.course.feignclient.model.GetStuSessionList;
import com.dsh.course.feignclient.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
@PostMapping("/base/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestBody GetStuSessionList sessionList);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
index b028711..467c16d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
@@ -4,6 +4,7 @@
import com.dsh.course.feignclient.model.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -19,13 +20,10 @@
List<CourseOfStoreVo> getStoreOfCourses();
@PostMapping("/base/coursePack/stuOfCourses")
- StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody GetStuOfCoursesDetails getStuOfCoursesDetails);
@PostMapping("/base/coursePack/continuingCourse")
- StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ StudentOfCourseVo getStudentCourse(@RequestBody GetStudentCourse getStudentCourse);
@PostMapping("/base/coursePack/afterCourseTwos")
List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
index 4a634f7..e553ce5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
@@ -1,15 +1,14 @@
package com.dsh.course.feignclient;
+import com.dsh.course.feignclient.model.GetStudentCourse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
@PostMapping("/base/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ public Integer getDeductionClassHour(@RequestBody GetStudentCourse course);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
index 97cd94c..6883b4b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
@@ -3,11 +3,11 @@
import com.dsh.course.feignclient.model.PurchaseRecordVo;
import com.dsh.course.feignclient.model.StuSessionDetailsVo;
+import com.dsh.course.model.vo.CourseDetailRequest;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestBody;
-import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-course")
@@ -15,16 +15,10 @@
@PostMapping("/base/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ List<StuSessionDetailsVo> getStuSessionList(@RequestBody CourseDetailRequest request);
@PostMapping("/base/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime,
- @RequestParam("endTime") Date endTime,
- @RequestParam("stuId") Integer stuId,
- @RequestParam("appUserId") Integer appUserId);
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestBody CourseDetailRequest request);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuOfCoursesDetails.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuOfCoursesDetails.java
new file mode 100644
index 0000000..26bc946
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuOfCoursesDetails.java
@@ -0,0 +1,13 @@
+package com.dsh.course.feignclient.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/6 9:46
+ */
+@Data
+public class GetStuOfCoursesDetails {
+ private Integer stuId;
+ private Integer appUserId;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuSessionList.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuSessionList.java
new file mode 100644
index 0000000..b91b7bd
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStuSessionList.java
@@ -0,0 +1,20 @@
+package com.dsh.course.feignclient.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/6 9:55
+ */
+@Data
+public class GetStuSessionList {
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ private Integer stuId;
+ private Integer appUserId;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStudentCourse.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStudentCourse.java
new file mode 100644
index 0000000..850f3c6
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/GetStudentCourse.java
@@ -0,0 +1,14 @@
+package com.dsh.course.feignclient.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/6 9:48
+ */
+@Data
+public class GetStudentCourse {
+ private Integer courseId;
+ private Integer stuId;
+ private Integer appUserId;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/CourseDetailRequest.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/CourseDetailRequest.java
new file mode 100644
index 0000000..a4f0a03
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/CourseDetailRequest.java
@@ -0,0 +1,23 @@
+package com.dsh.course.model.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CourseDetailRequest {
+ @ApiModelProperty(value = "开始时间")
+ Date startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ Date endTime;
+
+ @ApiModelProperty(value = "学员id")
+ Integer stuId;
+
+ @ApiModelProperty(value = "用户id")
+ Integer appUserId;
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/StuCourseRequest.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/StuCourseRequest.java
new file mode 100644
index 0000000..2a2eec6
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/StuCourseRequest.java
@@ -0,0 +1,15 @@
+package com.dsh.course.model.vo;
+
+
+import lombok.Data;
+
+@Data
+public class StuCourseRequest {
+
+ Integer courseId;
+
+ Integer stuId;
+
+ Integer appUserId;
+
+}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 96e7621..5058bd9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Store;
+import com.dsh.other.feignclient.model.GetAllNearbyStoreList;
import com.dsh.other.feignclient.model.StoreDetailOfCourse;
import com.dsh.other.feignclient.model.StoreInfo;
import com.dsh.other.feignclient.model.StoreLonLatList;
@@ -45,12 +46,12 @@
}
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- public List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
- String current = longitude+","+latitude;
+ public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
+ String current = list.getLongitude()+","+list.getLatitude();
List<StoreInfo> storeInfos = new ArrayList<>();
String cityCode = "";
try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
cityCode = geocode.get("cityCode");
}catch (Exception e){
e.printStackTrace();
@@ -85,10 +86,10 @@
@PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
+ public List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList list ){
List<StoreLonLatList> storeInfos = new ArrayList<>();
try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
String cityCode = geocode.get("cityCode");
List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("cityCode",cityCode));
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
index 65f4ae7..035d317 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
@@ -1,10 +1,12 @@
package com.dsh.other.feignclient;
+import com.dsh.other.feignclient.model.GetAllNearbyStoreList;
import com.dsh.other.feignclient.model.StoreDetailOfCourse;
import com.dsh.other.feignclient.model.StoreInfo;
import com.dsh.other.feignclient.model.StoreLonLatList;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -18,9 +20,9 @@
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
+ List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list);
@PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
+ List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList list);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/model/GetAllNearbyStoreList.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/model/GetAllNearbyStoreList.java
new file mode 100644
index 0000000..8208223
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/model/GetAllNearbyStoreList.java
@@ -0,0 +1,13 @@
+package com.dsh.other.feignclient.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/6 9:52
+ */
+@Data
+public class GetAllNearbyStoreList {
+ private String longitude;
+ private String latitude;
+}
--
Gitblit v1.7.1