Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

@@ -130,13 +130,8 @@

    @Override
    public int changeState(CoursePackagePayDTO dto) {
        List<String> ids = dto.getIds();
        List<Long> list = new ArrayList<>();
        for (String id : ids) {
            long value = Long.parseLong(id);
            list.add(value);
        }
        return cpConfigMapper.changeState(list, dto.getPayUserName(), dto.getUserId());

        return cpConfigMapper.changeState(Long.valueOf(dto.getIds()), dto.getPayUserName(), dto.getUserId());
    }

    @Override
@@ -526,6 +521,14 @@
        AppUser appUser = appuClient.queryAppUser(appUserId);
        CourseDetailsResponse response = new CourseDetailsResponse();
        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePayId);
        if (coursePackageOrder==null){
//             student = coursePackageStudentService.getById(coursePayId);
            CoursePackageOrderStudent student = coursePackageOrderStudentService.getById(coursePayId);

            coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>().eq("appUserId", student.getAppUserId()).like("studentIds", student.getStudentId()).eq("coursePackageId", student.getCoursePackageId()).orderByDesc("insertTime").last("limit 1"));

        }



        response.setChooseHours(coursePackageOrder.getClassHours());
@@ -604,7 +607,9 @@
                    response.setVipAmount(discountMember);
                    break;
                case 3:
                    response.setWpGold(playPaiCoin);
                    if (playPaiCoin!=null) {
                        response.setWpGold(playPaiCoin);
                    }
                    break;
            }

@@ -722,16 +727,16 @@
                    TCoursePackageDiscount discount = coursePackageDiscountService.getOne(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
                            .eq("type", 2).eq("auditStatus", 2));

                    Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
                    Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");


                    if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
                        coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
                    }
                    if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
                        coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
                    }
//                    Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
//                    Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
//
//
//                    if (coursePackagePaymentConfigVo.getPaymentPrice() > continuingMember) {
//                        coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
//                    }
//                    if (coursePackagePaymentConfigVo.getVipPrice() > vipcontinuingMember) {
//                        coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
//                    }


                    if (coursePackagePaymentConfigVo.getPaymentPrice() < coursePackagePaymentConfigVo.getVipPrice()) {
@@ -1204,6 +1209,7 @@
    @Override
    public List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, QueryRegistrationRecord queryRegistrationRecord) {
        Integer coursePackageId = queryRegistrationRecord.getCoursePackageId();
        TCoursePackage coursePackage = coursePackageService.getById(coursePackageId);
        String userName = queryRegistrationRecord.getUserName();
        List<Integer> userIds = null;
        List<Integer> studentIds = null;
@@ -1220,12 +1226,23 @@
                studentIds = students.stream().map(Student::getId).collect(Collectors.toList());
            }
        }
        List<Map<String, Object>> list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);

        List<Map<String, Object>> list = new ArrayList<>();

        if (coursePackage.getType()==1){
      list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);}else {
            list = this.baseMapper.queryRegistrationRecord1(page, coursePackageId, userIds, studentIds);
        }
        for (Map<String, Object> map : list) {

            Long id = Long.valueOf(map.get("id").toString());
            Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
            Integer studentId = Integer.valueOf(map.get("studentId").toString());
            Integer studentId = 0;
            if (coursePackage.getType()==1) {
                studentId = Integer.valueOf(map.get("studentId").toString());
            }else {
                studentId = Integer.valueOf(map.get("studentIds").toString());
            }

            TAppUser appUser = appuClient.queryAppUser1(appUserId);
            map.put("userName", null != appUser ? appUser.getName() : "");