Skip to content

C
clx-performance
提交 8feefece authored 作者: liuhaiquan's avatar liuhaiquan
浏览文件
操作

Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

上级 4b1917dd 3623c3e2
隐藏空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 47 行删除
performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/PageOwnerLoanAccountApproveParam.java
浏览文件 @ 8feefece
......@@ -22,6 +22,13 @@ public class PageOwnerLoanAccountApproveParam extends PageParam {
@ApiModelProperty("货主名称")
private String ownerUserName;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("待审批 10，审批成功 20，审批拒绝 30")
private Integer status;
......
performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java
浏览文件 @ 8feefece
......@@ -28,11 +28,7 @@ import com.clx.performance.model.loan.OwnerLoanAccountRunningWaterRecord;
import com.clx.performance.model.loan.OwnerRepayment;
import com.clx.performance.model.settle.SettlementDriverDetail;
import com.clx.performance.model.settle.SettlementOwnerDetail;
import com.clx.performance.param.app.OrderChildSaveParam;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.service.loan.OwnerLoanRecordService;
import com.clx.performance.utils.spring.ApplicationContextUtils;
import com.clx.performance.vo.app.SaveOrderChildVO;
import com.clx.user.vo.feign.OwnerInfoFeignVO;
import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException;
......@@ -48,10 +44,6 @@ import java.time.LocalDateTime;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@Component
@AllArgsConstructor
......@@ -163,20 +155,16 @@ public class OrderChildLoanComponent {
throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主已欠款");
}
//TODO 加锁
//查询审批通过并且未用完的借款
LoanBalanceDTO param = new LoanBalanceDTO();
param.setOrderChildPrice(orderChildPrice);
param.setOwnerUserNo(ownerLoanAccount.getOwnerUserNo());
param.setChildNo(childNo);
getLoanBalanceLock(param);
}
/**
* 运单确认人借款相关处理执行
* 运单确认借款相关处理执行
*
* @param settlementDriverDetail
* @param settlementOwnerDetail
......@@ -210,7 +198,7 @@ public class OrderChildLoanComponent {
param.setChildNo(childNo);
param.setSettlementDriverDetail(settlementDriverDetail);
param.setSettlementOwnerDetail(settlementOwnerDetail);
//TODO 钱不够需要流程卡死
//扣钱,获取锁,此处有可能钱不够,抛异常,走网络货运重试
getLoanBalanceLock(param);
runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByOrderNoAndRunningWaterType
......@@ -249,7 +237,7 @@ public class OrderChildLoanComponent {
param.setChildNo(childNo);
param.setSettlementDriverDetail(settlementDriverDetail);
param.setSettlementOwnerDetail(settlementOwnerDetail);
//TODO 钱不够需要流程卡死
//扣钱,获取锁,此处有可能钱不够,抛异常,走网络货运重试
getLoanBalanceLock(param);
runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByOrderNoAndRunningWaterType
......
performance-web/src/main/java/com/clx/performance/config/loan/PaymentFromConfig.java
浏览文件 @ 8feefece
......@@ -12,13 +12,13 @@ import org.springframework.context.annotation.Configuration;
public class PaymentFromConfig {
//借款订单模版编号
private Long loanOrderTemplateNo;
private String loanOrderTemplateNo;
//借款转账模版编号
private Long loanTransferTemplateNo;
private String loanTransferTemplateNo;
//还款订单模版编号
private Long repaymentOrderTemplateNo;
private String repaymentOrderTemplateNo;
//还款转账模版编号
private Long repaymentTransferTemplateNo;
private String repaymentTransferTemplateNo;
}
performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanAccountApproveDaoImpl.java
浏览文件 @ 8feefece
......@@ -34,7 +34,10 @@ public class OwnerLoanAccountApproveDaoImpl extends BaseDaoImpl<OwnerLoanAccount
if(Objects.nonNull(param.getStatus())){
query.like(OwnerLoanAccountApprove :: getStatus,param.getStatus());
}
query.orderByDesc(OwnerLoanAccountApprove :: getCreateTime);
if(StringUtils.isNotBlank(param.getMobile())){
query.eq(OwnerLoanAccountApprove :: getMobile,param.getMobile());
}
query.orderByDesc(OwnerLoanAccountApprove :: getId);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
}
......
performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanAccountMapper.java
浏览文件 @ 8feefece
......@@ -18,9 +18,11 @@ import org.apache.ibatis.annotations.Update;
*/
public interface OwnerLoanAccountMapper extends BaseMapper<OwnerLoanAccount> {
@Update("update owner_loan_account set funding_amount = funding_amount + #{account.fundingAmount}"
+ ",virtually_amount = virtually_amount + #{account.virtuallyAmount}"
+ ",modified_time= #{now}"
@Update("update owner_loan_account set funding_account_balance = funding_account_balance + #{account.fundingAccountBalance}" +
",funding_usable_balance = funding_usable_balance + #{account.fundingUsableBalance},funding_frozen_balance = funding_frozen_balance + #{account.fundingFrozenBalance}" +
",virtually_account_balance = virtually_account_balance + #{account.virtuallyAccountBalance},virtually_usable_balance = virtually_usable_balance + #{account.virtuallyUsableBalance}" +
",virtually_frozen_balance = virtually_frozen_balance + #{account.virtuallyFrozenBalance}" +
",modified_time=#{now}"
+ "where id = #{account.id} and modified_time = #{account.modifiedTime}"
)
Integer addAccount(@Param("account") OwnerLoanAccount account, @Param("now") String nowStr);
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java
浏览文件 @ 8feefece
......@@ -152,7 +152,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
ownerLoanRecord.setLoanType(param.getLoanType());
if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(param.getLoanType())) {
//资金 TODO 调宁波银企直连的产品，从诚联信账户中给鑫祥和执行转账
//资金
BankTrade bankTrade = new BankTrade();
if (OwnerLoanRecordEnum.PayChannel.ORDER_DIRECT_PAY.getCode().equals(param.getPayChannel())) {
// 订单支付
......@@ -192,23 +192,26 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
} else {
// 虚拟币 直接增加 更改状态审批通过
ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_PASS.getCode());
}
while (true) {
OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
ownerLoanRecord.getOwnerUserNo()).get();
OwnerLoanAccount entity = new OwnerLoanAccount();
entity.setId(ownerLoanAccount.getId());
/* entity.setVirtuallyAmount(ownerLoanRecord.getLoanBalance());
entity.setFundingAmount(BigDecimal.ZERO);*/
entity.setModifiedTime(ownerLoanAccount.getModifiedTime());
Integer flag = ownerLoanAccountDao.updateAccountCAS(entity, LocalDateTime.now(), true);
if (flag == 1) {
//生成借款流水
initOwnerLoanRunningWaterRecord(ownerLoanRecord);
//生成还款记录
initOwnerRepayment(ownerLoanRecord);
break;
while (true) {
OwnerLoanAccount ownerLoanAccount = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
ownerLoanRecord.getOwnerUserNo()).get();
OwnerLoanAccount entity = new OwnerLoanAccount();
entity.setId(ownerLoanAccount.getId());
entity.setFundingAccountBalance(BigDecimal.ZERO);
entity.setFundingFrozenBalance(BigDecimal.ZERO);
entity.setFundingUsableBalance(BigDecimal.ZERO);
entity.setVirtuallyAccountBalance(ownerLoanRecord.getLoanBalance());
entity.setVirtuallyFrozenBalance(BigDecimal.ZERO);
entity.setVirtuallyUsableBalance(ownerLoanRecord.getLoanBalance());
entity.setModifiedTime(ownerLoanAccount.getModifiedTime());
Integer flag = ownerLoanAccountDao.updateAccountCAS(entity, LocalDateTime.now(), true);
if (flag == 1) {
//生成借款流水
initOwnerLoanRunningWaterRecord(ownerLoanRecord);
//生成还款记录
initOwnerRepayment(ownerLoanRecord);
break;
}
}
}
......@@ -355,9 +358,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
// 创建合同
GenerateContractParam feignParam = new GenerateContractParam();
if (Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(), param.getPayWay())) {
feignParam.setTemplateNo(paymentFromConfig.getLoanOrderTemplateNo());
feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getLoanOrderTemplateNo()));
} else {
feignParam.setTemplateNo(paymentFromConfig.getLoanTransferTemplateNo());
feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getLoanTransferTemplateNo()));
}
feignParam.setParametersValueMap(map);
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java
浏览文件 @ 8feefece
......@@ -108,9 +108,9 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
// 创建合同
GenerateContractParam feignParam = new GenerateContractParam();
if(Objects.equals(OwnerRePaymentEnum.Channel.ORDER.getCode(),param.getPayWay())){
feignParam.setTemplateNo(paymentFromConfig.getRepaymentOrderTemplateNo());
feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getRepaymentOrderTemplateNo()));
}else{
feignParam.setTemplateNo(paymentFromConfig.getRepaymentTransferTemplateNo());
feignParam.setTemplateNo(Long.valueOf(paymentFromConfig.getRepaymentTransferTemplateNo()));
}
feignParam.setParametersValueMap(map);
......
performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java
浏览文件 @ 8feefece
......@@ -78,7 +78,7 @@ public class NbBankServiceImpl implements NbBankService {
@Override
public NbBankOrderPayResultVO orderDirectPay(Long loanNo, Integer amount,
String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
String merSeqNo = String.valueOf(loanNo);
String merDtTm = LocalDateTimeUtils.formatTime();
String closeDtTm = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.parseTime(merDtTm).plusDays(30));
......
performance-web/src/main/java/com/clx/performance/sqlProvider/loan/BorrowerSqlProvider.java
浏览文件 @ 8feefece
......@@ -35,11 +35,12 @@ public class BorrowerSqlProvider {
return new SQL(){{
SELECT(" a.name,a.bank_card_no as bankCardNo,b.type,b.day ");
FROM("borrower a");
LEFT_OUTER_JOIN("borrower_config b on a.id = b.borrower_id ");
WHERE("a.delete_status = " + DeleteStatusEnum.NO.getCode());
WHERE("a.status = " + StatusEnum.YES.getCode());
WHERE("b.delete_status = " + DeleteStatusEnum.NO.getCode());
WHERE("b.status = " + StatusEnum.YES.getCode());
ORDER_BY("create_time desc");
ORDER_BY("a.id desc");
}}.toString();
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论