From 6f931da7954a88aa771dbf1381e3355f027dbd48 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Mon, 8 Jul 2024 07:02:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=B0=E8=B4=A6=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8E=E5=85=B6=E4=BB=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8A=9F=E8=83=BD=E8=81=94=E5=90=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/invest/domain/BankCardLend.java | 10 ++++++ .../com/ruoyi/invest/domain/FutureStocks.java | 10 ++++++ .../service/impl/BankCardLendServiceImpl.java | 4 +-- .../service/impl/FutureStocksServiceImpl.java | 4 +-- .../mapper/invest/BankCardLendMapper.xml | 31 ++++++++++++++++++- .../mapper/invest/FutureStocksMapper.xml | 7 ++++- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java index cdad4bd..9b87c42 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java @@ -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(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java index 269cc45..7f5039d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java @@ -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(); } } 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 d477129..18a6bf3 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 @@ -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); diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java index f2947da..0c0dbf6 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java @@ -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); 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 cf26f9b..ba0ffe2 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 @@ -28,10 +28,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - 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