autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-23 12:35:07 +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

2
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -325,7 +325,7 @@ public class MemberService {
dto.setEndDate(lastDay);
// 查询会员钱包信息表，获取 本金余额
MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId());
MemberWalletInfo memberWalletInfo = memberWalletInfoService.selectByMemberId(dto.getMemberId(), null);
if (memberWalletInfo == null) {
// 用户未注册小程序
throw new BusinessException(ReturnCodeEnum.CODE_AUTHENTICATION_ERROR);

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java
View File

@@ -73,7 +73,7 @@ public class MemberBasicInfoController extends BaseController {
public RestApiResponse<?> getMerchantListByAuth() {
RestApiResponse<?> response = null;
List<String> deptIds = getDeptIds();
List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuth(deptIds);
List<MerchantInfoVO> list = memberBasicInfoService.getMerchantListByAuthV2(deptIds);
if (CollectionUtils.isEmpty(list)) {
list = new ArrayList<>();
}