This commit is contained in:
77
2024-05-07 00:31:01 +08:00
parent f676e778cc
commit e421472e5d
406 changed files with 3042 additions and 1758 deletions

View File

@@ -23,10 +23,6 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -40,5 +36,14 @@
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.16.1</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.32</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -3,16 +3,16 @@ package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.BorrowStatus;
import com.ruoyi.dk.enums.BankTypeEnums;
import com.ruoyi.dk.service.BorrowStatusService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.component.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -1,13 +1,13 @@
package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.AgreementSetting;
import com.ruoyi.dk.service.AgreementSettingService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.component.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -2,17 +2,17 @@ package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.Borrow;
import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq;
import com.ruoyi.dk.dto.admin.resp.BorrowResp;
import com.ruoyi.dk.service.BorrowService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.component.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -2,20 +2,20 @@ package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.component.excel.utils.ExcelUtil;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.dto.admin.req.UpdatePwdCustomerReq;
import com.ruoyi.dk.dto.admin.resp.CustomerAdminResp;
import com.ruoyi.dk.dto.admin.resp.CustomerExportVo;
import com.ruoyi.dk.mapper.CustomerMapper;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.component.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -3,15 +3,15 @@ package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.CustomerInfo;
import com.ruoyi.dk.service.CustomerInfoService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.component.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -1,13 +1,13 @@
package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.HomeSetting;
import com.ruoyi.dk.service.HomeSettingService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -1,13 +1,13 @@
package com.ruoyi.dk.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.component.idempotent.annotation.RepeatSubmit;
import com.ruoyi.component.log.annotation.Log;
import com.ruoyi.component.log.enums.BusinessType;
import com.ruoyi.component.web.core.BaseController;
import com.ruoyi.dk.domain.LoansSetting;
import com.ruoyi.dk.service.LoansSettingService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.component.core.domain.R;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

View File

@@ -5,7 +5,7 @@ import com.ruoyi.dk.domain.Borrow;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.service.BorrowService;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.component.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.component.mybatis.core.page.TableDataInfo;
import com.ruoyi.dk.domain.Borrow;
import com.ruoyi.dk.domain.HomeSetting;
import com.ruoyi.dk.dto.admin.resp.BorrowAdminVO;
@@ -13,12 +15,10 @@ import com.ruoyi.dk.dto.app.resp.BorrowInfo;
import com.ruoyi.dk.dto.app.resp.LoanProcessResp;
import com.ruoyi.dk.service.BorrowService;
import com.ruoyi.dk.service.HomeSettingService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.satoken.utils.LoginHelper;
import com.ruoyi.component.core.util.BeanConvertUtil;
import com.ruoyi.component.core.util.MessageUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -6,9 +6,9 @@ import com.ruoyi.dk.dto.admin.resp.CustomerAdminVO;
import com.ruoyi.dk.service.CustomerInfoService;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.dk.service.HomeSettingService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.satoken.utils.LoginHelper;
import com.ruoyi.component.core.util.BeanConvertUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -2,16 +2,16 @@ package com.ruoyi.dk.controller.app;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.RandomUtil;
import com.ruoyi.component.redis.util.RedisUtils;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.dto.app.req.CustomerRegisterReq;
import com.ruoyi.dk.dto.app.req.UpdatePwdOpenReq;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.dk.sms.CodeService;
import com.ruoyi.dk.sms.CodeType;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.core.exception.CustomException;
import com.ruoyi.component.core.util.MessageUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -13,8 +13,8 @@ import com.ruoyi.dk.service.HomeSettingService;
import com.ruoyi.dk.service.LoansSettingService;
import com.ruoyi.dk.util.Loan;
import com.ruoyi.dk.util.PhoneRandomUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.core.util.BeanConvertUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;

View File

@@ -9,8 +9,8 @@ import com.ruoyi.dk.enums.BankTypeEnums;
import com.ruoyi.dk.service.AgreementSettingService;
import com.ruoyi.dk.service.HomeSettingService;
import com.ruoyi.dk.service.LoansSettingService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.core.util.BeanConvertUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -2,7 +2,7 @@ package com.ruoyi.dk.controller.app;
import com.ruoyi.dk.dto.app.req.LoginPhoneBody;
import com.ruoyi.dk.kit.DkLoginKit;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.component.core.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;

View File

@@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.dk.dto.common.FileUploadRes;
import com.ruoyi.dk.oss.ali.StsOssKit;
import com.ruoyi.dk.oss.ali.StsResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.component.core.domain.R;
import com.ruoyi.component.core.util.MessageUtils;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import io.swagger.v3.oas.annotations.Operation;

View File

@@ -2,10 +2,10 @@ package com.ruoyi.dk.dto.admin.resp;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.component.excel.annotation.ExcelEnumFormat;
import com.ruoyi.component.excel.convert.ExcelEnumConvert;
import com.ruoyi.dk.enums.KinsfolkRefEnum;
import com.ruoyi.dk.enums.YesOrNoEnum;
import com.ruoyi.common.annotation.ExcelEnumFormat;
import com.ruoyi.common.convert.ExcelEnumConvert;
import lombok.Data;
@Data

View File

@@ -5,13 +5,13 @@ import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.executor.ExecutorConstant;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.component.core.constant.Constants;
import com.ruoyi.component.core.domain.model.LoginUser;
import com.ruoyi.component.core.enums.UserType;
import com.ruoyi.component.core.exception.base.BaseException;
import com.ruoyi.component.satoken.utils.LoginHelper;
import com.ruoyi.component.core.util.MessageUtils;
import com.ruoyi.component.core.util.ServletUtils;
import com.ruoyi.system.service.SysLoginService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -2,12 +2,12 @@ package com.ruoyi.dk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.dk.domain.Borrow;
import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq;
import com.ruoyi.dk.dto.admin.resp.BorrowResp;
import com.ruoyi.dk.dto.app.req.BorrowStartReq;
import com.ruoyi.dk.dto.app.resp.LoanProcessResp;
import com.ruoyi.common.core.domain.PageQuery;
public interface BorrowService extends IService<Borrow> {
Borrow borrow(BorrowStartReq req);

View File

@@ -2,10 +2,10 @@ package com.ruoyi.dk.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.dto.admin.resp.CustomerAdminResp;
import com.ruoyi.dk.dto.app.req.CustomerRegisterReq;
import com.ruoyi.common.core.domain.PageQuery;
import java.math.BigDecimal;

View File

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.component.json.utils.JsonUtils;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.dk.domain.*;
import com.ruoyi.dk.dto.admin.req.BorrowUpdateStatusReq;
import com.ruoyi.dk.dto.admin.resp.BorrowResp;
@@ -18,11 +20,9 @@ import com.ruoyi.dk.util.ContentReplaceUtil;
import com.ruoyi.dk.util.Loan;
import com.ruoyi.dk.util.MoneyUtil;
import com.ruoyi.dk.util.OrderTradeNoUtil;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.component.core.exception.CustomException;
import com.ruoyi.component.core.util.BeanConvertUtil;
import com.ruoyi.component.core.util.MessageUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RLock;

View File

@@ -9,8 +9,8 @@ import com.ruoyi.dk.mapper.CustomerInfoMapper;
import com.ruoyi.dk.service.BorrowService;
import com.ruoyi.dk.service.CustomerInfoService;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.component.core.exception.CustomException;
import com.ruoyi.component.core.util.MessageUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

View File

@@ -4,6 +4,7 @@ import cn.dev33.satoken.secure.BCrypt;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.component.mybatis.core.page.PageQuery;
import com.ruoyi.dk.domain.BorrowLog;
import com.ruoyi.dk.domain.Customer;
import com.ruoyi.dk.domain.CustomerInfo;
@@ -13,9 +14,8 @@ import com.ruoyi.dk.mapper.BorrowLogMapper;
import com.ruoyi.dk.mapper.CustomerMapper;
import com.ruoyi.dk.service.CustomerInfoService;
import com.ruoyi.dk.service.CustomerService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.component.core.exception.CustomException;
import com.ruoyi.component.core.util.MessageUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;