submit

src/main/java/cn/quantgroup/customer/config/data/DbCashConfig.java

@@ -21,7 +21,7 @@ import javax.sql.DataSource;
 import java.util.Properties;
 
 @Configuration
-@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.repo.xyqb")
+@EnableJpaRepositories(basePackages = "cn.quantgroup.customer.moice.repo")
 @EnableTransactionManagement
 public class DbCashConfig {
 

src/main/java/cn/quantgroup/customer/model/xyqbuser/UserCombination.java

 package cn.quantgroup.customer.model.xyqbuser;
 
-import cn.quantgroup.customer.model.order.ActiveApplyOrder;
 import cn.quantgroup.customer.model.order.ApplyOrder;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author Wang Xiangwei
  * @version 2020/3/9

src/main/java/cn/quantgroup/customer/model/xyqbuser/BusinessType.java → src/main/java/cn/quantgroup/customer/moice/enums/BusinessType.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.enums;
 
 /**
  * Created by FrankChow on 15/12/1.

src/main/java/cn/quantgroup/customer/model/xyqbuser/LoanProgress.java → src/main/java/cn/quantgroup/customer/moice/enums/LoanProgress.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.enums;
 
 import com.google.common.collect.Lists;
 

src/main/java/cn/quantgroup/customer/model/xyqbuser/PayApproach.java → src/main/java/cn/quantgroup/customer/moice/enums/PayApproach.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.enums;
 
 /**
  * Created by wuq on 21/11/29.

src/main/java/cn/quantgroup/customer/model/xyqbuser/TransactionStatus.java → src/main/java/cn/quantgroup/customer/moice/enums/TransactionStatus.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.enums;
 
 /**
  * Created by root on 15-8-1.

src/main/java/cn/quantgroup/customer/model/xyqbuser/FundingCorpEntity.java → src/main/java/cn/quantgroup/customer/moice/model/FundingCorpEntity.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.model;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/cn/quantgroup/customer/model/xyqbuser/XyqbLoanApplicationHistory.java → src/main/java/cn/quantgroup/customer/moice/model/XyqbLoanApplicationHistory.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.model;
+import cn.quantgroup.customer.moice.enums.BusinessType;
+import cn.quantgroup.customer.moice.enums.LoanProgress;
+import cn.quantgroup.customer.moice.enums.PayApproach;
 import lombok.ToString;
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/cn/quantgroup/customer/model/xyqbuser/XyqbLoanApplicationManifestHistory.java → src/main/java/cn/quantgroup/customer/moice/model/XyqbLoanApplicationManifestHistory.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.model;
+import cn.quantgroup.customer.moice.enums.TransactionStatus;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;

src/main/java/cn/quantgroup/customer/model/xyqbuser/XyqbRepaymentPlan.java → src/main/java/cn/quantgroup/customer/moice/model/XyqbRepaymentPlan.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.model;
 
 import lombok.ToString;
 

src/main/java/cn/quantgroup/customer/repo/xyqb/IFundingCorpRepository.java → src/main/java/cn/quantgroup/customer/moice/repo/IFundingCorpRepository.java

-package cn.quantgroup.customer.repo.xyqb;
-import cn.quantgroup.customer.model.xyqbuser.FundingCorpEntity;
+package cn.quantgroup.customer.moice.repo;
+import cn.quantgroup.customer.moice.model.FundingCorpEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/cn/quantgroup/customer/repo/xyqb/IXyqbLoanApplicationHistoryRepository.java → src/main/java/cn/quantgroup/customer/moice/repo/IXyqbLoanApplicationHistoryRepository.java

-package cn.quantgroup.customer.repo.xyqb;
+package cn.quantgroup.customer.moice.repo;
 
-import cn.quantgroup.customer.model.xyqbuser.BusinessType;
-import cn.quantgroup.customer.model.xyqbuser.LoanProgress;
-import cn.quantgroup.customer.model.xyqbuser.XyqbLoanApplicationHistory;
+import cn.quantgroup.customer.moice.enums.BusinessType;
+import cn.quantgroup.customer.moice.enums.LoanProgress;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/cn/quantgroup/customer/repo/xyqb/IXyqbLoanApplicationManifestHistoryRepository.java → src/main/java/cn/quantgroup/customer/moice/repo/IXyqbLoanApplicationManifestHistoryRepository.java

-package cn.quantgroup.customer.repo.xyqb;
-import cn.quantgroup.customer.model.xyqbuser.XyqbLoanApplicationManifestHistory;
+package cn.quantgroup.customer.moice.repo;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationManifestHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

src/main/java/cn/quantgroup/customer/repo/xyqb/IXyqbRepaymentRepository.java → src/main/java/cn/quantgroup/customer/moice/repo/IXyqbRepaymentRepository.java

-package cn.quantgroup.customer.repo.xyqb;
+package cn.quantgroup.customer.moice.repo;
 
-import cn.quantgroup.customer.model.xyqbuser.XyqbRepaymentPlan;
+import cn.quantgroup.customer.moice.model.XyqbRepaymentPlan;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/cn/quantgroup/customer/model/xyqbuser/IXyqbLoanApplicationHistoryService.java → src/main/java/cn/quantgroup/customer/moice/service/IXyqbLoanApplicationHistoryService.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.service;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationHistory;
+
 import java.util.List;
 
 /**

src/main/java/cn/quantgroup/customer/model/xyqbuser/IXyqbLoanApplicationManifestHistoryService.java → src/main/java/cn/quantgroup/customer/moice/service/IXyqbLoanApplicationManifestHistoryService.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.service;
+
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationManifestHistory;
 
 /**
  * 类名称：IXyqbLoanApplicationManifestHistoryService

src/main/java/cn/quantgroup/customer/model/xyqbuser/IXyqbRepaymentPlanService.java → src/main/java/cn/quantgroup/customer/moice/service/IXyqbRepaymentPlanService.java

-package cn.quantgroup.customer.model.xyqbuser;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Date;
+package cn.quantgroup.customer.moice.service;
+import cn.quantgroup.customer.moice.model.XyqbRepaymentPlan;
+
 import java.util.List;
 
 /**

src/main/java/cn/quantgroup/customer/model/xyqbuser/IXyqbLoanApplicationManifestHistoryServiceIMpl.java → src/main/java/cn/quantgroup/customer/moice/service/impl/IXyqbLoanApplicationManifestHistoryServiceIMpl.java

-package cn.quantgroup.customer.model.xyqbuser;
-import cn.quantgroup.customer.repo.xyqb.IXyqbLoanApplicationManifestHistoryRepository;
+package cn.quantgroup.customer.moice.service.impl;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationManifestHistory;
+import cn.quantgroup.customer.moice.repo.IXyqbLoanApplicationManifestHistoryRepository;
+import cn.quantgroup.customer.moice.service.IXyqbLoanApplicationManifestHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 /**

src/main/java/cn/quantgroup/customer/model/xyqbuser/XyqbLoanApplicationHistoryServiceImpl.java → src/main/java/cn/quantgroup/customer/moice/service/impl/XyqbLoanApplicationHistoryServiceImpl.java

-package cn.quantgroup.customer.model.xyqbuser;
-import cn.quantgroup.customer.repo.xyqb.IXyqbLoanApplicationHistoryRepository;
+package cn.quantgroup.customer.moice.service.impl;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationHistory;
+import cn.quantgroup.customer.moice.repo.IXyqbLoanApplicationHistoryRepository;
+import cn.quantgroup.customer.moice.service.IXyqbLoanApplicationHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/quantgroup/customer/model/xyqbuser/XyqbRepaymentPlanServiceImpl.java → src/main/java/cn/quantgroup/customer/moice/service/impl/XyqbRepaymentPlanServiceImpl.java

-package cn.quantgroup.customer.model.xyqbuser;
-import cn.quantgroup.customer.repo.xyqb.IXyqbRepaymentRepository;
+package cn.quantgroup.customer.moice.service.impl;
+import cn.quantgroup.customer.moice.service.IXyqbRepaymentPlanService;
+import cn.quantgroup.customer.moice.model.XyqbRepaymentPlan;
+import cn.quantgroup.customer.moice.repo.IXyqbRepaymentRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/cn/quantgroup/customer/model/xyqbuser/ApplyOrderVO.java → src/main/java/cn/quantgroup/customer/moice/vo/ApplyOrderVO.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

src/main/java/cn/quantgroup/customer/model/xyqbuser/LoanOrderVo.java → src/main/java/cn/quantgroup/customer/moice/vo/LoanOrderVo.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.vo;
 import cn.quantgroup.customer.util.MoneySerializer;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

src/main/java/cn/quantgroup/customer/model/xyqbuser/StatusMap.java → src/main/java/cn/quantgroup/customer/moice/vo/StatusMap.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.vo;
 import cn.quantgroup.customer.enums.AssignStatusEnum;
+import cn.quantgroup.customer.moice.enums.LoanProgress;
 import org.apache.commons.lang3.StringUtils;
 
 /**

src/main/java/cn/quantgroup/customer/model/xyqbuser/UserOrders.java → src/main/java/cn/quantgroup/customer/moice/vo/UserOrders.java

-package cn.quantgroup.customer.model.xyqbuser;
+package cn.quantgroup.customer.moice.vo;
 
 import lombok.Data;
 

src/main/java/cn/quantgroup/customer/service/impl/CardServiceImpl.java

@@ -6,7 +6,6 @@ import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
 import cn.quantgroup.customer.rest.param.card.ModifyCardsQuery;
 import cn.quantgroup.customer.rest.param.card.ModifyReservePhone;
 import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
-import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.param.user.UserQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.card.CardResult;

src/main/java/cn/quantgroup/customer/service/impl/IceServiceImpl.java

 package cn.quantgroup.customer.service.impl;
 
 import cn.quantgroup.customer.model.order.*;
-import cn.quantgroup.customer.model.xyqbuser.*;
-import cn.quantgroup.customer.repo.xyqb.IFundingCorpRepository;
+import cn.quantgroup.customer.moice.enums.BusinessType;
+import cn.quantgroup.customer.moice.enums.LoanProgress;
+import cn.quantgroup.customer.moice.service.IXyqbRepaymentPlanService;
+import cn.quantgroup.customer.moice.vo.LoanOrderVo;
+import cn.quantgroup.customer.moice.vo.StatusMap;
+import cn.quantgroup.customer.moice.vo.UserOrders;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationHistory;
+import cn.quantgroup.customer.moice.model.XyqbLoanApplicationManifestHistory;
+import cn.quantgroup.customer.moice.model.XyqbRepaymentPlan;
+import cn.quantgroup.customer.moice.repo.IFundingCorpRepository;
+import cn.quantgroup.customer.moice.service.IXyqbLoanApplicationHistoryService;
+import cn.quantgroup.customer.moice.service.IXyqbLoanApplicationManifestHistoryService;
 import cn.quantgroup.customer.rest.param.applyorder.ApplyOrderQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IFileService;

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -43,8 +43,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
@@ -54,7 +52,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static cn.quantgroup.customer.constant.Constant.GSON;