mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-06 02:50:13 +08:00
update 查询运营商VIP
This commit is contained in:
@@ -534,7 +534,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
|
|||||||
List<String> merchantIdList = merchantInfoVOList.stream()
|
List<String> merchantIdList = merchantInfoVOList.stream()
|
||||||
.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
|
.map(MerchantInfoVO::getMerchantId).collect(Collectors.toList());
|
||||||
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
|
List<MerchantVipVO> resultList = memberBasicInfoMapper.queryMerchantVipList(merchantIdList, dto);
|
||||||
|
if (CollectionUtils.isNotEmpty(resultList)) {
|
||||||
|
for (MerchantVipVO merchantVipVO : resultList) {
|
||||||
|
BigDecimal principalBalance = merchantVipVO.getPrincipalBalance() == null ? BigDecimal.ZERO : merchantVipVO.getPrincipalBalance();
|
||||||
|
BigDecimal giftBalance = merchantVipVO.getGiftBalance() == null ? BigDecimal.ZERO : merchantVipVO.getGiftBalance();
|
||||||
|
merchantVipVO.setTotalAccountAmount(principalBalance.add(giftBalance));
|
||||||
|
}
|
||||||
|
}
|
||||||
return resultList;
|
return resultList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -263,7 +263,8 @@
|
|||||||
t2.nick_name as nickName,
|
t2.nick_name as nickName,
|
||||||
t2.avatar_url as avatarUrl,
|
t2.avatar_url as avatarUrl,
|
||||||
t1.wallet_code as walletCode,
|
t1.wallet_code as walletCode,
|
||||||
t1.principal_balance as principalBalance
|
t1.principal_balance as principalBalance,
|
||||||
|
t1.gift_balance as giftBalance
|
||||||
from member_wallet_info t1
|
from member_wallet_info t1
|
||||||
JOIN member_basic_info t2 on t2.member_id = t1.member_id and t2.del_flag = '0'
|
JOIN member_basic_info t2 on t2.member_id = t1.member_id and t2.del_flag = '0'
|
||||||
JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'
|
JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'
|
||||||
|
|||||||
Reference in New Issue
Block a user