diff --git a/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip b/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip new file mode 100644 index 0000000..9cda898 Binary files /dev/null and b/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip differ diff --git a/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip b/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip new file mode 100644 index 0000000..3b15549 Binary files /dev/null and b/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip differ diff --git a/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip b/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip new file mode 100644 index 0000000..26bdcb2 Binary files /dev/null and b/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip differ diff --git a/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip b/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip new file mode 100644 index 0000000..c877dc6 Binary files /dev/null and b/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip differ diff --git a/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip b/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip new file mode 100644 index 0000000..7809081 Binary files /dev/null and b/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip differ diff --git a/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip b/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip new file mode 100644 index 0000000..2ef7277 Binary files /dev/null and b/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip differ diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java index 79d73a8..15558d2 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java @@ -22,6 +22,10 @@ public class BankCardLendDto extends BaseEntity implements Serializable @ApiModelProperty(value="银行卡名称") private String name; + /** 银行卡号 */ + @ApiModelProperty(value="银行卡号") + private String code; + /** 类型，1储蓄卡，2信用卡 */ @ApiModelProperty(value="类型，1储蓄卡，2信用卡") private String type; @@ -30,6 +34,10 @@ public class BankCardLendDto extends BaseEntity implements Serializable @ApiModelProperty(value="网贷类型") private String lendType; + /** 储蓄卡类型 */ + @ApiModelProperty(value="储蓄卡类型") + private String debitType; + /** 信用卡id */ @ApiModelProperty(value="信用卡id") private Long creditCardId; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java index 49d1545..9f5d004 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -55,8 +55,10 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor public AccountsTransferRecordVo selectAccountsTransferRecordById(Long id) { AccountsTransferRecordVo vo=accountsTransferRecordMapper.selectAccountsTransferRecordById(id); - if(vo.getDealType().equals("2")){ - vo.setInAccountId(vo.getOutAccountId()); + if(vo.getDealType()!=null){ + if(vo.getDealType().equals("2")){ + vo.setInAccountId(vo.getOutAccountId()); + } } return vo; } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java index 2c00aed..2cc631f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java @@ -39,7 +39,21 @@ public class BankCardLendServiceImpl implements IBankCardLendService @Override public BankCardLendVo selectBankCardLendById(Long id) { - return bankCardLendMapper.selectBankCardLendById(id); + BankCardLendVo bankCard= bankCardLendMapper.selectBankCardLendById(id); + //修改名称加卡号 + if(bankCard.getCode()!=null){ + bankCard.setNameCode(bankCard.getName()+"（"+ StringUtils.getLastNumberChars(4,bankCard.getCode()+"）")); + }else { + bankCard.setNameCode(bankCard.getName()); + } + if(!"null".equals(String.valueOf(bankCard.getBillDate()))) { + bankCard.setBillDateName(bankCard.getBillDate()+"号"); + } + if(!"null".equals(String.valueOf(bankCard.getPayDate()))) { + bankCard.setPayDateName(bankCard.getPayDate()+"号"); + } + + return bankCard; } /** diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml index bd9f9ed..cf26f9b 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml @@ -39,7 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag='0' and a.name like '%'|| #{name}||'%' + and a.code like '%'|| #{code}||'%' and a.type = #{type} + and a.debit_type = #{debitType} and a.id = #{creditCardId} and a.lend_type = #{lendType} diff --git a/sql/20240620-sql/dump-intc_invest_dev-202406201231 b/sql/20240620-sql/dump-intc_invest_dev-202406201231 new file mode 100644 index 0000000..df0b381 Binary files /dev/null and b/sql/20240620-sql/dump-intc_invest_dev-202406201231 differ diff --git a/sql/20240620-sql/dump-intc_invest_prod-202406201231 b/sql/20240620-sql/dump-intc_invest_prod-202406201231 new file mode 100644 index 0000000..f296ba8 Binary files /dev/null and b/sql/20240620-sql/dump-intc_invest_prod-202406201231 differ diff --git a/sql/20240620-sql/dump-intc_system-202406201231 b/sql/20240620-sql/dump-intc_system-202406201231 new file mode 100644 index 0000000..169ce32 Binary files /dev/null and b/sql/20240620-sql/dump-intc_system-202406201231 differ