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

44323

2023-11-22 f6ba3e15355e22767e69f8fc14ae22523f8db8dc

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

@@ -328,13 +328,16 @@
//        BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(detailsRequest.getVideoId());
        TCourse byId = courseService.getById(detailsRequest.getVideoId());
        TCoursePackage coursePackage = tcpmapper.selectById(detailsRequest.getCoursePackageId());
        CoursePackageScheduling byId1 = new CoursePackageScheduling();
        if (detailsRequest.getScId()!=null){
            byId1 = coursePackageSchedulingService.getById(detailsRequest.getScId());
        }

        if (null != coursePackage){
            response.setCoursePackageId(coursePackage.getId());
            response.setVideoId(byId.getId());
            response.setVideoURL(byId.getCourseVideo());
            response.setVideoName(coursePackage.getName());
//            response.setIntegral(byId.getIntegral());
            UserVideoDetails userVideoDetails = uvdmapper.selectOne(new QueryWrapper<UserVideoDetails>()
                    .eq("appUserId",appUserId )
                    .eq("coursePackageId",coursePackage.getId())
@@ -349,6 +352,10 @@
            response.setSynopsis(byId.getIntroduce());
            response.setDetailedDiagram(byId.getIntroductionDrawing());
            response.setCover(byId.getCoverDrawing());
            if (byId1.getIntegral()!=null) {
                response.setIntegral(String.valueOf(byId1.getIntegral()));
            }

        }

        return response;
@@ -482,6 +489,18 @@
            if (coursePackage.getType()==2) {
                response.setTime(new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy.MM.dd").format(coursePackage.getEndTime()));
            }

//            Store store = storeClient.queryStoreById(coursePackage.getStoreId());
//            response.setStoreName(store.getName());
//            response.setStoreCoverDrawing(store.getCoverDrawing());
//            response.setStoreAddress(store.getAddress());
//            response.setLon(store.getLon());
//            response.setLat(store.getLat());
//            if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
//                Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
//                double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
//                response.setDistance(wgs84);
//            }


            response.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
@@ -1361,6 +1380,9 @@
    @Autowired
    private CoursePackageStudentService coursePackageStudentService;

    @Autowired
    private  CourseCounsumService courseCounsumService;

    @Override
    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
    public ResultUtil payCourse(PayCourseReq req,Integer userId) throws ParseException {
@@ -1513,14 +1535,24 @@


        // 2.0
        TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
        tCourseInfoRecord.setUserId(userId);
        tCourseInfoRecord.setCourseId(req.getCourseId());
        tCourseInfoRecord.setName("体验购课");
        tCourseInfoRecord.setNum(req.getNum());
        tCourseInfoRecord.setTime(new Date());
        tCourseInfoRecord.setType(2);
        appuClient.addCourseInfoRecord(tCourseInfoRecord);
//        TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
//        tCourseInfoRecord.setUserId(userId);
//        tCourseInfoRecord.setCourseId(req.getCourseId());
//        tCourseInfoRecord.setName("体验购课");
//        tCourseInfoRecord.setNum(req.getNum());
//        tCourseInfoRecord.setTime(new Date());
//        tCourseInfoRecord.setType(2);
//        appuClient.addCourseInfoRecord(tCourseInfoRecord);

        CourseCounsum courseCounsum = new CourseCounsum();
        courseCounsum.setPaymentId(tCoursePackagePayment.getId());
        courseCounsum.setChangeType(0);
        courseCounsum.setNum(req.getNum());
        courseCounsum.setInsertTime(new Date());
        courseCounsum.setReason("体验购课");
        courseCounsum.setAppUserId(userId);
        courseCounsumService.save(courseCounsum);



        if(tCoursePackagePayment.getLaveClassHours()<=3){
@@ -1555,7 +1587,7 @@

    @Override
    public boolean updateHoursById(TCoursePackagePayment byId, int i) {
        return this.baseMapper.updateHoursById(byId.getId(),i);
        return this.baseMapper.updateHoursById1(byId.getId(),i);
    }