fix:记账账户功能,与其他模块功能联合。
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user