nickchange
2023-11-05 be8a63ba1e3f2e26f5cdefe519c37ad4cfd90435
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -284,8 +284,9 @@
                classInfoVo.setHeight(tStudent.getHeight());
                classInfoVo.setWeight(tStudent.getWeight());
                classInfoVo.setBmi(tStudent.getBmi());
                if (tStudent.getBmi()!=null) {
                classInfoVo.setBodyStatus(BMIBodyUtil.getBodyStatus(tStudent.getBmi()));
                }
                List<RegisteredCourse> courseList = new ArrayList<>();
                List<StuCourseResp> stuCoursePayment = paymentClient.getStuCoursePayment(tStudent.getId());
                List<Integer> coursePackIds = new ArrayList<>();
@@ -302,7 +303,6 @@
                        course.setPeriodOfValidity(tCoursePackagePayment.getPeriodOfValidity());
                        courseList.add(course);
                    }
                }
                classInfoVo.setCourseList(courseList);
//                List<ExerciseVideo> stuCourseOfVideoList = voclClient.getStuCourseOfVideoList(coursePackIds);
@@ -799,6 +799,13 @@
                details.add(consumeDetail);
            }
        }
        //8.积分商场
        List<ConsumeDetail> consumeDetails = mcClient.getConsumeDetails(requestVo);
        details.addAll(consumeDetails);
        if (details.size() > 0 ){
            Collections.sort(details, new Comparator<ConsumeDetail>() {
                @Override
@@ -1321,7 +1328,10 @@
            switch (exchangeType.getExchangeType()){
//            积分
                case 1:
                    boolean b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    boolean b =true;
                    for (int i = 0; i < goodsNums; i++) {
                         b = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    }
                    if (b){
                        switch (exchangeType.getGoodsType()){
                            case 2:
@@ -1375,7 +1385,11 @@
                    break;
                case 2:
//                积分+现金
                    boolean dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    boolean dealt =true;
                    for (int i = 0; i < goodsNums; i++) {
                        dealt = dealAppUserIntegral(userIdFormRedis,tAppUser,merchandise.getIntegral());
                    }
                    switch (exchangeType.getPayType()) {
                        case 1:
                            try {