玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
lisy
2023-08-03 0fe1f723f6fb85f25c945bd88c774f4a3142a818 
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java


@@ -4,8 +4,12 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.dsh.course.entity.*;


import com.dsh.course.feignclient.account.AppUserClient;


import com.dsh.course.feignclient.account.StudentClient;


import com.dsh.course.feignclient.account.model.AppUser;


import com.dsh.course.feignclient.account.model.Student;


import com.dsh.course.feignclient.model.*;


import com.dsh.course.feignclient.other.StoreClient;


import com.dsh.course.feignclient.other.model.Store;


import com.dsh.course.model.BaseVo;


import com.dsh.course.model.dto.DiscountJsonDto;


import com.dsh.course.model.vo.CourseDetailRequest;


@@ -35,7 +39,10 @@


import java.math.BigDecimal;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




@Api


@@ -66,7 +73,8 @@


    @Autowired


    private TCourseService tcService;






    @Resource


    private StudentClient studentClient;




    @Autowired


    private TCoursePackageTypeService coursePackageTypeService;


@@ -82,6 +90,9 @@


    @Resource


    private AppUserClient auClitn;




    @Resource


    private StoreClient sreClient;




    private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");




    /**


@@ -89,11 +100,13 @@


     * @param stuId 学员id


     * @return  课包列表


     */


    @ResponseBody


    @PostMapping("/base/coursePack/queryPayment")


    public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){


    public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId){


        List<StuCourseResp> resps = new ArrayList<>();


        Student student = studentClient.queryStudentById(stuId);


        List<TCoursePackagePayment> byUserId = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()


                .eq("appUserId",appUserId)


                .eq("appUserId",student.getAppUserId())


                .eq("studentId",stuId));




        if (byUserId.size() > 0 ){


@@ -105,6 +118,8 @@


                resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());


                resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());


                resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());


                String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");


                resp.setPeriodOfValidity(afterDayDate);


                resps.add(resp);


            }


        }


@@ -115,6 +130,7 @@


     *


     * 获取发布的 课包列表


     */


    @ResponseBody


    @PostMapping("/base/coursePack/storeOfCourse")


    public List<CourseOfStoreVo> getStuCourseWithStores(@RequestBody WeeksOfCourseRest courseRest){


        List<CourseOfStoreVo> course = new ArrayList<>();


@@ -131,24 +147,31 @@


            if (list.size() >  0){


                for (TCoursePackagePayment tCoursePackagePayment : list) {


                    TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());


                    CoursePackagePaymentConfig paymentConfig = icppcService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()


                            .eq("coursePackageId",tCoursePackage.getId() )


                            .eq("classHours",tCoursePackagePayment.getClassHours()));


//                    获取课程有效结束时间，判断 查询的日期parse 是否在有效期范围内


                    Date expirationDate = DateTimeHelper.getExpirationDate(tCoursePackagePayment.getInsertTime(),tCoursePackage.getValidDays());


                    System.out.println(expirationDate.after(parse));


                    String classWeeks = tCoursePackage.getClassWeeks();


                    System.out.println(StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse)));


                    if (expirationDate.after(parse) && StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse))){


                        CourseOfStoreVo storeVo = new CourseOfStoreVo();


                        storeVo.setCourseId(tCoursePackage.getId());


                        // TODO: 2023/7/20 查询课包对应门店信息


//                        storeVo.setCourseName();


//                        storeVo.setClassStartTime();


//                        storeVo.setClassEndTime();


//                        storeVo.setStoreId();


//                        storeVo.setStoreName();


//                        storeVo.setLat();


//                        storeVo.setLon();


                        storeVo.setCourseName(tCoursePackage.getName());


                        storeVo.setClassStartTime(tCoursePackage.getClassStartTime());


                        storeVo.setClassEndTime(tCoursePackage.getClassEndTime());


                        storeVo.setStoreId(tCoursePackage.getStoreId());


                        Store store = sreClient.queryStoreById(tCoursePackage.getStoreId());


                        storeVo.setStoreAddress(store.getAddress());


                        storeVo.setLat(store.getLat());


                        storeVo.setLon(store.getLon());


                        storeVo.setCoursePrice(ToolUtil.isEmpty(paymentConfig.getCashPayment()) ? (double) paymentConfig.getPlayPaiCoin():paymentConfig.getCashPayment());


                        course.add(storeVo);


                    }


                }


            }


            System.out.println(course);


            return course;


        } catch (ParseException e) {


            return null;


@@ -184,13 +207,13 @@


    }




    @PostMapping("/base/coursePack/paymentCourse")


    public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date  endTime,@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId) {


    public List<PurchaseRecordVo> queryCourseDetails(@RequestBody GetStuSessionList sessionList) {


        List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();




        List<TCoursePackagePayment> coursePackage = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()


                .between("insertTime", startTime,endTime)


                .eq("appUserId",appUserId)


                .eq("studentId",stuId));


                .between("insertTime", sessionList.getStartTime(),sessionList.getEndTime())


                .eq("appUserId",sessionList.getAppUserId())


                .eq("studentId",sessionList.getStuId()));


        if (coursePackage.size() > 0 ){


            coursePackage.forEach( cspackage -> {


                PurchaseRecordVo recordVo = new PurchaseRecordVo();


@@ -258,33 +281,9 @@


            if (integers.size() > 0){


                StringBuilder courWeeks = new StringBuilder("每");


                for (Integer integer : integers) {


                    switch (integer){


                        case 1:


                            courWeeks.append("周一、");


                            break;


                        case 2:


                            courWeeks.append("周二、");


                            break;


                        case 3:


                            courWeeks.append("周三、");


                            break;


                        case 4:


                            courWeeks.append("周四、");


                            break;


                        case 5:


                            courWeeks.append("周五、");


                            break;


                        case 6:


                            courWeeks.append("周六、");


                            break;


                        case 7:


                            courWeeks.append("周末、");


                            break;


                        default:


                            break;


                    }


                    courWeeks.append(integer).append("、");


                }


                if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == ','){


                if (courWeeks.length() > 0 && courWeeks.charAt(courWeeks.length() - 1) == '、'){


                    courWeeks.deleteCharAt(courWeeks.length() - 1);


                }


                courseVo.setCourseWeek(courWeeks.toString());


@@ -359,12 +358,13 @@


    }




    @PostMapping("/base/coursePack/allAmountPayRecordOfUser")


    public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId){


    public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo billingDataRequestVo){


        return packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()


                .eq("appUserId",appUserId)


                .eq("appUserId",billingDataRequestVo.getAppUserId())


                .notIn("payType",3)


                .eq("payStatus",2)


                .eq("state",1));


                .eq("state",1)


                .between("insertTime",billingDataRequestVo.getMonthStart(),billingDataRequestVo.getMonthEnd()));


    }