zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:钱包余额导出

Browse Source
This commit is contained in:
dzc committed 2025-04-09 09:28:58 +08:00
1 parent 9d08931892
commit cf8510c34e
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/manager/HardDoorManagerMapper.xml
+4 -4
View File
@@ -50,19 +50,19 @@
<sql id="whereA">
a.del_flag = '0'
<if test="dto.hard_id != null">
<if test="dto.hardId != null">
and a.hard_id = #{dto.hardId}
</if>
<if test="dto.imei != null and dto.imei != '' ">
and a.imei like concat('%', #{dto.imei}, '%')
</if>
<if test="dto.power_status != null">
<if test="dto.powerStatus != null">
and a.power_status = #{dto.powerStatus}
</if>
<if test="dto.net_status != null">
<if test="dto.netStatus != null">
and a.net_status = #{dto.netStatus}
</if>
<if test="dto.sale_status != null">
<if test="dto.saleStatus != null">
and a.sale_status = #{dto.saleStatus}
</if>
</sql>
pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
+2 -2
View File
@@ -344,11 +344,11 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
List<WalletManageBalanceVo> itemList = baseMapper.selectBalance(dto);
if (ObjectUtil.isEmpty(itemList)) continue;
for (WalletManageBalanceVo j : itemList) {
j.setWalletTypeName(i.getName());
walletList.stream().filter(v -> ObjectUtil.equals(v.getUserId(), j.getUserId())).findFirst().ifPresent(v -> {
walletList.stream().filter(v -> ObjectUtil.equals(i.getId(), v.getWalletTypeId()) && ObjectUtil.equals(v.getUserId(), j.getUserId())).findFirst().ifPresent(v -> {
if (ObjectUtil.isNotEmpty(j.getBalance())) {
v.setBalance(j.getBalance());
v.setLastTopUpTime(j.getCreateTime());
v.setWalletTypeName(i.getName());
}
});
}