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

fix:bug

Browse Source
This commit is contained in:
dzc committed 2025-04-25 14:32:23 +08:00
1 parent eda4868b58
commit 9160668c11
2 files changed
+18 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
+2 -2
View File
@@ -289,7 +289,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
*/
@Override
public Page<WalletManageVo> pageJoinActive(Page page, WalletTopupActionDto dto, DataScope dataScope) {
if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) {
if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) {
dto.setUnactiveMonthsNumber(3L);
}
String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN);
@@ -303,7 +303,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
*/
@Override
public List<WalletManageVo> pageListActive(WalletTopupActionDto dto, DataScope dataScope) {
if (ObjectUtil.isNotEmpty(dto.getUnactiveMonthsNumber())) {
if (ObjectUtil.isEmpty(dto.getUnactiveMonthsNumber())) {
dto.setUnactiveMonthsNumber(3L);
}
String unactiveDayNumberStr = LocalDateTimeUtil.format(LocalDateTimeUtil.now().minusMonths(dto.getUnactiveMonthsNumber()), DatePattern.NORM_DATE_PATTERN);
pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletManageMapper.xml
+16 -6
View File
@@ -125,7 +125,7 @@
<include refid="scopeUser"/>
</delete>
<sql id="activeBalance">
<select id="activeBalancePage" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
<include refid="selectA"/>
1
from wallet_manage a
@@ -173,13 +173,23 @@
#{v}
</foreach>
</if>
</sql>
<select id="activeBalancePage" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
<include refid="activeBalance"/>
group by a.user_id
</select>
<select id="activeBalanceList" resultType="com.bsd.pjcloud.wallet.api.vo.WalletManageVo">
<include refid="activeBalance"/>
<include refid="selectA"/>
(select max(sub.create_time)
from wallet_transaction sub
left join wallet_manage wallet on wallet.id = sub.wallet_id and wallet.tenant_id = 1
where sub.user_id = a.user_id
and sub.wallet_id = a.id
) as createTime
from wallet_manage a
<where>
a.del_flag = 0
<if test="dto.userId != null">
AND a.user_id = #{dto.userId}
</if>
</where>
</select>
</mapper>