diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/InstallmentHistoryDetail.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/InstallmentHistoryDetail.java index 1e6ca93..48bbae9 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/InstallmentHistoryDetail.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/InstallmentHistoryDetail.java @@ -74,9 +74,9 @@ public class InstallmentHistoryDetail extends BaseEntity /** 还款期数 */ @ApiModelProperty(value="还款期数") - @Excel(name = "还款期数") + @Excel(name = "还款期数") private Integer periods; - + private Long repaymentAccountId; @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -96,6 +96,7 @@ public class InstallmentHistoryDetail extends BaseEntity .append("remark", getRemark()) .append("type", getType()) .append("periods", getPeriods()) + .append("repaymentAccountId", getRepaymentAccountId()) .toString(); } } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryDetailVo.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryDetailVo.java index 65e9632..b7594e7 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryDetailVo.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryDetailVo.java @@ -15,6 +15,6 @@ public class InstallmentHistoryDetailVo extends InstallmentHistoryDetail { private String bankCardLendName; - + private String repaymentAccountName; } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryVo.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryVo.java index f8ec5ba..4805934 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryVo.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/InstallmentHistoryVo.java @@ -46,5 +46,8 @@ public class InstallmentHistoryVo extends InstallmentHistory @ApiModelProperty(value="收款账户卡号") private String receivingAccountCode; + @ApiModelProperty(value="收款账户名称卡号") + private String receivingAccountNameCode; + } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/AccountsTransferRecordServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/AccountsTransferRecordServiceImpl.java index c238ef4..f206f74 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -759,7 +759,7 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor } AccountsDealRecord dealInterest=new AccountsDealRecord(); - + dealInterest.setTransferRecordId(accountsTransferRecord.getId()); dealInterest.setAccountId(debitAccount.getAccountId()); dealInterest.setId(IdWorker.getId()); //支出金额 diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryDetailServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryDetailServiceImpl.java index de70cf5..aaf9a6c 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryDetailServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryDetailServiceImpl.java @@ -5,6 +5,7 @@ import com.intc.common.core.utils.IdWorker; import com.intc.common.core.utils.StringUtils; import com.intc.common.security.utils.SecurityUtils; import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.AccountsTransferRecord; import com.intc.invest.domain.InstallmentHistory; import com.intc.invest.domain.InstallmentHistoryDetail; import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; @@ -15,6 +16,7 @@ import com.intc.invest.mapper.AccountsDealRecordMapper; import com.intc.invest.mapper.AccountsMapper; import com.intc.invest.mapper.InstallmentHistoryDetailMapper; import com.intc.invest.mapper.InstallmentHistoryMapper; +import com.intc.invest.service.IAccountsTransferRecordService; import com.intc.invest.service.IInstallmentHistoryDetailService; import org.springframework.stereotype.Service; @@ -43,6 +45,9 @@ public class InstallmentHistoryDetailServiceImpl implements IInstallmentHistoryD @Resource private InstallmentHistoryMapper installmentHistoryMapper; + @Resource + private IAccountsTransferRecordService transferRecordService; + /** * 查询分期历史明细 * @@ -171,6 +176,21 @@ public class InstallmentHistoryDetailServiceImpl implements IInstallmentHistoryD } } + //如果是贷款 + if(installmentHistoryDetail.getType().equals("3")){ + AccountsTransferRecord transferRecord=new AccountsTransferRecord(); + transferRecord.setOutAccountId(installmentHistoryDetail.getBankCardLendId()); + transferRecord.setInAccountId(installmentHistoryDetail.getRepaymentAccountId()); + transferRecord.setAmount(installmentHistoryDetail.getPrincipal()); + transferRecord.setCommission(installmentHistoryDetail.getInterest()); + transferRecord.setId(IdWorker.getId()); + transferRecord.setCreateTime(new Date()); + //借贷 + transferRecord.setType("5"); + //还款 + transferRecord.setDealType("2"); + transferRecordService.insertAccountsTransferRecord(transferRecord); + } //应还款金额=本金加利息 installmentHistoryDetail.setCurrentAmount(installmentHistoryDetail.getPrincipal()+installmentHistoryDetail.getInterest()); return installmentHistoryDetailMapper.updateInstallmentHistoryDetail(installmentHistoryDetail); diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryServiceImpl.java index 86cad26..b5df2f6 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/InstallmentHistoryServiceImpl.java @@ -4,6 +4,7 @@ import com.intc.common.core.utils.DateUtils; import com.intc.common.core.utils.IdWorker; import com.intc.common.core.utils.StringUtils; import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.AccountsTransferRecord; import com.intc.invest.domain.InstallmentHistory; import com.intc.invest.domain.InstallmentHistoryDetail; import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; @@ -12,6 +13,8 @@ import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; import com.intc.invest.domain.vo.InstallmentHistoryVo; import com.intc.invest.mapper.InstallmentHistoryDetailMapper; import com.intc.invest.mapper.InstallmentHistoryMapper; +import com.intc.invest.service.IAccountsTransferRecordService; +import com.intc.invest.service.ICreditCardBillService; import com.intc.invest.service.IInstallmentHistoryService; import org.springframework.stereotype.Service; @@ -37,6 +40,10 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService @Resource private InstallmentHistoryDetailMapper installmentHistoryDetailMapper; + + @Resource + private IAccountsTransferRecordService transferRecordService; + /** * 查询网贷及分期历史 * @@ -82,6 +89,13 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService interestRate=interestRate*12/installmentHistory.getPeriod(); } } + + if(installmentHistory.getReceivingAccountCode()!=null){ + installmentHistory.setReceivingAccountNameCode(installmentHistory.getReceivingAccountName()+"（"+ StringUtils.getLastNumberChars(4,installmentHistory.getReceivingAccountCode()+"）")); + }else { + installmentHistory.setReceivingAccountNameCode(installmentHistory.getReceivingAccountName()); + } + interestRate=interestRate*100; String calculateInterestRate= decimalFormat.format(interestRate)+"%"; installmentHistory.setCalculateInterestRate(calculateInterestRate); @@ -121,6 +135,22 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService } //插入分期明细 insertInstallmentHistoryDetail(installmentHistory); + //如果是信贷账户，需要生成一条借贷信息记录 + if(installmentHistory.getType().equals("3")){ + + AccountsTransferRecord transferRecord=new AccountsTransferRecord(); + transferRecord.setOutAccountId(installmentHistory.getBankCardLendId()); + transferRecord.setInAccountId(installmentHistory.getReceivingAccountId()); + transferRecord.setAmount(installmentHistory.getInstallmentAmount()); + transferRecord.setId(IdWorker.getId()); + transferRecord.setCreateTime(installmentHistory.getCreateTime()); + //借贷 + transferRecord.setType("5"); + //借款 + transferRecord.setDealType("1"); + transferRecordService.insertAccountsTransferRecord(transferRecord); + + } } } return installmentHistoryMapper.insertInstallmentHistory(installmentHistory); @@ -169,6 +199,7 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService detail.setCreateBy(SecurityUtils.getUsername()); detail.setCreateTime(DateUtils.getNowDate()); + detail.setRepaymentAccountId(installmentHistory.getReceivingAccountId()); installmentHistoryDetailMapper.insertInstallmentHistoryDetail(detail); } diff --git a/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml index b9feb2f..1faa222 100644 --- a/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -42,16 +44,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.remark, a.type, a.periods, + a.repayment_account_id, CONCAT(bcl."name", '（', right(bcl.code, 4), - '）') as bank_card_lend_name + '）') as bank_card_lend_name, + CONCAT(debit."name", + '（', + right(debit.code, + 4), + '）') as repayment_account_name from installment_history_detail a left join bank_card_lend bcl on bcl.id = a.bank_card_lend_id left join installment_history ih on ih.id=a.installment_history_id + left join bank_card_lend debit on + debit.id = a.repayment_account_id