11.29

nickchange

2023-11-29 d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea

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

@@ -18,10 +18,8 @@
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.CoachClient;
import com.dsh.course.feignclient.account.StudentClient;
import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Coach;
import com.dsh.course.feignclient.account.model.Student;
import com.dsh.course.feignclient.account.model.TCourseInfoRecord;
import com.dsh.course.feignclient.account.UserIntegralChangesClient;
import com.dsh.course.feignclient.account.model.*;
import com.dsh.course.feignclient.activity.BenefitVideoClient;
import com.dsh.course.feignclient.activity.CouponClient;
import com.dsh.course.feignclient.activity.model.BenefitsVideos;
@@ -118,9 +116,11 @@
    @Autowired
    private ICoursePackageSchedulingService coursePackageSchedulingService;


    @Autowired
    private RestTemplate internalRestTemplate;

    @Resource
    private UserIntegralChangesClient userIntegralChangesClient;


    @Override
@@ -321,7 +321,6 @@
    @Override
    public CourseOfVideoResponse queryVideoDetails(CourseWithDetailsRequest detailsRequest, Integer appUserId) {
        CourseOfVideoResponse response = new CourseOfVideoResponse();
//        BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(detailsRequest.getVideoId());
        TCourse byId = courseService.getById(detailsRequest.getVideoId());
        TCoursePackage coursePackage = tcpmapper.selectById(detailsRequest.getCoursePackageId());
        CoursePackageScheduling byId1 = new CoursePackageScheduling();
@@ -368,6 +367,17 @@
            userVideoDetails.setState(2);
            userVideoDetails.setUpdateTime(new Date());
            uvdmapper.updateById(userVideoDetails);

            CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getById(detailsRequest.getScId());
            //添加积分
            AppUser appUser = appuClient.queryAppUser(coursePackageScheduling.getAppUserId());
            appUser.setIntegral((null == appUser.getIntegral() ? 0 : appUser.getIntegral()) + (null == coursePackageScheduling.getIntegral() ? 0 : coursePackageScheduling.getIntegral()));
            appuClient.updateAppUser(appUser);
            SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
            vo.setAppUserId(coursePackageScheduling.getAppUserId());
            vo.setIntegral(coursePackageScheduling.getIntegral());
            vo.setType(4);
            userIntegralChangesClient.saveUserIntegralChanges(vo);
            return "SUCCESS";
        }
        return "ERROR";
@@ -511,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());
@@ -522,6 +540,7 @@
            }
            Store store = storeClient.queryStoreById(coursePackage.getStoreId());
            response.setStoreName(store.getName());
            response.setStoreAddress(store.getAddress());

            if (ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)) {
                Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
@@ -589,7 +608,9 @@
                    response.setVipAmount(discountMember);
                    break;
                case 3:
                    response.setWpGold(playPaiCoin);
                    if (playPaiCoin!=null) {
                        response.setWpGold(playPaiCoin);
                    }
                    break;
            }

@@ -707,16 +728,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()) {