diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java index 7b1e377..a59156e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java @@ -14,25 +14,31 @@ import lombok.Data; @Data public class AccountsVo extends Accounts { - @ApiModelProperty(value="银行卡名称卡号)") + @ApiModelProperty(value="名称卡号") private String nameCode; /** 账单日 */ - @ApiModelProperty(value="账单日)") + @ApiModelProperty(value="账单日") private int billDate; /** 还款日 */ - @ApiModelProperty(value="还款日)") + @ApiModelProperty(value="还款日") private int payDate; - @ApiModelProperty(value="账单日)") + @ApiModelProperty(value="账单日") private String billDateName; - @ApiModelProperty(value="还款日)") + @ApiModelProperty(value="还款日") private String payDateName; /** 储蓄卡类型,1:I类卡,2:II类卡 */ @ApiModelProperty(value="储蓄卡类型,1:I类卡,2:II类卡") private String debitType; + @ApiModelProperty(value="名称卡号可用额度") + private String nameCodeAvailableLimit; + + @ApiModelProperty(value="类型名称卡号可用额度)") + private String typeNameCodeAvailableLimit; + } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java index fac4c16..3671637 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java @@ -54,7 +54,8 @@ public class AccountsDealRecordServiceImpl implements IAccountsDealRecordService @Override public List selectAccountsDealRecordList(AccountsDealRecordDto accountsDealRecordDto) { - return accountsDealRecordMapper.selectAccountsDealRecordList(accountsDealRecordDto); + List list=accountsDealRecordMapper.selectAccountsDealRecordList(accountsDealRecordDto); + return list; } /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java index 9aae127..3b3fc2e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java @@ -76,9 +76,13 @@ public class AccountsServiceImpl implements IAccountsService break; } if(accounts.getCode()!=null){ - accounts.setNameCode(typeName+accounts.getName()+"("+ StringUtils.getLastNumberChars(4,accounts.getCode()+")")+"-可用额度("+accounts.getAvailableLimit()+")"); + accounts.setNameCodeAvailableLimit(accounts.getName()+"("+ StringUtils.getLastNumberChars(4,accounts.getCode()+")")+"-可用额度("+accounts.getAvailableLimit()+")"); + accounts.setTypeNameCodeAvailableLimit(typeName+accounts.getName()+"("+ StringUtils.getLastNumberChars(4,accounts.getCode()+")")+"-可用额度("+accounts.getAvailableLimit()+")"); + accounts.setNameCode(accounts.getName()+"("+ StringUtils.getLastNumberChars(4,accounts.getCode()+")")); }else { - accounts.setNameCode(typeName+accounts.getName()); + accounts.setNameCodeAvailableLimit(accounts.getName()); + accounts.setTypeNameCodeAvailableLimit(typeName+accounts.getName()); + accounts.setNameCode(accounts.getName()); } if(!"null".equals(String.valueOf(accounts.getBillDate()))) { accounts.setBillDateName(accounts.getBillDate()+"号"); diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java index 6f564cc..c5f38a4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java @@ -42,7 +42,9 @@ public class CreditCardBillServiceImpl implements ICreditCardBillService @Override public CreditCardBillVo selectCreditCardBillById(Long id) { - return creditCardBillMapper.selectCreditCardBillById(id); + CreditCardBillVo creditCardBill=creditCardBillMapper.selectCreditCardBillById(id); + creditCardBill.setBankNameCode(creditCardBill.getBankName()+"("+ StringUtils.getLastNumberChars(4,creditCardBill.getBankCode()+")")); + return creditCardBill; } /**