修复模块中的地址

lisy

2023-07-05 20cc9b22e1cdb93d081c6596ec762e9f928e208a

修复模块中的地址

 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 {

 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);



}

 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();



 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);

}

 cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java

@@ -4,16 +4,16 @@
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;

@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
    @PostMapping("/competition/getCompetitionsDetails")
    public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime,
                                                   @RequestBody Date  endTime,
                                                   @RequestBody Integer appUserId);
    @PostMapping("/base/competition/getCompetitionsDetails")
    public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime,
                                                   @RequestParam("endTime") Date  endTime,
                                                   @RequestParam("appUserId") Integer appUserId);

}

 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);

}

 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java

@@ -6,7 +6,7 @@
import com.dsh.account.feignclient.course.model.StudentOfCourseVo;
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;

@@ -14,19 +14,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")
    StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId,
                                                      @RequestBody Integer appUserId);
    @PostMapping("/base/coursePack/stuOfCourses")
    StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
                                                @RequestParam("appUserId") Integer appUserId);

    @PostMapping("/coursePack/continuingCourse")
    StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,
                                       @RequestBody Integer stuId,
                                       @RequestBody Integer appUserId);
    StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
                                       @RequestParam("stuId") Integer stuId,
                                       @RequestParam("appUserId") Integer appUserId);
}

 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);

}

 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java

@@ -5,7 +5,7 @@
import com.dsh.account.feignclient.course.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,16 +14,16 @@
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);

}

 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);

}

 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();
}

 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();

 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);

}

 cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java

@@ -2,21 +2,12 @@

import com.dsh.account.feignclient.course.model.QueryStoreList;
import com.dsh.account.feignclient.other.model.Store;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;

/**
 * @author zhibing.pu
 * @date 2023/6/24 15:54
 */
import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.account.feignclient.other.model.StoreInfo;
import com.dsh.account.feignclient.other.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;

@@ -39,14 +30,14 @@



    @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);
}

 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;

 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)

 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>()

 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java

@@ -30,8 +30,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<>();


 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);
}

 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();



 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);

}

 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>

 cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml

 cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml

@@ -2,7 +2,4 @@
<!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"/>

</mapper>

 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>

 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<>();


 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);

}

 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)

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -44,8 +44,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 +67,7 @@
     *
     * 获取发布的 课包列表
     */
    @PostMapping("/coursePack/storeOfCourse")
    @PostMapping("/base/coursePack/storeOfCourse")
    public List<CourseOfStoreVo> getStuCourseWithStores(){
        List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
        if (courseOfStoreVos.size() > 0){
@@ -89,8 +89,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 +109,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 +127,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 +149,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 ){
@@ -159,7 +159,7 @@
            tCoursePackagePayments.forEach(cou -> {
                CourseHoursType hoursType = new CourseHoursType();
                hoursType.setCourseConfigId(cou.getId());
                hoursType.setCourseConfigId(cou.getClassHours());
                hoursType.setCourseHourNums(cou.getClassHours());
                typeList.add(hoursType);
            });
            TCoursePackagePayment tCoursePackagePayment = tCoursePackagePayments.get(0);

 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){

 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);

}

 cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java

@@ -1,11 +1,13 @@
package com.dsh.course.feignclient;



import com.dsh.course.feignclient.model.*;
import com.dsh.course.feignclient.model.CourseOfStoreVo;
import com.dsh.course.feignclient.model.StuCourseResp;
import com.dsh.course.feignclient.model.StuWithCoursesListVo;
import com.dsh.course.feignclient.model.StudentOfCourseVo;
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,18 +15,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")
    StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId,@RequestBody Integer appUserId);
    @PostMapping("/base/coursePack/stuOfCourses")
    StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
                                                @RequestParam("appUserId") Integer appUserId);

    @PostMapping("/coursePack/continuingCourse")
    StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,
                                       @RequestBody Integer stuId,
                                       @RequestBody Integer appUserId);
    @PostMapping("/base/coursePack/continuingCourse")
    StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
                                       @RequestParam("stuId") Integer stuId,
                                       @RequestParam("appUserId") Integer appUserId);

}

 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);

}

 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);

}

 cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java

@@ -8,7 +8,7 @@
public class CourseHoursType {

    @ApiModelProperty(value = "课时id")
    private Integer courseConfigId;
    private Long courseConfigId;

    @ApiModelProperty(value = "课时数")
    private Integer courseHourNums;

 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){

 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>()

 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<>();

 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);

 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){

 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);

}

 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();

}

 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();

 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);

}

 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);
}

 cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java

File was deleted