Commit b4715240 authored by suntao's avatar suntao

为了测试通放款接口,调整之前的代码 建议自己写的代码 自己调试过在给别人,调的我tm 想骂人,这是在完全不负责任的写代码

parent 001209de
...@@ -18,7 +18,11 @@ import cn.quantgroup.cashloanflowboss.spi.clotho.client.ClothoCenter; ...@@ -18,7 +18,11 @@ import cn.quantgroup.cashloanflowboss.spi.clotho.client.ClothoCenter;
import cn.quantgroup.cashloanflowboss.spi.clotho.service.ClothoCenterService; import cn.quantgroup.cashloanflowboss.spi.clotho.service.ClothoCenterService;
import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneCenter; import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneCenter;
import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService; import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundLending;
import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.CancelPreLoanRepository; import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.CancelPreLoanRepository;
import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.ContractRepository;
import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.FundLendingRepository;
import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService; import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
import cn.quantgroup.cashloanflowboss.utils.JSONTools; import cn.quantgroup.cashloanflowboss.utils.JSONTools;
import cn.quantgroup.user.retbean.XUser; import cn.quantgroup.user.retbean.XUser;
...@@ -26,6 +30,9 @@ import com.google.common.collect.Lists; ...@@ -26,6 +30,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
...@@ -43,6 +50,8 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -43,6 +50,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.TransactionManagementConfigurationSelector;
import org.springframework.transaction.annotation.Transactional;
/** /**
* function: * function:
...@@ -82,7 +91,10 @@ public class OrderService { ...@@ -82,7 +91,10 @@ public class OrderService {
@Autowired @Autowired
private CancelPreLoanRepository cancelPreLoanRepository; private CancelPreLoanRepository cancelPreLoanRepository;
@Autowired
private ContractRepository contractRepository;
@Autowired
private FundLendingRepository fundLendingRepository;
public Page<OrderVo> getOrders(Long channelId, String channelOrderNo, Integer pageNumber, Integer pageSize) { public Page<OrderVo> getOrders(Long channelId, String channelOrderNo, Integer pageNumber, Integer pageSize) {
Page<ClfOrderMapping> page = this.clfOrderMappingRepository.findAll((root, criteriaQuery, criteriaBuilder) -> { Page<ClfOrderMapping> page = this.clfOrderMappingRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
...@@ -225,6 +237,7 @@ public class OrderService { ...@@ -225,6 +237,7 @@ public class OrderService {
* @param lendingFormModel * @param lendingFormModel
* @return * @return
*/ */
@Transactional
public boolean lending(LendingFormModel lendingFormModel) { public boolean lending(LendingFormModel lendingFormModel) {
boolean result; boolean result;
...@@ -234,10 +247,20 @@ public class OrderService { ...@@ -234,10 +247,20 @@ public class OrderService {
ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoAndRegisteredFromLastOne(lendingFormModel.getChannelOrderNumber(), lendingFormModel.getChannelId()); ClfOrderMapping orderMapping = this.clfOrderMappingRepository.findByChannelOrderNoAndRegisteredFromLastOne(lendingFormModel.getChannelOrderNumber(), lendingFormModel.getChannelId());
// 更新合同状态 // 更新合同状态
this.xyqbCenterService.updateContractStatus(orderMapping.getQgUserId(), 2); Contract conscont= contractRepository.findByUserId(orderMapping.getQgUserId());
if (conscont != null) {
conscont.setGenerateStatus(2);
contractRepository.save(conscont);
}
// 更新待放款时间 // 更新待放款时间
this.xyqbCenterService.updateFundLendingTime(orderMapping.getLoanId()); FundLending fundLending = fundLendingRepository.findByLoanId(orderMapping.getLoanId());
if (fundLending != null) {
LocalDateTime localDateTime = LocalDateTime.now();
localDateTime.plusMinutes(-5L);
fundLending.setCreateTime(new Date(localDateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
fundLendingRepository.save(fundLending);
}
Map data = this.xyqbCenterService.queryLendingRecordCount(orderApprove.getFundId(), 0); Map data = this.xyqbCenterService.queryLendingRecordCount(orderApprove.getFundId(), 0);
......
...@@ -11,9 +11,9 @@ import lombok.Getter; ...@@ -11,9 +11,9 @@ import lombok.Getter;
@Getter @Getter
public enum ApplicationStatus implements Status<ApplicationStatus> { public enum ApplicationStatus implements Status<ApplicationStatus> {
SUCCESS(200000, "Service request processing successful"), SUCCESS(200000, "请求处理成功"),
FAILURE(500000, "Service request processing failure"), FAILURE(500000, "请求处理失败"),
INTERNAL_SERVICE_ERROR(500001, "内部服务错误"), INTERNAL_SERVICE_ERROR(500001, "内部服务错误"),
......
...@@ -26,6 +26,6 @@ public class Contract { ...@@ -26,6 +26,6 @@ public class Contract {
* 状态 * 状态
*/ */
@Column(name = "generate_status") @Column(name = "generate_status")
private Integer generate_status; private Integer generateStatus;
} }
...@@ -22,7 +22,7 @@ public class FundLending { ...@@ -22,7 +22,7 @@ public class FundLending {
* 借款订单号 * 借款订单号
*/ */
@Column(name = "loan_application_history_id") @Column(name = "loan_application_history_id")
private String loanId; private Long loanId;
/** /**
* 放款金额 * 放款金额
......
...@@ -2,8 +2,9 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.repository; ...@@ -2,8 +2,9 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract; import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource; import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
...@@ -11,7 +12,7 @@ import org.springframework.stereotype.Repository; ...@@ -11,7 +12,7 @@ import org.springframework.stereotype.Repository;
*/ */
@XYQBDataSource @XYQBDataSource
@Repository @Repository
public interface ContractRepository extends CrudRepository<Contract, Long> { public interface ContractRepository extends JpaRepository<Contract, Long> {
/** /**
* 更新合同状态 * 更新合同状态
...@@ -20,7 +21,9 @@ public interface ContractRepository extends CrudRepository<Contract, Long> { ...@@ -20,7 +21,9 @@ public interface ContractRepository extends CrudRepository<Contract, Long> {
* @param status * @param status
* @return * @return
*/ */
@Query("update Contract set generate_status = :status where userId = :userId") @Modifying
boolean updateContractStatus(Long userId, Integer status); @Query(value = "update contract set generate_status = ?2 where user_id = ?1", nativeQuery = true)
int updateContractStatus(Long userId, Integer status);
Contract findByUserId(Long qgUserId);
} }
...@@ -2,10 +2,13 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.repository; ...@@ -2,10 +2,13 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundLending; import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundLending;
import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource; import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
import org.hibernate.annotations.SQLUpdate;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
...@@ -24,7 +27,9 @@ public interface FundLendingRepository extends CrudRepository<FundLending, Integ ...@@ -24,7 +27,9 @@ public interface FundLendingRepository extends CrudRepository<FundLending, Integ
* @param time * @param time
* @return * @return
*/ */
@Query("update FundLending set createTime = :createTime where loanId = :loanId") @Modifying
@Transactional
@Query("update FundLending set createTime = ?2 where loanId = ?1")
boolean updateCreateTime(@Param("loanId") Long loanId, @Param("createTime") Date time); boolean updateCreateTime(@Param("loanId") Long loanId, @Param("createTime") Date time);
/** /**
...@@ -34,7 +39,9 @@ public interface FundLendingRepository extends CrudRepository<FundLending, Integ ...@@ -34,7 +39,9 @@ public interface FundLendingRepository extends CrudRepository<FundLending, Integ
* @param progress * @param progress
* @return * @return
*/ */
@Query("select sum(amount) as totalAmount ,count(fundId) as totalCount from FundLending where progress = :progress and fundId = :fundId") @Query("select sum(amount) as totalAmount ,count(fundId) as totalCount from FundLending where progress = ?2 and fundId = ?1")
Map queryLendingRecordCount(Integer fundId, Integer progress); Map queryLendingRecordCount(@Param("fundId")Integer fundId, @Param("progress")Integer progress);
FundLending findByLoanId(Long loanId);
} }
\ No newline at end of file
...@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil; ...@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -46,7 +47,8 @@ public class XYQBCenterService { ...@@ -46,7 +47,8 @@ public class XYQBCenterService {
* @param userId * @param userId
* @return * @return
*/ */
public boolean updateContractStatus(Long userId, Integer status) { @Transactional
public int updateContractStatus(Long userId, Integer status) {
return this.contractRepository.updateContractStatus(userId, status); return this.contractRepository.updateContractStatus(userId, status);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment