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

44323

2023-11-21 b4c77c0839258280044cf65a15471fa3c20d465f

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

@@ -468,6 +468,14 @@
        AppUser appUser = appuClient.queryAppUser(appUserId);
        CourseDetailsResponse response = new CourseDetailsResponse();
        TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
        List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
        List<Integer> stuIds = new ArrayList<>();
        for (TCoursePackagePayment coursePackagePayment : tCoursePackagePayments) {
            stuIds.add(coursePackagePayment.getStudentId());
        }
        response.setStuIds(stuIds);
        response.setChooseHours(tCoursePackagePayment.getClassHours());


        if (null != tCoursePackagePayment){
            TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
@@ -537,16 +545,16 @@
                }
            }

//            switch (payType) {
//                case 1:
//                case 2:
//                    response.setAmount(cashPaymentValue);
//                    response.setVipAmount(discountMember);
//                    break;
//                case 3:
//                    response.setWpGold(playPaiCoin);
//                    break;
//            }
            switch (payType) {
                case 1:
                case 2:
                    response.setAmount(cashPaymentValue);
                    response.setVipAmount(discountMember);
                    break;
                case 3:
                    response.setWpGold(playPaiCoin);
                    break;
            }

//            coursePackage.get

@@ -661,6 +669,22 @@
                    }
                    coursePackagePaymentConfigVo.setPaymentPrice(paymentPrice);


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


                    if (coursePackagePaymentConfigVo.getPaymentPrice()<coursePackagePaymentConfigVo.getVipPrice()){
                        coursePackagePaymentConfigVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
                        coursePackagePaymentConfigVo.setVipPrice(null);
@@ -682,7 +706,7 @@
                }
                list.add(coursePackagePaymentConfigVo);
            });
//            coursePackageInfo.setList(list);
            response.setList(list);