dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:cbc9fc0ae20856d2d6a947f359710cfcb7fccef4
Branches Tags
dianliang:main
dianliang:master
..
compare: dianliang:d7dddcc9481c40842bba7d9908b330213467c84c
Branches Tags
dianliang:main
dianliang:master

No commits in common. "cbc9fc0ae20856d2d6a947f359710cfcb7fccef4" and "d7dddcc9481c40842bba7d9908b330213467c84c" have entirely different histories.
cbc9fc0ae2 ... d7dddcc948

3 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -542,7 +542,7 @@
SELECT mt_user.* SELECT mt_user.*
FROM mt_user_balance FROM mt_user_balance
LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id
WHERE mt_user_balance.store_id IN WHERE mt_user_balance.user_status = 0 AND mt_user_balance.store_id IN
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")"> <foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
@ -559,7 +559,7 @@
SELECT mt_user.* SELECT mt_user.*
FROM mt_user_balance FROM mt_user_balance
LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id
WHERE mt_user_balance.store_id IN WHERE mt_user_balance.user_status = 0 AND mt_user_balance.store_id IN
<foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")"> <foreach collection="order.storeIds" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml
View File

@ -47,6 +47,7 @@
from mt_user_balance mub from mt_user_balance mub
left join mt_user mu on mub.mt_user_id = mu.id left join mt_user mu on mub.mt_user_id = mu.id
<where> <where>
mub.user_status = 0 and
mub.store_id in mub.store_id in
<foreach collection="user.storeIds" item="item" open="(" close=")" separator=","> <foreach collection="user.storeIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
@ -62,6 +63,7 @@
from mt_user_balance mub from mt_user_balance mub
left join mt_user mu on mub.mt_user_id = mu.id left join mt_user mu on mub.mt_user_id = mu.id
where where
mub.user_status = 0 and
mub.store_id in mub.store_id in
<foreach collection="storeIds" item="item" open="(" close=")" separator=","> <foreach collection="storeIds" item="item" open="(" close=")" separator=",">
#{item} #{item}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -561,10 +561,9 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
balance.setFixingLevel(user.getFixingLevel()); balance.setFixingLevel(user.getFixingLevel());
balance.setUserLabelId(user.getUserLabelId()); balance.setUserLabelId(user.getUserLabelId());
balance.setUserStatus(user.getUserStatus()); balance.setUserStatus(user.getUserStatus());
// if (ObjectUtil.isNotEmpty(balance.getCardBalance()) && balance.getCardBalance() > 0){ if (ObjectUtil.isNotEmpty(balance.getCardBalance()) && balance.getCardBalance() > 0){
// balance.setRechargeNum(0); balance.setRechargeNum(1);
// } 无论初始化 有无 金额 充值次数都算0 }
balance.setRechargeNum(0);
balanceService.insertUserBalance(balance); balanceService.insertUserBalance(balance);
Integer chainStoreId = null; Integer chainStoreId = null;
// 添加邀请注册信息 // 添加邀请注册信息