autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-09 09:15:47 +08:00
parent 29ca0d6e9c
commit 82bd7db8b8
10 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
View File

@@ -1,6 +1,7 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberWalletInfo;
import org.apache.ibatis.annotations.Param;
public interface MemberWalletInfoMapper {
/**
@@ -51,5 +52,7 @@ public interface MemberWalletInfoMapper {
*/
int updateByPrimaryKey(MemberWalletInfo record);
MemberWalletInfo selectByMemberId(String memberId);
// MemberWalletInfo selectByMemberId(String memberId);
MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java
View File

@@ -153,4 +153,6 @@ public interface IMemberBasicInfoService {
* 获取当前会员中的运营商列表（带权限校验）
*/
List<MerchantInfoVO> getMerchantListByAuth(List<String> deptIds);
List<MerchantInfoVO> getMerchantListByAuthV2(List<String> deptIds);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletInfoService.java
View File

@@ -11,7 +11,7 @@ public interface MemberWalletInfoService {
MemberWalletInfo selectByPrimaryKey(Integer id);
MemberWalletInfo selectByMemberId(String memberId);
MemberWalletInfo selectByMemberId(String memberId, String merchantId);
int updateByPrimaryKeySelective(MemberWalletInfo record);

12
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -177,7 +177,7 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
BigDecimal updatePrincipalBalance = dto.getUpdatePrincipalBalance();
log.info("修改用户余额 memberId:{}, updatePrincipalBalance:{}, updateGiftBalance:{}", memberId, updatePrincipalBalance, updateGiftBalance);
// 查询用户余额
MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId);
MemberWalletInfo info = memberWalletInfoMapper.selectByMemberId(memberId, dto.getMerchantId());
if (info == null) {
log.warn("根据会员id:{}, 查询会员信息为空", memberId);
return 0;
@@ -427,5 +427,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
return memberBasicInfoMapper.getMerchantListByAuth(deptIds);
}
/**
* 获取当前会员中的运营商列表（带权限校验）
*/
@Override
public List<MerchantInfoVO> getMerchantListByAuthV2(List<String> deptIds) {
// 获取登录用户 所有有权限运营商
SecurityUtils.getAuthorizedMap();
return null;
}
}

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
View File

@@ -34,8 +34,8 @@ public class MemberWalletInfoServiceImpl implements MemberWalletInfoService {
}
@Override
public MemberWalletInfo selectByMemberId(String memberId) {
return memberWalletInfoMapper.selectByMemberId(memberId);
public MemberWalletInfo selectByMemberId(String memberId, String merchantId) {
return memberWalletInfoMapper.selectByMemberId(memberId, merchantId);
}
@Override

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java
View File

@@ -19,6 +19,11 @@ public class UpdateMemberBalanceDTO {
*/
private String memberId;
/**
* 所属运营商id
*/
private String merchantId;
/**
* 更新类型
* 1-进账；2-出账