10.27.2

nickchange

2023-10-27 b2573583e7c70827fa90111ff1d769f79603edd0

10.27.2

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -101,7 +101,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -113,7 +113,7 @@
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -157,7 +157,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -169,7 +169,7 @@
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");

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

@@ -63,9 +63,11 @@
            longs.add(coursePackageStudent.getCoursePackageSchedulingId());
        }
        System.out.println("======longs========"+longs);
        List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
//        List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
        List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);


        if (coursePackageSchedulings1!=null){
        for (AppUserVideoResponse appUserVideoResponse : coursePackageSchedulings1) {
            ExerciseVideo exerciseVideo = new ExerciseVideo();
            exerciseVideo.setVideoId(appUserVideoResponse.getVideoId());
@@ -76,7 +78,7 @@
        }



}

//        return pcvService.queryCourseOfVideos(coursePackIds);
        return exerciseVideoList;

 cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java

@@ -139,21 +139,23 @@

    @Override
    public List<AppUserVideoResponse> queryAll(List<Long> longs) {
        List<AppUserVideoResponse> appUserVideoResponses = this.baseMapper.queryAll(longs);

        for (AppUserVideoResponse appUserVideoRespon : appUserVideoResponses) {
            if (appUserVideoRespon.getVideoId() != null) {
                if (this.baseMapper.isHave(appUserVideoRespon.getVideoId()) > 0) {
                    appUserVideoRespon.setStudyStatus(1);
                } else {
                    appUserVideoRespon.setStudyStatus(0);
        if (longs.size()>0) {
            List<AppUserVideoResponse> appUserVideoResponses = this.baseMapper.queryAll(longs);

            for (AppUserVideoResponse appUserVideoRespon : appUserVideoResponses) {
                if (appUserVideoRespon.getVideoId() != null) {
                    if (this.baseMapper.isHave(appUserVideoRespon.getVideoId()) > 0) {
                        appUserVideoRespon.setStudyStatus(1);
                    } else {
                        appUserVideoRespon.setStudyStatus(0);
                    }
                }
            }
        }
        

            return appUserVideoResponses;
        
        

        }else return null;
        
    }
}

 cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml

@@ -34,10 +34,13 @@
        SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing,tc.name as videoName,tc.introduce as synopsis,cs.integral,tc.courseVideo as courseVideo
        FROM t_course_package_scheduling cs
                 LEFT JOIN t_course tc ON cs.courseId = tc.id
        WHERE cs.courseId IS NOT NULL and cs.id in
        <foreach collection="longs" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>
        WHERE cs.courseId IS NOT NULL
        <if test="longs != null">
            AND cs.id IN
            <foreach collection="longs" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

    </select>
    <select id="isHave" resultType="int">

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -35,6 +35,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@@ -404,6 +405,20 @@

            List<Integer> ids = getIds(byId.getSiteId());
            byId.setStorePhone(byId1.getPhone());
            
            //拼接开始结束时间
            Date startTime = byId.getStartTime();
            Date endTime = byId.getEndTime();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");

            String startTimeString = sdf.format(startTime);
            String endTimeString = sdf.format(endTime);

            String result = startTimeString + "-" + endTimeString.substring(11);
            byId.setTimes(result);




            byId.setSid(Arrays.asList(storeId));
            List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));