重写课包支付和排课逻辑

puzhibing

2023-11-25 53e7558400dcacecdce70e39ebfe1727740f9296

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

@@ -123,9 +123,6 @@
    private RestTemplate internalRestTemplate;





    @Override
    public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
        return cpConfigMapper.listAll(query);
@@ -208,7 +205,8 @@
                if (!cityCode.equals(studentQeryDto.getCityCode())) {
                    iterator.remove(); // Remove the element from the list
                }
            }}
                }
            }
        }

        if (studentQeryDto.getStudentName()!=null&&studentQeryDto.getStudentName()!=""){
@@ -268,6 +266,7 @@

    /**
     * 获取课包购买人数
     *
     * @param coursePackageId
     * @return
     */
@@ -320,8 +319,10 @@
        }
        return responses;
    }

    @Autowired
    private TCourseService courseService;

    @Override
    public CourseOfVideoResponse queryVideoDetails(CourseWithDetailsRequest detailsRequest,Integer appUserId) {
        CourseOfVideoResponse response = new CourseOfVideoResponse();
@@ -404,9 +405,6 @@
//                .in("id",paysId ));





        System.out.println(tCoursePackagePayments);
        if (tCoursePackagePayments.size() > 0){
            try {
@@ -417,7 +415,7 @@
                    // 2.0
                    registerCourseVo.setType(coursePackage.getType());

                    registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId());
                    registerCourseVo.setOrderId(tCoursePackagePayment.getOrderId().longValue());
                    registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
                    registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
                    registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
@@ -498,28 +496,25 @@
    @Autowired
    private  TCoursePackageDiscountService coursePackageDiscountService;

    @Resource
    StoreClient storeClient;

    @Resource StoreClient storeClient;
    @Autowired
    private ICoursePackageOrderService coursePackageOrderService;


    @Override
    public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId,String lon,String lat) {
        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());
        CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePayId);
        response.setChooseHours(coursePackageOrder.getClassHours());


        if (null != tCoursePackagePayment){
            TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
        if (null != coursePackageOrder) {
            TCoursePackage coursePackage = tcpmapper.selectById(coursePackageOrder.getCoursePackageId());
            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());

@@ -528,27 +523,16 @@
                double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
                response.setDistance(wgs84);
            }





            response.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
            response.setCoursePackageId(coursePackageOrder.getCoursePackageId());
            response.setCoverDrawing(coursePackage.getCoverDrawing());
            response.setDetailDrawing(coursePackage.getDetailDrawing());
            response.setCoursePackageName(coursePackage.getName());
            response.setCoursePayId(tCoursePackagePayment.getId());
            response.setCoursePayId(coursePackageOrder.getId());
            response.setType(coursePackage.getType());
            List<Integer> integers = StrUtils.dealStrToList(coursePackage.getClassWeeks());
            String classWeeks = coursePackage.getClassWeeks();
            if (integers.size() > 0){
                StringBuilder courWeeks = new StringBuilder("每"+classWeeks);
//                for (Integer integer : integers) {
//                    courWeeks.append(integer).append("、");
//                }
//                if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == '、'){
//                    courWeeks.deleteCharAt(courWeeks.length() - 1);
//                }
                response.setWeeks(courWeeks.toString());
            }
            ArrayList<String> classTime = new ArrayList<>();
@@ -566,17 +550,16 @@
            response.setCourseTimeFrame(joinedString);


//            response.setCourseTimeFrame(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
            response.setIntroduceDrawing(coursePackage.getIntroduceDrawing());

            Integer payType = tCoursePackagePayment.getPayType();
            BigDecimal cashPayment = tCoursePackagePayment.getCashPayment();
            Integer payType = coursePackageOrder.getPayType();
            BigDecimal cashPayment = coursePackageOrder.getCashPayment();
            double cashPaymentValue = 0.0;
            if(cashPayment!=null){

                 cashPaymentValue = cashPayment.doubleValue();
            }
            Integer playPaiCoin = tCoursePackagePayment.getPlayPaiCoin();
            Integer playPaiCoin = coursePackageOrder.getPlayPaiCoin();
            TCoursePackageDiscount coursePackageDiscount = tcpdMapper.selectOne(new QueryWrapper<TCoursePackageDiscount>()
                    .eq("coursePackageId",coursePackage.getId() )
                    .eq("type",1)
@@ -605,10 +588,7 @@
                    break;
            }

//            coursePackage.get


            response.setPayStatus(tCoursePackagePayment.getPayStatus());
            response.setPayStatus(coursePackageOrder.getPayStatus());


            List<CoursePackagePaymentConfigVo> list = new ArrayList<>();
@@ -739,8 +719,7 @@
                        coursePackagePaymentConfigVo.setVipPrice(null);
                    }

                }
                else{
                } else {
                    List<TCoursePackageDiscount> list2 = coursePackageDiscountService.list(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
                            .eq("type", 1).eq("auditStatus", 2));
                    Double vipPrice = coursePackagePaymentConfig.getCashPayment();
@@ -756,11 +735,6 @@
                list.add(coursePackagePaymentConfigVo);
            });
            response.setList(list);





        }
        return response;
    }
@@ -936,7 +910,6 @@
    }



    public ResultUtil AlipayPayment(String code, BigDecimal request){
        TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
        ResultUtil alipay = payMoneyUtil.alipay("课包购买", "课包购买", "", code, request.toString(),
@@ -1008,7 +981,6 @@
        appuClient.updateAppUser(appUser);
        return ResultUtil.success();
    }



    @Override
@@ -1121,8 +1093,7 @@
                            } else if(coursePackageStudent.getSignInOrNot()==2){
                                //已请假
                                recordVo.setStatus(5);
                            }
                            else if (start.after(new Date())){
                        } else if (start.after(new Date())) {
                                //待上课
                                recordVo.setStatus(1);
                            }
@@ -1166,6 +1137,7 @@

        return recordVoList;
    }

    public List<Integer>  getIds(Integer siteId) {
        HttpRequest httpRequest = HttpRequest.get("https://try.daowepark.com/v7/user_api/general/get_space_area?space_id=" + siteId);
        HttpResponse execute = httpRequest.execute();
@@ -1183,6 +1155,7 @@
        return ids;

    }

    @Override
    public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
        TCoursePackagePayment coursePackagePayment = this.baseMapper.getCoursePackagePaymentByCode(code);
@@ -1203,6 +1176,7 @@

    /**
     * 获取课包报名信息
     *
     * @param page
     * @param queryRegistrationRecord
     * @return
@@ -1252,6 +1226,7 @@

    /**
     * 获取未预约排课学员列表
     *
     * @param page
     * @param queryWalkInStudentList
     * @return
@@ -1370,6 +1345,7 @@
        payCourseInfoReq.setDay(strings1);
        return payCourseInfoReq;
    }

    private static List<Integer> week(String week){
        String[] split = week.split(";");
        ArrayList<Integer> integers = new ArrayList<>();
@@ -1496,8 +1472,6 @@
        }




//        TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId());
        // 添加课包
        TCoursePackagePayment tCoursePackagePayment1 = new TCoursePackagePayment();
@@ -1584,7 +1558,6 @@
        courseCounsumService.save(courseCounsum);



        if(tCoursePackagePayment.getLaveClassHours()<=3){
            Integer appUserId = userId;

@@ -1619,7 +1592,6 @@
    public boolean updateHoursById(TCoursePackagePayment byId, int i) {
        return this.baseMapper.updateHoursById1(byId.getId(),i);
    }



    public static Date[] generateDateArray(int numDays,Date date) {