Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 32106f511657695e79d53e98a350ce70a36f6da1

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

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

@@ -183,6 +183,7 @@
        coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice());
        coursePackageOrder.setCashPayment(packagePayment.getCashPayment());
        coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin());
        coursePackageOrder.setCode(packagePayment.getCode());
        coursePackageOrder.setPayStatus(1);
        coursePackageOrder.setState(1);
        coursePackageOrder.setInsertTime(new Date());

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

@@ -529,7 +529,7 @@


        response.setChooseHours(coursePackageOrder.getClassHours());
        response.setStuIds(coursePackageOrder.getStudentIds().split(","));
        response.setStuIds(coursePackageOrder.getStudentIds().split(";"));
        response.setPayType(coursePackageOrder.getPayType());
        response.setPayPrice(coursePackageOrder.getCashPayment());
        response.setCoinPrice(coursePackageOrder.getPlayPaiCoin());

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

@@ -1860,82 +1860,83 @@
     */
    @Override
    public void updateCoursePackageById(TCoursePackage coursePackage) {
        try {
            List<CoursePackageStudent> coursePackageStudents = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackage.getId()));
            List<Long> collect = coursePackageStudents.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());

            QueryWrapper<CoursePackageScheduling> coursePackageSchedulingQueryWrapper = new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId());
            if (collect.size() > 0) {
                coursePackageSchedulingQueryWrapper.notIn("id", collect);
            }
            coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
            int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", coursePackage.getId()));
            if (coursePackageId>0) {
//        try {
//            List<CoursePackageStudent> coursePackageStudents = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackage.getId()));
//            List<Long> collect = coursePackageStudents.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//
//            QueryWrapper<CoursePackageScheduling> coursePackageSchedulingQueryWrapper = new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId());
//            if (collect.size() > 0) {
//                coursePackageSchedulingQueryWrapper.notIn("id", collect);
//            }
//            coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
//            int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", coursePackage.getId()));
//            if (coursePackageId>0) {
                this.baseMapper.updateById(coursePackage);

                //生成排课数据
                Date date = null;
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
                if (null != coursePackageScheduling) {
                    date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
                } else {
                    date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
//                Date date = null;
//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
//                if (null != coursePackageScheduling) {
//                    date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
//                } else {
//                    date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
//                }
//                List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
//                String classStartTime = coursePackage.getClassStartTime();
//                String[] split = classStartTime.split(":");
//                String classEndTime = coursePackage.getClassEndTime();
//                String[] split1 = classEndTime.split(":");
//                Calendar s = Calendar.getInstance();
//                s.setTime(date);
//                s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
//
//                Calendar e = Calendar.getInstance();
//                e.setTime(date);
//                if (null != coursePackageScheduling) {
//                    long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
//                    int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
//                    e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
//                } else {
//                    e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
//                }
//                long timeInMillis = e.getTimeInMillis();
//
//                while (true) {
//                    int w = s.get(Calendar.DAY_OF_WEEK);
//                    WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
//                    if (list.contains(weekEnum.getChineseName())) {
//                        Calendar classDate = Calendar.getInstance();
//                        classDate.setTime(s.getTime());
//                        classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
//                        classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
//                        classDate.set(Calendar.SECOND, 0);
//
//                        Calendar endDate = Calendar.getInstance();
//                        endDate.setTime(s.getTime());
//                        endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
//                        endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
//                        endDate.set(Calendar.SECOND, 0);
//
//                        CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
//                        coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
//                        coursePackageScheduling1.setClassDate(classDate.getTime());
//                        coursePackageScheduling1.setEndDate(endDate.getTime());
//                        coursePackageScheduling1.setStatus(1);
//                        coursePackageSchedulingService.save(coursePackageScheduling1);
//                    }
//                    s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
//                    if (s.getTimeInMillis() > timeInMillis) {
//                        break;
//                    }
//                }
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
                }
                List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
                String classStartTime = coursePackage.getClassStartTime();
                String[] split = classStartTime.split(":");
                String classEndTime = coursePackage.getClassEndTime();
                String[] split1 = classEndTime.split(":");
                Calendar s = Calendar.getInstance();
                s.setTime(date);
                s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);

                Calendar e = Calendar.getInstance();
                e.setTime(date);
                if (null != coursePackageScheduling) {
                    long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
                    int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
                    e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
                } else {
                    e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
                }
                long timeInMillis = e.getTimeInMillis();

                while (true) {
                    int w = s.get(Calendar.DAY_OF_WEEK);
                    WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
                    if (list.contains(weekEnum.getChineseName())) {
                        Calendar classDate = Calendar.getInstance();
                        classDate.setTime(s.getTime());
                        classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
                        classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
                        classDate.set(Calendar.SECOND, 0);

                        Calendar endDate = Calendar.getInstance();
                        endDate.setTime(s.getTime());
                        endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
                        endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
                        endDate.set(Calendar.SECOND, 0);

                        CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
                        coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
                        coursePackageScheduling1.setClassDate(classDate.getTime());
                        coursePackageScheduling1.setEndDate(endDate.getTime());
                        coursePackageScheduling1.setStatus(1);
                        coursePackageSchedulingService.save(coursePackageScheduling1);
                    }
                    s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
                    if (s.getTimeInMillis() > timeInMillis) {
                        break;
                    }
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }


    /**

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java

@@ -13,6 +13,7 @@
import com.dsh.course.feignClient.other.SiteClient;
import com.dsh.course.feignClient.other.StoreClient;
import com.dsh.course.feignClient.other.model.Banner;
import com.dsh.course.util.UUIDUtil;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.modular.system.model.*;
@@ -106,8 +107,8 @@
     *  添加购课记录
     */
    @ResponseBody
    @PostMapping(value = "/addCoursePackagePayment/{id}")
    public Object addCoach(@RequestBody TCoursePackagePayment tCoursePackagePayment, @PathVariable("id")Integer id) {
    @PostMapping(value = "/addCoursePackagePayment")
    public Object addCoach(@RequestBody TCoursePackagePayment tCoursePackagePayment) {
        Integer objectId = UserExt.getUser().getObjectId();
        Integer objectType = UserExt.getUser().getObjectType();
        String name = UserExt.getUser().getName();
@@ -145,6 +146,7 @@
//                jsonObject = JSONObject.fromObject(tCoursePackageDiscount.getContent());
//            }
//            // 获取所选课时的课包价格配置
        if (tCoursePackagePayment.getCoursePackageConfigId()!=null) {
            List<CoursePackagePaymentConfig> coursePackagePaymentConfigs =
                    coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList1
                            (tCoursePackagePayment.getCoursePackageConfigId());
@@ -152,6 +154,12 @@
                CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigs.get(0);
                tCoursePackagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
//                tCoursePackagePayment.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
            }
        }else {
            List<CoursePackagePaymentConfig> coursePackagePaymentConfigs = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(coursePackageId);
            CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigs.get(0);
            tCoursePackagePayment.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());

            }
//            // 原价
//            Double originalPrice = tCoursePackagePayment.getOriginalPrice();
@@ -288,7 +296,11 @@
//            BigDecimal bigDecimal = new BigDecimal(minValue);
//            tCoursePackagePayment.setCashPayment(bigDecimal);
//        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");

        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);

        tCoursePackagePayment.setCode(code);
        return coursePackagePaymentClient.addCoursePackagePayment(tCoursePackagePayment);
    }


 cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js

@@ -299,11 +299,24 @@
        Feng.info("请选择课包名称")
        return;
    }

    var selectElement = document.getElementById('coursePackageName');
    var selectedOption = selectElement.options[selectElement.selectedIndex];
    console.log("插入")
    var type = selectedOption.getAttribute('data-type');
    console.log('type----------'+type)



if (type==1) {
    if (role == 1) {
        if ($("#courseTime").val() == '') {
            Feng.info("请选择课时规格")
            return;
        }
    }
}else {
    data.classHours = 0
    }
    if($("#cashPayment").val()==''){
        Feng.info("请输入支付金额")
@@ -322,7 +335,7 @@
        courseTimeId=0;
    }
    $.ajax({
        url: Feng.ctxPath + "/cpPayment/addCoursePackagePayment/"+ courseTimeId,
        url: Feng.ctxPath + "/cpPayment/addCoursePackagePayment",
        type: "POST",
        contentType: "application/json", // 设置请求头的 Content-Type
        data: JSON.stringify(data), // 将数据转换为 JSON 字符串
@@ -361,7 +374,8 @@
        if(data!=null){

            $.each(data, function(k,v) {
                content += "<option value='"+v.id+"'>"+v.name+"</option>";
                // content += "<option value='"+v.id+"'>"+v.name+"</option>";
                content += "<option value='"+v.id+"'  data-type='"+v.type+"'>"+v.name+"</option>";
            });
            $("#coursePackageName").empty().append(content);
        }