qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:记账账户功能，与其他模块功能联合。

Browse Source
This commit is contained in:
tianyongbao
2024-07-08 07:02:25 +08:00
parent 792b72bc93
commit 6f931da795
6 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java
View File

@@ -118,6 +118,14 @@ public class BankCardLend extends BaseEntity
@Excel(name = "0账单")
private String isZeroBill;
/** 余额 */
@ApiModelProperty(value="余额)")
private Double balance;
/** 可用额度 */
@ApiModelProperty(value="可用额度")
private Double availableLimit;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -144,6 +152,8 @@ public class BankCardLend extends BaseEntity
.append("isNextBillDate", getIsNextBillDate())
.append("nextBillDateTime", getNextBillDateTime())
.append("isZeroBill", getIsZeroBill())
.append("balance", getBalance())
.append("availableLimit", getAvailableLimit())
.toString();
}
}

10
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java
View File

@@ -82,6 +82,14 @@ public class FutureStocks extends BaseEntity
/** 删除标志（0代表存在 1代表删除） */
private String delFlag;
/** 余额 */
@ApiModelProperty(value="余额)")
private Double balance;
/** 可用额度 */
@ApiModelProperty(value="可用额度")
private Double availableLimit;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -103,6 +111,8 @@ public class FutureStocks extends BaseEntity
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.append("remark", getRemark())
.append("balance", getBalance())
.append("availableLimit", getAvailableLimit())
.toString();
}
}

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java
View File

@@ -103,14 +103,14 @@ public class BankCardLendServiceImpl implements IBankCardLendService
accounts.setCreateTime(DateUtils.getNowDate());
accounts.setId(IdWorker.getId());
accounts.setAccountId(accounts.getId());
accounts.setBalance(0.0);
accounts.setBalance(bankCard.getBalance());
accounts.setId(bankCard.getId());
accounts.setAccountId(bankCard.getId());
accounts.setName(bankCard.getName());
accounts.setType(bankCard.getType());
accounts.setCreditLimit(bankCard.getCreditLimit());
accounts.setCode(bankCard.getCode());
accounts.setAvailableLimit(Double.parseDouble(String.valueOf(bankCard.getCreditLimit())));
accounts.setAvailableLimit(bankCard.getAvailableLimit());
accounts.setState("1");
accountsMapper.insertAccounts(accounts);

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java
View File

@@ -107,14 +107,14 @@ public class FutureStocksServiceImpl implements IFutureStocksService
accounts.setCreateTime(DateUtils.getNowDate());
accounts.setId(IdWorker.getId());
accounts.setAccountId(accounts.getId());
accounts.setBalance(0.0);
accounts.setBalance(futureStocks.getBalance());
accounts.setId(futureStocks.getId());
accounts.setAccountId(futureStocks.getId());
accounts.setName(futureStocks.getName());
accounts.setType("5");
accounts.setCreditLimit(0);
accounts.setCode(futureStocks.getCode());
accounts.setAvailableLimit(0d);
accounts.setAvailableLimit(futureStocks.getBalance());
accounts.setState("1");
accountsMapper.insertAccounts(accounts);
return futureStocksMapper.insertFutureStocks(futureStocks);

31
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml
View File

@@ -28,10 +28,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isNextBillDate" column="is_next_bill_date" />
<result property="nextBillDateTime" column="next_bill_date_time" />
<result property="isZeroBill" column="is_zero_bill" />
<result property="balance" column="balance" />
<result property="availableLimit" column="available_limit" />
</resultMap>
<sql id="selectBankCardLendVo">
select a.id, a.name, a.type, a.code, a.opening_bank, a.activation_date, a.bill_date, a.pay_date, a.delay_period, a.credit_limit, a.effective_date, a.cvv, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.debit_type, a.lend_type, a.is_next_bill_date, a.next_bill_date_time, a.is_zero_bill from bank_card_lend a
select
a.id,
a.name,
a.type,
a.code,
a.opening_bank,
a.activation_date,
a.bill_date,
a.pay_date,
a.delay_period,
a.credit_limit,
a.effective_date,
a.cvv,
a.create_by,
a.create_time,
a.update_by,
a.update_time,
a.del_flag,
a.remark,
a.debit_type,
a.lend_type,
a.is_next_bill_date,
a.next_bill_date_time,
a.is_zero_bill,
t.balance,
t.available_limit,
from bank_card_lend a
left join accounts t on t.id=a.id
</sql>
<select id="selectBankCardLendList" parameterType="BankCardLendDto" resultMap="BankCardLendResult">

7
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml
View File

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="bankName" column="bank_name" />
<result property="bankCode" column="bank_code" />
<result property="balance" column="balance" />
<result property="availableLimit" column="available_limit" />
</resultMap>
<sql id="selectFutureStocksVo">
@@ -48,11 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag,
a.remark ,
bc."name" as bank_name,
bc.code as bank_code
bc.code as bank_code,
t.balance,
t.available_limit,
from
future_stocks a
left join bank_card_lend bc on
bc.id = a.debit_card
left join accounts t on t.id=a.id
</sql>
<select id="selectFutureStocksList" parameterType="FutureStocksDto" resultMap="FutureStocksResult">