yupeng
2025-02-14 38c2954d317dc0c9dc9f73565d893a0d30f8a054
feat:创建订单修改返回的错误信息
2个文件已修改
73 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/task/TbillTask.java
@@ -26,78 +26,7 @@
    @Autowired
    TContractService tContractService;
    /**
     * 判断账单是否到期
     */
    public void checkBillOverdue(){
        try {
            int index = 1;
            int rows = 20;
            long pages = 0;
            TBillQuery query = new TBillQuery();
            query.setPageSize(rows);
            //查询未缴费的
            query.setPayFeesStatus(1);
            Calendar c = Calendar.getInstance();
            Date time = c.getTime();
            do {
                query.setPageNum(index);
                PageInfo<TBillDto> pageinfo = tBillService.queryPage(query);
                if (pages==0){
                    pages = pageinfo.getPages();
                }
                if (pageinfo.getRecords()!=null && pageinfo.getRecords().size()>0){
                    pageinfo.getRecords().forEach(tBill -> {
                        //todo 生成账单
                    });
                }
                index++;
            }while (index<=pages);
        }catch (Exception e){
            log.error("");
        }
    }
    /**
     * 计算违约金
     */
    public void caculatePenaltyFee(){
        try {
            int index = 1;
            int rows = 20;
            long pages = 0;
            TBillQuery query = new TBillQuery();
            query.setPageSize(rows);
            //查询已逾期的
            query.setPayFeesStatus(4);
            Calendar c = Calendar.getInstance();
            Date time = c.getTime();
            do {
                query.setPageNum(index);
                PageInfo<TBillDto> pageinfo = tBillService.queryPage(query);
                if (pages==0){
                    pages = pageinfo.getPages();
                }
                if (pageinfo.getRecords()!=null && pageinfo.getRecords().size()>0){
                    pageinfo.getRecords().forEach(tContract -> {
                        //todo 生成账单
                    });
                }
                index++;
            }while (index<=pages);
        }catch (Exception e){
            log.error("");
        }
    }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPayOrderServiceImpl.java
@@ -72,7 +72,7 @@
            //计算欠费金额:租金+违约金-实收金额
            long rent = caculateRentFee(bill);
            if (rent==0){
                throw new ServiceException("该订单已缴费");
                throw new ServiceException("该账单已缴费");
            }
            if (rent>dto.getAmount()){
                throw new ServiceException("支付金额超过了账单欠费金额");