From d462cdb62cc5a55c5a3e94899dab7f5c035b8f23 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 10:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/AfterVideoVo.java | 15
cloud-server-account/src/main/resources/mapper/CoachMapper.xml | 6
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java | 12
cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml | 5
cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java | 2
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 4
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 57 +++
cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java | 2
cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java | 33 +
cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java | 7
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java | 6
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java | 4
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java | 11
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java | 2
cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java | 4
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 4
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ClasspaymentRequest.java | 29 +
cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java | 58 +++
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java | 4
cloud-server-account/src/main/resources/mapper/CoachTypeMapper.xml | 6
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java | 12
cloud-server-account/src/main/java/com/dsh/account/entity/CoachType.java | 49 ++
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 7
cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java | 6
cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java | 7
cloud-server-account/src/main/java/com/dsh/account/service/CoachTypeService.java | 16
cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachTypeServiceImpl.java | 20 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java | 18
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java | 12
cloud-server-course/src/main/java/com/dsh/course/service/PostCourseVideoService.java | 16
cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java | 2
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java | 22
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java | 4
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 65 ++
cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java | 12
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java | 8
cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml | 4
cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java | 4
cloud-server-course/src/main/java/com/dsh/course/mapper/PostCourseVideoMapper.java | 16
cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java | 10
cloud-server-account/src/main/java/com/dsh/account/mapper/CoachTypeMapper.java | 16
cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachServiceImpl.java | 20 +
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java | 8
cloud-server-account/src/main/java/com/dsh/account/service/CoachService.java | 16
cloud-server-course/src/main/java/com/dsh/course/service/impl/PostCourseVideoServiceImpl.java | 20 +
cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java | 4
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 15
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java | 4
cloud-server-course/src/main/java/com/dsh/course/model/dto/DiscountJsonDto.java | 59 +++
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/AfterVideoVo.java | 15
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 6
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java | 2
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java | 7
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 13
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 0
cloud-server-account/src/main/java/com/dsh/account/mapper/CoachMapper.java | 16
cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 4
cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java | 14
/dev/null | 21 -
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 4
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 1
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java | 4
cloud-server-account/src/main/java/com/dsh/account/entity/Coach.java | 118 ++++++
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StudentOfCourseVo.java | 46 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 2
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 4
72 files changed, 836 insertions(+), 198 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 1a213c9..a4dbd72 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
import com.dsh.account.model.vo.classDetails.classInsVo.*;
import com.dsh.account.model.vo.commentDetail.StuCommentsVo;
import com.dsh.account.model.vo.medalDetail.GongVo;
@@ -28,7 +29,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
@@ -292,12 +292,15 @@
@PostMapping("/api/startCource/payment")
@ApiOperation(value = "课时详情-支付", tags = {"APP-开始上课"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
- public ResultUtil<?> continuationOperation(@RequestBody Integer lessonId, @RequestBody Integer stuId, HttpServletRequest request){
+ public ResultUtil continuationOperation(@RequestBody ClasspaymentRequest request){
try {
-
- return ResultUtil.success();
+ Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
+ if(null == userIdFormRedis){
+ return ResultUtil.tokenErr();
+ }
+ return istuService.renewClassPayment(userIdFormRedis,request);
}catch (Exception e){
return ResultUtil.runErr();
}
@@ -374,7 +377,7 @@
*/
@ResponseBody
@PostMapping("/api/startCource/afterSourceDetails")
- @ApiOperation(value = "学员勋章", tags = {"APP-开始上课"})
+ @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"),
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
index aee00e1..819bd7d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
@@ -28,7 +28,7 @@
private TStudentService tsService;
@ResponseBody
- @PostMapping("/api/exploreWP/noticeList")
+ @PostMapping("/api/exploreWP/indexOfEx")
@ApiOperation(value = "联系客服-探索首页", tags = {"APP-探索玩湃"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -56,7 +56,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/noticeDetail")
@ApiOperation(value = "联系客服-公告详情", tags = {"APP-探索玩湃"})
public ResultUtil<SysNotice> queryNotice(@RequestBody Integer noId){
try {
@@ -68,7 +68,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/exceptionList")
@ApiOperation(value = "联系客服-常见问题列表", tags = {"APP-探索玩湃"})
public ResultUtil<QuestionDetailsVo> queryFrequentlyAskedQuestionDetails(){
try {
@@ -80,7 +80,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/exceptionDetail")
@ApiOperation(value = "联系客服-常见问题详情", tags = {"APP-探索玩湃"})
public ResultUtil<QuestionIns> queryQuestionData(@RequestBody Integer quesId){
try {
@@ -91,7 +91,7 @@
}
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/customerList")
@ApiOperation(value = "联系客服-客服电话列表", tags = {"APP-探索玩湃"})
public ResultUtil<List<String>> queryCustomerData(){
try {
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/Coach.java b/cloud-server-account/src/main/java/com/dsh/account/entity/Coach.java
new file mode 100644
index 0000000..2299096
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/Coach.java
@@ -0,0 +1,118 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 教练
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_coach")
+public class Coach extends Model<Coach> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 省
+ */
+ private String province;
+ /**
+ * 省编号
+ */
+ private String provinceCode;
+ /**
+ * 市
+ */
+ private String city;
+ /**
+ * 市编号
+ */
+ private String cityCode;
+ /**
+ * 城市管理员id
+ */
+ private Integer cityManagerId;
+ /**
+ * 教练类型id
+ */
+ private Integer coachTypeId;
+ /**
+ * 姓名
+ */
+ private String name;
+ /**
+ * 生日
+ */
+ private Date birthday;
+ /**
+ * 性别（1=男，2=女）
+ */
+ private Integer gender;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 身份证号码
+ */
+ private String idcard;
+ /**
+ * 身高（厘米）
+ */
+ private Double height;
+ /**
+ * 体重（KG）
+ */
+ private Double weight;
+ /**
+ * 毕业院校
+ */
+ private String graduateSchool;
+ /**
+ * 毕业证照片
+ */
+ private String diploma;
+ /**
+ * 资格证书（多个逗号分隔）
+ */
+ private String certificate;
+ /**
+ * 证书照片
+ */
+ private String certificateImg;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/CoachType.java b/cloud-server-account/src/main/java/com/dsh/account/entity/CoachType.java
new file mode 100644
index 0000000..0ca23ff
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/CoachType.java
@@ -0,0 +1,49 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 教练类型
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_coach_type")
+public class CoachType extends Model<CoachType> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 类型名称
+ */
+ private String name;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
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 d9e3390..a12ecfd 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
@@ -4,7 +4,7 @@
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.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -13,9 +13,11 @@
public interface IntroduceRewardsClient {
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody List<Integer> userIds);
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("userIds") List<Integer> userIds);
+
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
index d77e5e2..bdcab0b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-activity")
public interface MerChandiseClient {
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods();
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
index f1192fb..f336961 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
@@ -3,7 +3,7 @@
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
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;
@@ -11,7 +11,7 @@
public interface UserConponClient {
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId);
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);
}
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 594eb18..f8a285f 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
@@ -12,7 +12,7 @@
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
- @PostMapping("/competition/getCompetitionsDetails")
+ @PostMapping("/base/competition/getCompetitionsDetails")
List<PurchaseRecordVo> getStuSourseList(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 59cf6ea..49c613f 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
@@ -3,7 +3,7 @@
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.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -11,10 +11,10 @@
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
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 0607def..e18e253 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,7 +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;
@@ -11,16 +11,19 @@
public interface CoursePaymentClient {
- @PostMapping("/coursePack/queryPayment")
+ @PostMapping("/base/coursePack/queryPayment")
List<StuCourseResp> getStuCoursePayment();
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
List<CourseOfStoreVo> getStoreOfCourses();
- @PostMapping("/coursePack/stuOfCourses")
+ @PostMapping("/base/coursePack/stuOfCourses")
StuWithCoursesListVo getStuOfCoursesDetails(GetStuOfCoursesDetails getStuOfCoursesDetails);
- @PostMapping("/coursePack/continuingCourse")
+ @PostMapping("/base/coursePack/continuingCourse")
StudentOfCourseVo getStudentCourse(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 20a19b2..03d286d 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
@@ -2,12 +2,14 @@
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;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId, @RequestBody Integer stuId, @RequestBody Integer appUserId);
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
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 31452b2..b022910 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
@@ -15,10 +15,10 @@
public interface CourseSessionNameClient {
- @PostMapping("/coursePack/sessionNames")
+ @PostMapping("/base/coursePack/sessionNames")
List<StuSessionDetailsVo> getStuSessionList(GetStuSessionList getStuSessionList);
- @PostMapping("/coursePack/paymentCourse")
+ @PostMapping("/base/coursePack/paymentCourse")
public List<PurchaseRecordVo> queryCourseDetails(GetStuSessionList getStuSessionList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/AfterVideoVo.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/AfterVideoVo.java
new file mode 100644
index 0000000..cd92e50
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/AfterVideoVo.java
@@ -0,0 +1,15 @@
+package com.dsh.account.feignclient.course.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AfterVideoVo {
+
+ @ApiModelProperty(value = "视频id")
+ private Integer courseId;
+
+ @ApiModelProperty(value = "视频链接")
+ private String courseUrl;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
index 4bbd241..8e53cc5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-other")
public interface HonorDeClient {
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
index 1a400a0..029e614 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
@@ -10,10 +10,10 @@
@FeignClient(value = "mb-cloud-other")
public interface ImgConfigClient {
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
List<TImgConfig> getNoneStuImgs();
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
index 159b15a..62dfe18 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
@@ -3,7 +3,7 @@
import com.dsh.account.feignclient.other.model.SysNotice;
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;
@@ -16,7 +16,7 @@
List<SysNotice> getSysNoticeDetails();
@PostMapping("/base/notice/queryNotice")
- SysNotice getSysNoticeBuId(@RequestBody Integer noticeId);
+ SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId);
@PostMapping("/base/notice/sysTell")
List<String> queryCustomerTel();
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
index 9380603..2d86e0e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
@@ -4,7 +4,7 @@
import com.dsh.account.model.vo.exploreDetails.QuestionIns;
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;
@FeignClient(value = "mb-cloud-other")
@@ -14,6 +14,6 @@
QuestionDetailsVo getSysQuestionDetails();
@PostMapping("/base/notice/queryQuestion")
- QuestionIns getSysQuestionBuId(@RequestBody Integer quesId);
+ QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId);
}
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 a3469b0..b9abe55 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
@@ -11,14 +11,16 @@
* @author zhibing.pu
* @date 2023/6/24 15:54
*/
-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-other")
public interface StoreClient {
+
+
+
+
+
/**
@@ -29,14 +31,16 @@
List<Store> queryStoreList(QueryStoreList queryStoreList);
- @PostMapping("/storeDetail/courseOfSto")
- StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId);
- @PostMapping("/storeDetail/nearbyStore")
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
+ public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId);
+
+
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
List<StoreInfo> getAllNearbyStoreList(GetAllNearbyStoreList getAllNearbyStoreList);
- @PostMapping("/storeDetail/storeOfLonLat")
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
List<StoreLonLatList> getAllStoreLonLats(GetAllNearbyStoreList getAllNearbyStoreList);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachMapper.java
new file mode 100644
index 0000000..bf318f8
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachMapper.java
@@ -0,0 +1,16 @@
+package com.dsh.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.account.entity.Coach;
+
+/**
+ * <p>
+ * 教练 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface CoachMapper extends BaseMapper<Coach> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachTypeMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachTypeMapper.java
new file mode 100644
index 0000000..bb25436
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/CoachTypeMapper.java
@@ -0,0 +1,16 @@
+package com.dsh.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.account.entity.CoachType;
+
+/**
+ * <p>
+ * 教练类型 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface CoachTypeMapper extends BaseMapper<CoachType> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ClasspaymentRequest.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ClasspaymentRequest.java
new file mode 100644
index 0000000..02166b6
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/ClasspaymentRequest.java
@@ -0,0 +1,29 @@
+package com.dsh.account.model.vo.classDetails;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ClasspaymentRequest {
+
+ @ApiModelProperty(value = "课包id")
+ private Integer lessonId;
+
+ @ApiModelProperty(value = "学员id")
+ private Integer stuId;
+
+ @ApiModelProperty(value = "支付方式(1=微信 2=支付宝 3=玩湃币)")
+ private Integer payType;
+
+ @ApiModelProperty(value = "是否使用优惠券 1是 2否")
+ private Integer useConpon;
+
+ @ApiModelProperty(value = "优惠券Id")
+ private Integer conponId;
+
+ @ApiModelProperty(value = "课时id")
+ private Long courseConfigId;
+
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
index 8b75198..68e35b1 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
@@ -8,7 +8,7 @@
public class CourseHoursType {
@ApiModelProperty(value = "课时id")
- private Integer courseConfigId;
+ private Long courseConfigId;
@ApiModelProperty(value = "课时数")
private Integer courseHourNums;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/CoachService.java b/cloud-server-account/src/main/java/com/dsh/account/service/CoachService.java
new file mode 100644
index 0000000..72f0772
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/CoachService.java
@@ -0,0 +1,16 @@
+package com.dsh.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.entity.Coach;
+
+/**
+ * <p>
+ * 教练 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface CoachService extends IService<Coach> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/CoachTypeService.java b/cloud-server-account/src/main/java/com/dsh/account/service/CoachTypeService.java
new file mode 100644
index 0000000..1755f58
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/CoachTypeService.java
@@ -0,0 +1,16 @@
+package com.dsh.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.entity.CoachType;
+
+/**
+ * <p>
+ * 教练类型 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface CoachTypeService extends IService<CoachType> {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index 5601534..dcd9be9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -4,6 +4,7 @@
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.feignclient.other.model.SysNotice;
+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;
@@ -14,6 +15,7 @@
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
+import com.dsh.account.util.ResultUtil;
import java.util.List;
@@ -69,4 +71,6 @@
*/
List<StuListVo> switchStudentActions(Integer appUserId, Integer stuId);
+ ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request);
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachServiceImpl.java
new file mode 100644
index 0000000..01a29ad
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachServiceImpl.java
@@ -0,0 +1,20 @@
+package com.dsh.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.Coach;
+import com.dsh.account.mapper.CoachMapper;
+import com.dsh.account.service.CoachService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 教练 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Service
+public class CoachServiceImpl extends ServiceImpl<CoachMapper, Coach> implements CoachService {
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachTypeServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachTypeServiceImpl.java
new file mode 100644
index 0000000..1ae2463
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/CoachTypeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.dsh.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.CoachType;
+import com.dsh.account.mapper.CoachTypeMapper;
+import com.dsh.account.service.CoachTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 教练类型 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Service
+public class CoachTypeServiceImpl extends ServiceImpl<CoachTypeMapper, CoachType> implements CoachTypeService {
+
+}
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 cc2833a..3bcb4d5 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
@@ -135,7 +135,6 @@
List<ExerciseVideo> videos = new ArrayList<>();
-
classInfoVo.setExerciseVideoList(videos);
}else {
classInfoVo.setIsThere(2);
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 17ea0eb..03aac0c 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.Coach;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
@@ -20,6 +21,7 @@
import com.dsh.account.feignclient.other.model.*;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
+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;
@@ -33,6 +35,7 @@
import com.dsh.account.service.TStudentService;
import com.dsh.account.util.DateTimeHelper;
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;
@@ -87,6 +90,9 @@
@Resource
private TAppUserMapper tauMapper;
+
+ @Autowired
+ private CoachMapper coachMapper;
@Override
public void addStuOfAppUser(StuDetailsReq stu,Integer appUserId) {
@@ -206,9 +212,27 @@
getStudentCourse.setStuId(stuId);
getStudentCourse.setAppUserId(appUserId);
StudentOfCourseVo studentCourse = couPayClient.getStudentCourse(getStudentCourse);
+ resp.setCoursePackageId(studentCourse.getCoursePackageId());
+ resp.setStuId(stuId);
+ resp.setPackageImg(studentCourse.getPackageImg());
+ resp.setCourseName(studentCourse.getCourseName());
+ Coach coach = coachMapper.selectById(studentCourse.getCoachId());
+ resp.setTeacherName(coach.getName());
+ resp.setCourseWeek(studentCourse.getCourseWeek());
+ resp.setCourseTime(studentCourse.getCourseTime());
StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(studentCourse.getStoreId());
+ resp.setStoreName(courseOfStore.getStoreName());
+ resp.setStoreAddr(courseOfStore.getStoreAddr());
+ resp.setTypeList(studentCourse.getTypeList());
+ TStudent tStudent = this.baseMapper.selectById(stuId);
+ resp.setStuName(tStudent.getName());
+ resp.setStuPhone(tStudent.getPhone());
+ resp.setStuAge(DateUtil.age(tStudent.getBirthday()));
+ resp.setAmount(studentCourse.getAmount());
+ resp.setVipAmount(studentCourse.getVipAmount());
+ resp.setWpGold(studentCourse.getWpGold());
return resp;
}
@@ -301,4 +325,37 @@
return purchaseRecords;
}
+ @Override
+ public ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request) {
+ // TODO: 2023/7/5
+ switch (request.getPayType()){
+ case 1:
+ WeChatPayment();
+ break;
+ case 2:
+ AlipayPayment();
+ break;
+ case 3:
+ PlaypaiGoldPayment();
+ break;
+ default:
+ break;
+ }
+ return ResultUtil.success();
+ }
+
+
+ public void WeChatPayment(){
+
+ }
+
+ public void AlipayPayment(){
+
+ }
+
+ public void PlaypaiGoldPayment(){
+
+ }
+
+
}
diff --git a/cloud-server-account/src/main/resources/mapper/CoachMapper.xml b/cloud-server-account/src/main/resources/mapper/CoachMapper.xml
new file mode 100644
index 0000000..a428fb3
--- /dev/null
+++ b/cloud-server-account/src/main/resources/mapper/CoachMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.account.mapper.CoachMapper">
+
+
+</mapper>
diff --git a/cloud-server-account/src/main/resources/mapper/CoachTypeMapper.xml b/cloud-server-account/src/main/resources/mapper/CoachTypeMapper.xml
new file mode 100644
index 0000000..8538c32
--- /dev/null
+++ b/cloud-server-account/src/main/resources/mapper/CoachTypeMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.account.mapper.CoachTypeMapper">
+
+
+</mapper>
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 beaf70d..0493559 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
@@ -27,8 +27,8 @@
private final SimpleDateFormat mat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime, @RequestBody Date endTime, @RequestBody List<Integer> userIds){
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,@RequestParam("endTime") Date endTime,@RequestParam("userIds") List<Integer> userIds){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
List<IntroduceRewards> list = idrService.list(new QueryWrapper<IntroduceRewards>()
.ge("startTime",startTime)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index b3a73c4..9e61d1e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -24,7 +24,7 @@
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods(){
List<IntegralCommodity> commodity = new ArrayList<>();
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index b5ebd02..d912d8a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -45,8 +45,8 @@
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId){
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId){
List<CouponStuAvailableVo> availableVos = new ArrayList<>();
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 7839017..d51c91a 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
@@ -4,7 +4,7 @@
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.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -12,9 +12,8 @@
@FeignClient(value = "mb-cloud-activity")
public interface IntroduceRewardsClient {
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody List<Integer> userIds);
-
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("userIds") List<Integer> userIds);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
index 75b0415..41d7f40 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-activity")
public interface MerChandiseClient {
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
index d200c9d..c13d4af 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
@@ -3,7 +3,7 @@
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
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;
@@ -11,7 +11,7 @@
public interface UserConponClient {
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId);
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml b/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
index ebf8e17..c165790 100644
--- a/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
@@ -2,7 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.IntroduceRewardsMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
</mapper>
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/xml/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
similarity index 100%
rename from cloud-server-activity/src/main/java/com/dsh/activity/mapper/xml/PointsMerchandiseMapper.xml
rename to cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
diff --git a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
index 4a2ac89..4cd1ab4 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.UserCouponMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
-
<select id="queryAvailableCouponList" resultType="map">
select
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index c42864e..4601dee 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -2,7 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
</mapper>
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 b08c9ec..8a43523 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
@@ -37,8 +37,8 @@
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime, @RequestBody Date endTime,@RequestParam("appUserId") Integer appUserId){
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("appUserId") Integer appUserId){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
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
index 3a92b86..98d9b2a 100644
--- 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
@@ -4,7 +4,6 @@
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 org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
@@ -13,9 +12,9 @@
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
@RequestParam("appUserId") 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 de4fec9..7f02e63 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
@@ -40,12 +40,12 @@
* @param appUserId 用户id
* @return
*/
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,@RequestBody Date endTime,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
- List<Integer> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
+ List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
.in("coursePackageId", coursePackageIds)
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 66e508c..3194c85 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
@@ -3,12 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.entity.TCoursePackage;
+import com.dsh.course.entity.TCoursePackageDiscount;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.model.*;
+import com.dsh.course.model.dto.DiscountJsonDto;
+import com.dsh.course.service.PostCourseVideoService;
+import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.DateUtil;
import com.dsh.course.util.StrUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +43,12 @@
@Autowired
private TCoursePackageService tcpService;
+ @Autowired
+ private TCoursePackageDiscountService tcpdService;
+
+ @Autowired
+ private PostCourseVideoService pcvService;
+
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
/**
@@ -44,8 +56,8 @@
* @param stuId 学员id
* @return 课包列表
*/
- @PostMapping("/coursePack/queryPayment")
- public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/queryPayment")
+ public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
List<StuCourseResp> resps = new ArrayList<>();
List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,stuId,appUserId);
if (byUserId.size() > 0 ){
@@ -67,7 +79,7 @@
*
* 获取发布的 课包列表
*/
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
public List<CourseOfStoreVo> getStuCourseWithStores(){
List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
if (courseOfStoreVos.size() > 0){
@@ -89,8 +101,8 @@
*
* 课程名称列表
*/
- @PostMapping("/coursePack/sessionNames")
- public List<StuSessionDetailsVo> getStuSessionList(@RequestBody Date startTime, @RequestBody Date endTime, @RequestBody Integer stuId, @RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/sessionNames")
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId,appUserId);
if (byUserId.size() > 0){
@@ -109,8 +121,8 @@
return detailsVos;
}
- @PostMapping("/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestBody Date startTime, @RequestBody Date endTime,@RequestBody Integer stuId, @RequestBody Integer appUserId) {
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime,@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId) {
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
List<TCoursePackagePayment> coursePackage = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
if (coursePackage.size() > 0 ){
@@ -127,8 +139,8 @@
- @PostMapping("/coursePack/stuOfCourses")
- public StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId, @RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/stuOfCourses")
+ public StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
StuWithCoursesListVo lisco = new StuWithCoursesListVo();
Integer totalNu = 0;
Integer dedutNu = 0;
@@ -149,8 +161,8 @@
- @PostMapping("/coursePack/continuingCourse")
- public StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/continuingCourse")
+ public StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
StudentOfCourseVo courseVo = new StudentOfCourseVo();
List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,courseId,stuId,appUserId);
if (tCoursePackagePayments.size() > 0 ){
@@ -208,27 +220,54 @@
}
courseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
- // TODO: 2023/6/30 查询会员折扣数据
String payType = tCoursePackagePayment.getPayType();
BigDecimal cashPayment = tCoursePackagePayment.getCashPayment();
double cashPaymentValue = cashPayment.doubleValue();
Integer playPaiCoin = tCoursePackagePayment.getPlayPaiCoin();
+ TCoursePackageDiscount coursePackageDiscount = tcpdService.getOne(new QueryWrapper<TCoursePackageDiscount>()
+ .eq("coursePackageId",coursePackage.getId() )
+ .eq("type",1)
+ .eq("auditStatus",2));
+ ObjectMapper objectMapper = new ObjectMapper();
+ String content = coursePackageDiscount.getContent();
+ double discountMember = 0.0;
+ DiscountJsonDto discountJsonDto = null;
+ try {
+ discountJsonDto = objectMapper.readValue(content, DiscountJsonDto.class);
+ discountMember = discountJsonDto.getDiscountMember();
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
switch (payType) {
case "1;2":
courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
courseVo.setWpGold(playPaiCoin);
break;
case "1":
courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
break;
case "2":
courseVo.setWpGold(playPaiCoin);
break;
}
-
courseVo.setStoreId(coursePackage.getStoreId());
}
return courseVo;
}
+
+
+ @PostMapping("/base/coursePack/afterCourseTwos")
+ public List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId){
+ List<AfterVideoVo> videoVos = new ArrayList<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,null,null,appUserId);
+ List<Integer> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// List<PostCourseVideo> videoList = pcvService.queryAllVideoNoneShow(coursePackageIds);
+ return videoVos;
+ }
+
+
+
}
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 5416653..4f0f11f 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
@@ -32,8 +32,8 @@
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
Integer sult = 0;
TCoursePackage coursePackage = tcpService.getById(courseId);
if (null != coursePackage && coursePackage.getStatus() == 3){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java b/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java
new file mode 100644
index 0000000..9504da9
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java
@@ -0,0 +1,58 @@
+package com.dsh.course.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 课后视频发布记录
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_post_course_video")
+public class PostCourseVideo extends Model<PostCourseVideo> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ private Integer id;
+ /**
+ * 课包id
+ */
+ private Integer coursePackageId;
+ /**
+ * 上课日期
+ */
+ private Date courseDate;
+ /**
+ * 周几
+ */
+ private Integer courseWeek;
+ /**
+ * 课后视频id
+ */
+ private Integer courseId;
+ /**
+ * 上课日期
+ */
+ private Date postDate;
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
index f58b478..44e1908 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackage.java
@@ -107,18 +107,6 @@
*/
private Integer validDays;
/**
- * 课后练习课程id
- */
- private Integer courseId;
- /**
- * 课后练习视频介绍
- */
- private String introduce;
- /**
- * 完成课后练习获取积分
- */
- private Integer integral;
- /**
* 课程状态（1=未开始，2=进行中，3=已结束，4=已取消）
*/
private Integer status;
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
index 66956dd..64fff3f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackageDiscount.java
@@ -1,8 +1,5 @@
package com.dsh.course.entity;
-import java.util.Date;
-import java.io.Serializable;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,6 +7,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* <p>
@@ -46,7 +45,7 @@
*/
private Integer type;
/**
- * 折扣优惠规则JSON
+ * 折扣优惠规则JSON ->详见 DiscountJsonDto类
*/
private String content;
/**
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 cb7ef3e..4dbd7cb 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
@@ -3,7 +3,7 @@
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.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -11,10 +11,10 @@
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
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
new file mode 100644
index 0000000..b028711
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
@@ -0,0 +1,33 @@
+package com.dsh.course.feignclient;
+
+
+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.RequestParam;
+
+import java.util.List;
+
+@FeignClient(value = "mb-cloud-course")
+public interface CoursePaymentClient {
+
+
+ @PostMapping("/base/coursePack/queryPayment")
+ List<StuCourseResp> getStuCoursePayment();
+
+ @PostMapping("/base/coursePack/storeOfCourse")
+ List<CourseOfStoreVo> getStoreOfCourses();
+
+ @PostMapping("/base/coursePack/stuOfCourses")
+ StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
+
+ @PostMapping("/base/coursePack/continuingCourse")
+ StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
+
+ @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 ef52a27..4a634f7 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
@@ -2,12 +2,14 @@
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;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId, @RequestBody Integer stuId, @RequestBody Integer appUserId);
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
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 8f71d73..97cd94c 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
@@ -5,7 +5,7 @@
import com.dsh.course.feignclient.model.StuSessionDetailsVo;
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.Date;
import java.util.List;
@@ -14,17 +14,17 @@
public interface CourseSessionNameClient {
- @PostMapping("/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/sessionNames")
+ List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
- @PostMapping("/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/AfterVideoVo.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/AfterVideoVo.java
new file mode 100644
index 0000000..2b84761
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/AfterVideoVo.java
@@ -0,0 +1,15 @@
+package com.dsh.course.feignclient.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AfterVideoVo {
+
+ @ApiModelProperty(value = "视频id")
+ private Integer courseId;
+
+ @ApiModelProperty(value = "视频链接")
+ private String courseUrl;
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StudentOfCourseVo.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StudentOfCourseVo.java
index 49b7dbc..6c319f9 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StudentOfCourseVo.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/StudentOfCourseVo.java
@@ -8,37 +8,59 @@
@Data
public class StudentOfCourseVo {
-
+ /**
+ * 课包id
+ */
@ApiModelProperty(value = "课包id")
private Integer coursePackageId;
-
+ /**
+ * 课包封面图
+ */
@ApiModelProperty(value = "课包封面图")
private String packageImg;
-
+ /**
+ * 课包名称
+ */
@ApiModelProperty(value = "课包名称")
private String courseName;
-
+ /**
+ * 授课老师/教练
+ */
@ApiModelProperty(value = "授课老师/教练")
private Integer coachId;
-
+ /**
+ * 上课周
+ */
@ApiModelProperty(value = "上课周 例如：每周二")
private String courseWeek;
-
+ /**
+ * 上课时间
+ */
@ApiModelProperty(value = "上课时间：例如 14:00-16:00")
private String courseTime;
-
+ /**
+ * 课时列表
+ */
@ApiModelProperty(value = "课时列表： 50 70 90")
private List<CourseHoursType> typeList;
-
+ /**
+ * 支付价格
+ */
@ApiModelProperty(value = "支付价格")
private double amount;
-
- @ApiModelProperty(value = "会员价")
+ /**
+ * vip价格
+ */
+ @ApiModelProperty(value = "vip价格")
private double vipAmount;
-
+ /**
+ * 玩湃币
+ */
@ApiModelProperty(value = "玩湃币")
private Integer wpGold;
-
+ /**
+ * 门店id
+ */
@ApiModelProperty(value = "门店id")
private Integer storeId;
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/PostCourseVideoMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/PostCourseVideoMapper.java
new file mode 100644
index 0000000..e4a31e5
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/PostCourseVideoMapper.java
@@ -0,0 +1,16 @@
+package com.dsh.course.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.course.entity.PostCourseVideo;
+
+/**
+ * <p>
+ * 课后视频发布记录 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface PostCourseVideoMapper extends BaseMapper<PostCourseVideo> {
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/dto/DiscountJsonDto.java b/cloud-server-course/src/main/java/com/dsh/course/model/dto/DiscountJsonDto.java
new file mode 100644
index 0000000..3eba0a3
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/dto/DiscountJsonDto.java
@@ -0,0 +1,59 @@
+package com.dsh.course.model.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 折扣类型json字符串封装
+ */
+
+@Data
+public class DiscountJsonDto {
+ /**
+ * type为1，为会员折扣现金支付金额;type为3，为限时折扣现金支付金额
+ */
+ @ApiModelProperty(value = "type为1，为会员折扣现金支付金额 type为3，为限时折扣现金支付金额")
+ private double discountMember;
+ /**
+ * 会员续课现金支付金额
+ */
+ @ApiModelProperty(value = "会员续课现金支付金额")
+ private double continuingMember;
+ /**
+ * 用户续课现金支付金额
+ */
+ @ApiModelProperty(value = "用户续课现金支付金额")
+ private double continuingUser;
+ /**
+ * 有效期开始时间(2023-01-01)
+ */
+ @ApiModelProperty(value = "有效期开始时间")
+ private String lifespanStart;
+ /**
+ * 有效期结束时间
+ */
+ @ApiModelProperty(value = "有效期结束时间")
+ private String lifespanEnd;
+ /**
+ * 赠送课时数
+ */
+ @ApiModelProperty(value = "赠送课时数")
+ private Integer classHours;
+ /**
+ * 周数 （1;2;5）
+ */
+ @ApiModelProperty(value = "周数")
+ private String weekNum;
+ /**
+ * 折扣时间 开始时间(08:00)
+ */
+ @ApiModelProperty(value = "折扣时间 开始时间")
+ private String timeFrameStart;
+ /**
+ * 折扣时间 结束时间
+ */
+ @ApiModelProperty(value = "折扣时间 结束时间")
+ private String timeFrameEnd;
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/PostCourseVideoService.java b/cloud-server-course/src/main/java/com/dsh/course/service/PostCourseVideoService.java
new file mode 100644
index 0000000..950c073
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/PostCourseVideoService.java
@@ -0,0 +1,16 @@
+package com.dsh.course.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.course.entity.PostCourseVideo;
+
+/**
+ * <p>
+ * 课后视频发布记录 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+public interface PostCourseVideoService extends IService<PostCourseVideo> {
+
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/PostCourseVideoServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/PostCourseVideoServiceImpl.java
new file mode 100644
index 0000000..880f02a
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/PostCourseVideoServiceImpl.java
@@ -0,0 +1,20 @@
+package com.dsh.course.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.course.entity.PostCourseVideo;
+import com.dsh.course.mapper.PostCourseVideoMapper;
+import com.dsh.course.service.PostCourseVideoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 课后视频发布记录 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-05
+ */
+@Service
+public class PostCourseVideoServiceImpl extends ServiceImpl<PostCourseVideoMapper, PostCourseVideo> implements PostCourseVideoService {
+
+}
diff --git a/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml b/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml
new file mode 100644
index 0000000..9d93eb3
--- /dev/null
+++ b/cloud-server-course/src/main/resources/mapper/PostCourseVideoMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.course.mapper.PostCourseVideoMapper">
+
+</mapper>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java
index 486d3a4..772f5f4 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/AgreementMapper.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsh.course.entity.Agreement;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+@Mapper
public interface AgreementMapper extends BaseMapper<Agreement> {
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
index ae9072a..0f7bd74 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
@@ -7,10 +7,7 @@
import com.dsh.other.model.vo.questionVo.QuestionIns;
import com.dsh.other.service.FrequentlyAskedQuestionsService;
import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -50,7 +47,7 @@
@PostMapping("/base/notice/queryQuestion")
- public QuestionIns getSysQuestionBuId(@RequestBody Integer quesId){
+ public QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId){
QuestionIns sysNotice = new QuestionIns();
FrequentlyAskedQuestions notice = faqService.getById(quesId);
if (null != notice){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index f7b218a..0ee00b1 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -22,7 +22,7 @@
private HonorRulesService hrService;
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds){
List<StuMedalVo> stuMedalVos = new ArrayList<>();
List<HonorRules> honorRules = hrService.list(new QueryWrapper<HonorRules>()
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
index f7c9582..2df2b0f 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
@@ -35,7 +35,7 @@
/**
* 获取 没有学员信息的图片配置
*/
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
public List<TImgConfig> getDriver(){
return imgConfigService.list(new QueryWrapper<TImgConfig>()
.eq("position", 1));
@@ -59,7 +59,7 @@
}
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig(){
UserBenefitImage image = new UserBenefitImage();
ArrayList<Integer> integers = new ArrayList<>();
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 3ab7122..96e7621 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
@@ -45,7 +45,7 @@
}
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- public List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude,@RequestBody String latitude){
+ public List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
String current = longitude+","+latitude;
List<StoreInfo> storeInfos = new ArrayList<>();
String cityCode = "";
@@ -85,7 +85,7 @@
@PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude){
+ public List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
List<StoreLonLatList> storeInfos = new ArrayList<>();
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
index 04c441b..e6da020 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
@@ -8,10 +8,7 @@
import com.dsh.other.service.NoticeService;
import com.dsh.other.service.PhoneService;
import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -53,7 +50,7 @@
@PostMapping("/base/notice/queryNotice")
- public SysNotice getSysNoticeBuId(@RequestBody Integer noticeId){
+ public SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId){
SysNotice sysNotice = new SysNotice();
Notice notice = noticeSers.getById(noticeId);
if (null != notice){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
index 05f5d00..9164a00 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-other")
public interface HonorDeClient {
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
index 5ab9163..4d552bb 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
@@ -10,11 +10,11 @@
@FeignClient(value = "mb-cloud-other")
public interface ImgConfigClient {
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
List<TImgConfig> getNoneStuImgs();
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
index f42577e..f6d08bb 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
@@ -3,7 +3,7 @@
import com.dsh.other.feignclient.model.SysNotice;
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;
@@ -16,7 +16,7 @@
List<SysNotice> getSysNoticeDetails();
@PostMapping("/base/notice/queryNotice")
- SysNotice getSysNoticeBuId(@RequestBody Integer noticeId);
+ SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId);
@PostMapping("/base/notice/sysTell")
List<String> queryCustomerTel();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
index a37da84..afdde84 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
@@ -4,7 +4,7 @@
import com.dsh.other.model.vo.questionVo.QuestionIns;
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;
@FeignClient(value = "mb-cloud-other")
@@ -14,6 +14,6 @@
QuestionDetailsVo getSysQuestionDetails();
@PostMapping("/base/notice/queryQuestion")
- QuestionIns getSysQuestionBuId(@RequestBody Integer quesId);
+ QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId);
}
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 67097be..65f4ae7 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
@@ -5,7 +5,7 @@
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;
@@ -13,14 +13,14 @@
public interface StoreClient {
- @PostMapping("/storeDetail/courseOfSto")
- public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId);
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
+ StoreDetailOfCourse getCourseOfStore(@RequestParam("storeId") Integer storeId);
- @PostMapping("/storeDetail/nearbyStore")
- List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
+ List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
- @PostMapping("/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
+ List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java b/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java
deleted file mode 100644
index 93874b3..0000000
--- a/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.other.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 荣誉规则 前端控制器
- * </p>
- *
- * @author jqs
- * @since 2023-07-04
- */
-@RestController
-@RequestMapping("/honor-rules")
-public class HonorRulesController {
-
-}
-
--
Gitblit v1.7.1