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

fix: 系统功能升级，账户增加status字段，修改相关功能。

Browse Source
This commit is contained in:
tianyongbao
2024-07-17 19:41:00 +08:00
parent 451c1b8388
commit a0428c4f2c
13 changed files with 89 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java
View File

@@ -61,10 +61,15 @@ public class Accounts extends BaseEntity
/** 账户主键 */
private Long accountId;
/** 账户显示隐藏状态 */
@ApiModelProperty(value="账户显示隐藏状态")
@Excel(name = "账户显示隐藏状态")
private String state;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
@Excel(name = "账户状态")
private String state;
private String status;
@Override
public String toString() {
@@ -84,6 +89,7 @@ public class Accounts extends BaseEntity
.append("remark", getRemark())
.append("accountId", getAccountId())
.append("state", getState())
.append("status", getStatus())
.toString();
}
}

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

@@ -126,6 +126,10 @@ public class BankCardLend extends BaseEntity
@ApiModelProperty(value="可用额度")
private Double availableLimit;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
@Excel(name = "账户状态")
private String status;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -154,6 +158,7 @@ public class BankCardLend extends BaseEntity
.append("isZeroBill", getIsZeroBill())
.append("balance", getBalance())
.append("availableLimit", getAvailableLimit())
.append("status", getStatus())
.toString();
}
}

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

@@ -90,6 +90,11 @@ public class FutureStocks extends BaseEntity
@ApiModelProperty(value="可用额度")
private Double availableLimit;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
@Excel(name = "账户状态")
private String status;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -113,6 +118,7 @@ public class FutureStocks extends BaseEntity
.append("remark", getRemark())
.append("balance", getBalance())
.append("availableLimit", getAvailableLimit())
.append("status", getStatus())
.toString();
}
}

6
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java
View File

@@ -83,6 +83,11 @@ public class PosMachine extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
private Date activationDate;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
@Excel(name = "账户状态")
private String status;
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -105,6 +110,7 @@ public class PosMachine extends BaseEntity
.append("merchantCode", getMerchantCode())
.append("activationDate", getActivationDate())
.append("ratePlus", getRatePlus())
.append("status", getStatus())
.toString();
}
}

6
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java
View File

@@ -27,11 +27,15 @@ public class AccountsDto extends BaseEntity implements Serializable
private String type;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
@ApiModelProperty(value="账户显示隐藏状态")
private String state;
/** 账户状态 */
@ApiModelProperty(value="账户id")
private Long accountId;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
private String status;
}

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java
View File

@@ -42,4 +42,8 @@ public class BankCardLendDto extends BaseEntity implements Serializable
@ApiModelProperty(value="信用卡id")
private Long creditCardId;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
private String status;
}

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java
View File

@@ -26,4 +26,8 @@ public class FutureStocksDto extends BaseEntity implements Serializable
@ApiModelProperty(value="类型，1期货，2股票")
private String type;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
private String status;
}

4
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java
View File

@@ -30,4 +30,8 @@ public class PosMachineDto extends BaseEntity implements Serializable
@ApiModelProperty(value="商户名称")
private String merchantName;
/** 账户状态 */
@ApiModelProperty(value="账户状态")
private String status;
}

29
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
View File

@@ -94,14 +94,26 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
//返回数据
HashMap<String, Object> map = new HashMap<>();
//Pos机
map.put("posCount",posMachineMapper.selectPosMachineList(new PosMachineDto()).size());
PosMachineDto posMachineDto=new PosMachineDto();
//状态为正常使用
posMachineDto.setStatus("1");
map.put("posCount",posMachineMapper.selectPosMachineList(posMachineDto).size());
BankCardLendDto bankCardLendDto=new BankCardLendDto();
//状态为正常使用
bankCardLendDto.setStatus("1");
bankCardLendDto.setType("2");
//信用卡
map.put("creditCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
bankCardLendDto.setType("1");
//储蓄卡
map.put("debitCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
bankCardLendDto.setType("1");
bankCardLendDto.setDebitType("1");
//I类储蓄卡
map.put("debitICount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
bankCardLendDto.setDebitType("2");
//II类储蓄卡
map.put("debitIICount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
bankCardLendDto.setType("3");
bankCardLendDto.setLendType("1");
//网贷
@@ -112,6 +124,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
map.put("peopleLendCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
FutureStocksDto futureStocksDto=new FutureStocksDto();
//状态为正常使用
futureStocksDto.setStatus("1");
futureStocksDto.setType("1");
//期货
map.put("futuresCount",futureStocksMapper.selectFutureStocksList(futureStocksDto).size());
@@ -128,6 +142,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
DecimalFormat decimalFormat = new DecimalFormat("#.##");
AccountsDto dto=new AccountsDto();
//状态正常，不隐藏
dto.setStatus("1");
dto.setState("1");
//储蓄卡
dto.setType("1");
@@ -138,7 +154,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
}
map.put("debetBalance",decimalFormat.format(debetBalance));
dto.setState("1");
//信用卡
dto.setType("2");
accountsList=accountsMapper.selectAccountsList(dto);
@@ -336,7 +352,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
map.put("creditLimit",creditLimit);
AccountsDto dto=new AccountsDto();
dto.setState("1");
//正常使用
dto.setStatus("1");
//信用卡
dto.setType("2");
List<AccountsVo> accountsList=accountsMapper.selectAccountsList(dto);
@@ -447,7 +464,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
map.put("creditCardCount",bankCardLendMapper.selectBankCardLendList(bankCardLendDto).size());
AccountsDto dto=new AccountsDto();
dto.setState("1");
//正常使用
dto.setStatus("1");
//信用卡
dto.setType("2");
dto.setAccountId(analysisDto.getId());
@@ -1360,7 +1378,8 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
HashMap<String, Object> map = new HashMap<>();
DecimalFormat decimalFormat = new DecimalFormat("#.##");
AccountsDto dto=new AccountsDto();
dto.setState("1");
//正常使用
dto.setStatus("1");
//储蓄卡
dto.setType("1");
List<AccountsVo> accountsList=accountsMapper.selectAccountsList(dto);

6
ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml
View File

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="payDate" column="pay_date" />
<result property="creditLimit" column="credit_limit" />
<result property="debitType" column="debit_type" />
<result property="status" column="status" />
</resultMap>
<sql id="selectAccountsVo">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.remark,
a.account_id,
a.state,
a.status,
bcl.bill_date ,
bcl.pay_date ,
bcl.credit_limit ,
@@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="state != null and state != ''"> and a.state = #{state}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="accountId != null and accountId != ''"> and a.account_id = #{accountId}</if>
</where>
<!-- 数据范围过滤 -->
@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="accountId != null and accountId != ''">account_id,</if>
<if test="state != null">state,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -107,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="accountId != null and accountId != ''">#{accountId},</if>
<if test="state != null">#{state},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
@@ -127,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="accountId != null and accountId != ''">account_id = #{accountId},</if>
<if test="state != null">state = #{state},</if>
<if test="status != null">status = #{status},</if>
</trim>
where id = #{id}
</update>

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

@@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isZeroBill" column="is_zero_bill" />
<result property="balance" column="balance" />
<result property="availableLimit" column="available_limit" />
<result property="status" column="status" />
</resultMap>
<sql id="selectBankCardLendVo">
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.is_next_bill_date,
a.next_bill_date_time,
a.is_zero_bill,
a.status,
t.balance,
t.available_limit
from bank_card_lend a
@@ -73,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="debitType != null and debitType != ''"> and a.debit_type = #{debitType}</if>
<if test="creditCardId != null "> and a.id = #{creditCardId}</if>
<if test="lendType != null and lendType != ''"> and a.lend_type = #{lendType}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isNextBillDate != null">is_next_bill_date,</if>
<if test="nextBillDateTime != null">next_bill_date_time,</if>
<if test="isZeroBill != null">is_zero_bill,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -135,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isNextBillDate != null">#{isNextBillDate},</if>
<if test="nextBillDateTime != null">#{nextBillDateTime},</if>
<if test="isZeroBill != null">#{isZeroBill},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
@@ -163,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isNextBillDate != null">is_next_bill_date = #{isNextBillDate},</if>
<if test="nextBillDateTime != null">next_bill_date_time = #{nextBillDateTime},</if>
<if test="isZeroBill != null">is_zero_bill = #{isZeroBill},</if>
<if test="status != null">status = #{status},</if>
</trim>
where id = #{id}
</update>

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="bankCode" column="bank_code" />
<result property="balance" column="balance" />
<result property="availableLimit" column="available_limit" />
<result property="status" column="status" />
</resultMap>
<sql id="selectFutureStocksVo">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.update_time,
a.del_flag,
a.remark ,
a.status,
bc."name" as bank_name,
bc.code as bank_code,
t.balance,
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag='0'
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}
@@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="delFlag != null">del_flag,</if>
<if test="remark != null">remark,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
@@ -141,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="status != null">status = #{status},</if>
</trim>
where id = #{id}
</update>

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

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="ratePlus" column="rate_plus" />
<result property="bankName" column="bank_name" />
<result property="bankCode" column="bank_code" />
<result property="status" column="status" />
</resultMap>
<sql id="selectPosMachineVo">
@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.merchant_type,
a.merchant_code,
a.activation_date,
a.status,
bc."name" as bank_name,
bc.code as bank_code
from
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.del_flag='0'
<if test="name != null and name != ''"> and a.name like '%'|| #{name}||'%'</if>
<if test="type != null and type != ''"> and a.type = #{type}</if>
<if test="status != null and status != ''"> and a.status = #{status}</if>
<if test="merchantName != null and merchantName != ''"> and a.merchant_name like '%'|| #{merchantName}||'%'</if>
</where>
<!-- 数据范围过滤 -->
@@ -97,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="merchantType != null">merchant_type,</if>
<if test="merchantCode != null">merchant_code,</if>
<if test="activationDate != null">activation_date,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="merchantType != null">#{merchantType},</if>
<if test="merchantCode != null">#{merchantCode},</if>
<if test="activationDate != null">#{activationDate},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
@@ -142,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="merchantType != null">merchant_type = #{merchantType},</if>
<if test="merchantCode != null">merchant_code = #{merchantCode},</if>
<if test="activationDate != null">activation_date = #{activationDate},</if>
<if test="status != null">status = #{status},</if>
</trim>
where id = #{id}
</update>