后台bug修改

44323

2023-11-06 3caee5ce51a218f4bc1f3757a4d09b0ed18aa6df

 cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java

@@ -6,20 +6,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.*;
import com.dsh.course.entity.dto.SelectDto;
import com.dsh.course.feignclient.model.ExerciseVideo;
import com.dsh.course.model.*;
import com.dsh.course.model.dto.CourseChangeStateDTO;
import com.dsh.course.model.dto.TQueryBenefitsVideosDTO;
import com.dsh.course.model.vo.TQueryBenefitsVideosVO;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.service.TCoursePackageTypeService;
import com.dsh.course.service.TCourseService;
import com.dsh.course.service.*;
import com.dsh.course.util.PageFactory;
import com.dsh.course.util.PayMoneyUtil;
import com.dsh.course.util.ResultUtil;
import com.dsh.course.util.TokenUtil;
import com.dsh.course.util.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,10 +27,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

@Api
@CrossOrigin
@@ -66,6 +59,7 @@

    @Autowired
    private TCoursePackageDiscountService discountService;

    /**
     * 上/下架 1为上架 2为下架 3为删除
     *
@@ -74,10 +68,6 @@
    @RequestMapping("/base/course/changeState")
    @ResponseBody
    public Object changeState(@RequestBody CourseChangeStateDTO dto){




        return courseService.changeState(dto);
    }

@@ -134,7 +124,6 @@




    @ResponseBody
    @PostMapping("/api/course/queryCourseList")
    @ApiOperation(value = "获取课程列表", tags = {"APP-课程列表"})
@@ -154,6 +143,24 @@
            return ResultUtil.runErr();
        }
    }


    @ResponseBody
    @PostMapping("/base/course/queryCourseListOne")
    @ApiOperation(value = "获取课程列表", tags = {"APP-课程列表"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<CoursePackageListVo>> queryCourseListOne(CoursePackageList coursePackageList){
        try {
            List<CoursePackageListVo> coursePackageListVos = coursePackageService.queryCourseListOne( coursePackageList);
            return ResultUtil.success(coursePackageListVos);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }




@@ -183,7 +190,6 @@




    @ResponseBody
    @PostMapping("/api/course/paymentCourse")
    @ApiOperation(value = "支付课程", tags = {"APP-课程列表"})
@@ -196,6 +202,10 @@
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            Long couponId = paymentCourseVo.getCouponId();
            if(couponId==null || couponId==0){
                paymentCourseVo.setCouponId(null);
            }
            return coursePackageService.paymentCourse(uid, paymentCourseVo);
        }catch (Exception e){
            e.printStackTrace();
@@ -203,6 +213,25 @@
        }
    }

    // 2.0
    @ResponseBody
    @PostMapping("/api/course/paymentCourseCouponList")
    @ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil paymentCourseCouponList(Integer coursePackagePaymentConfigId){
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return coursePackageService.paymentCourseCouponList(uid, coursePackagePaymentConfigId);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }

    /**
     * 购买课程微信支付回调
@@ -248,6 +277,7 @@
    @PostMapping("/base/course/aliPaymentCourseCallback")
    public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            System.err.println("=====支付宝回调=======");
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if(null != map){
                String code = map.get("out_trade_no");
@@ -270,6 +300,14 @@
        }catch (Exception e){
            e.printStackTrace();
        }
    }


    //分账
    public void moneyOut(){
        


    }


@@ -307,6 +345,20 @@
    }


    @PostMapping("/course/getPageageType")
    public List<Map<String, Object>> getPageageType(){
        List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
        ArrayList<Map<String, Object>> objects = new ArrayList<>();
        for (TCoursePackageType tCoursePackageType : list) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("id",tCoursePackageType.getId());
            map.put("name",tCoursePackageType.getName());
            objects.add(map);
        }
        return objects;
    }


    /**
     * 获取课程管理列表数据
     * @param queryCourseList
@@ -328,6 +380,8 @@
    @ResponseBody
    @PostMapping("/course/addCourse")
    public void addCourse(@RequestBody TCourse course){
        course.setState(1);
        course.setInsertTime(new Date());
        courseService.save(course);
    }

@@ -385,14 +439,53 @@
    }


    @PostMapping("/course/queryPackageById")
    public List<String> queryPackageById(@RequestBody Integer coursePackageId){
        ArrayList<String> strings = new ArrayList<>();
        TCoursePackage byId = coursePackageService.getById(coursePackageId);
        Integer coursePackageTypeId = byId.getCoursePackageTypeId();
        strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
        strings.add(byId.getName());

        return strings;

    }

    @PostMapping("/course/getHours")
    public Integer getHours(@RequestBody Integer coursePackageId1){
        return coursePackageService.getHours(coursePackageId1);
    }

    @PostMapping("/course/queryByDiscountId")
    public TCoursePackage queryByDiscountId(@RequestBody Integer id){
        TCoursePackageDiscount byId = discountService.getById(id);
        TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
        return byId1;
    }
    @ResponseBody
    @PostMapping("/course/queryByDiscountId1")
    public TCoursePackage queryByDiscountId1(@RequestBody Integer id){
        TCoursePackageDiscount byId = discountService.getById(id);
        TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
        return byId1;
    }


    @PostMapping("/course/queryDiscountById")
    public Integer queryDiscountById(@RequestBody Integer id){
        TCoursePackageDiscount byId = discountService.getById(id);
        return byId.getAuditStatus();
    }
    @PostMapping("/course/queryDiscountList")
    public List<DiscountList> queryDiscountList(@RequestBody  QueryDiscountList queryDiscountList){
       return discountService.queryDiscountList(queryDiscountList);
        return discountService.queryDiscountList(queryDiscountList);
    }

    @PostMapping("/course/queryDiscountListAudit")
    public List<DiscountList> queryDiscountListAudit(@RequestBody  QueryDiscountList queryDiscountList){
       return discountService.queryDiscountListAudit(queryDiscountList);
        return discountService.queryDiscountListAudit(queryDiscountList);
    }


    @PostMapping("/course/updateState")
    public Boolean updateState( @RequestBody DiscountUpdateState discountUpdateState){
@@ -414,62 +507,85 @@

        return discountService.updateBatchById(list);
    }

    @PostMapping("/course/queryByDiscountId")
    public TCoursePackage queryByDiscountId(@RequestBody Integer id){
        TCoursePackageDiscount byId = discountService.getById(id);
        TCoursePackage byId1 = coursePackageService.getById(byId.getCoursePackageId());
        return byId1;
    }

    @PostMapping("/course/queryDiscountById")
    public Integer queryDiscountById(@RequestBody Integer id){
        TCoursePackageDiscount byId = discountService.getById(id);
        return byId.getAuditStatus();
    }



    @PostMapping("/course/getPageageType")
    public List<Map<String, Object>> getPageageType(){
        List<TCoursePackageType> list = coursePackageTypeService.list(new LambdaQueryWrapper<TCoursePackageType>().eq(TCoursePackageType::getState, 1));
        ArrayList<Map<String, Object>> objects = new ArrayList<>();
        for (TCoursePackageType tCoursePackageType : list) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("id",tCoursePackageType.getId());
            map.put("name",tCoursePackageType.getName());
            objects.add(map);
    @Autowired
    private ICoursePackagePaymentConfigService packagePaymentConfigService;
    @PostMapping("/course/times")
    public List<SelectDto> times(@RequestBody Integer oneId){
        List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId));
        List<SelectDto> integerList = new ArrayList<>();
        for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) {
//            integerList.add(coursePackagePaymentConfig.getClassHours());
            SelectDto selectDto = new SelectDto();
            selectDto.setId(coursePackagePaymentConfig.getId());
            selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
            integerList.add(selectDto);
        }
        return objects;


        return integerList;
    }

    @PostMapping("/course/queryFee")
    public  HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
        HashMap<String, Object> map = new HashMap<>();
        String data = queryDataFee.getData();
        List<Integer> ids = queryDataFee.getIds();
        if(ids.size()==0){
            ids.add(-1);
        }

    @PostMapping("/course/queryByTypeId")
    public List<TCoursePackage> queryByTypeId(@RequestBody Integer oneId){
        return coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getCoursePackageTypeId,oneId).eq(TCoursePackage::getAuditStatus,2).eq(TCoursePackage::getState,1));
    }
        LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
        if(ToolUtil.isNotEmpty(data)){
            String stime = data.split(" - ")[0]+" 00:00:00";
            String etime = data.split(" - ")[1]+" 23:59:59";
            wrapper.between(TCoursePackagePayment::getInsertTime,stime,etime);
        }
        wrapper.in(TCoursePackagePayment::getAppUserId,ids);
        wrapper.eq(TCoursePackagePayment::getPayStatus,2);
        ArrayList<Integer> objects = new ArrayList<>();
        objects.add(1);
        objects.add(2);
        objects.add(5);
        objects.add(6);
        wrapper.in(TCoursePackagePayment::getPayType,objects);
        List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
        double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
        List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
        if(collect.size()==0){
            collect.add(-1);
        }
        //
        List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
        // 课类型
        List<TCoursePackageType> list1 = coursePackageTypeService.list();

        for (TCoursePackagePayment tCoursePackagePayment : list) {
            for (TCoursePackage tCoursePackage : list2) {
                if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){
                    tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
                }
            }
        }

    @PostMapping("/course/queryByConfigId")
    public List<Map<String, Object>> queryByConfigId(@RequestBody Integer oneId){
        return coursePackageService.queryByConfigId(oneId);
    }
        ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>();

        for (TCoursePackageType tCoursePackageType : list1) {
            HashMap<String, Object> objectObjectHashMap = new HashMap<>();
            objectObjectHashMap.put("name",tCoursePackageType.getName());
            double a= 0;
            for (TCoursePackagePayment tCoursePackagePayment : list) {
                if(tCoursePackagePayment.getType().equals(tCoursePackageType.getId())){
                   a += tCoursePackagePayment.getCashPayment().doubleValue();
                }
            }
            objectObjectHashMap.put("value",a);
            hashMaps.add(objectObjectHashMap);
        }

    @PostMapping("/course/queryPackageById")
    public List<String> queryPackageById(@RequestBody Integer coursePackageId){
        ArrayList<String> strings = new ArrayList<>();
        TCoursePackage byId = coursePackageService.getById(coursePackageId);
        Integer coursePackageTypeId = byId.getCoursePackageTypeId();
        strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
        strings.add(byId.getName());
        HashMap<String, Object> map1 = new HashMap<>();
        map1.put("fee",v);
        map1.put("data",hashMaps);

        return strings;

    }

    @PostMapping("/course/getHours")
    public String getHours(@RequestBody Integer coursePackageId1){
        return coursePackageService.getHours(coursePackageId1);
        return map1;
    }
}