From 44afbc3dd1cb32a3257dfc32b92fb16279c95bb9 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 17:04:51 +0800
Subject: [PATCH] 1.后台管理-商品管理
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 14 ++++++--------
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 8 ++++++++
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index cc81f9f..d84d818 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -342,6 +342,14 @@
}
+ @GetMapping("/getAppUserByPhone")
+ @ApiOperation(value = "根据手机号获取用户信息",tags = {"后台管理-门店管理-通过手机号校验用户是否存在"})
+ public R<AppUser> getAppUserByPhone(String phone){
+ AppUser appUser = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ return R.ok(appUser);
+ }
+
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index db675e1..bc08986 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -56,21 +56,19 @@
public UserPointVO getUserPoint(Long userId) {
AppUser appUser = appUserService.getById(userId);
List<UserPoint> userPointList = this.baseMapper.findLatestUserPointByTypeForUser(userId);
-
Map<Integer, Integer> userBalanceMap = userPointList.stream()
.collect(Collectors.toMap(UserPoint::getType, UserPoint::getBalance));
VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userId);
- Integer lavePoint = appUser.getLavePoint();
UserPointVO userPointVO = new UserPointVO();
- userPointVO.setTotalPoint(lavePoint);
-// userPointVO.setConsumePoint(lavePoint);
- userPointVO.setShopPoint(userBalanceMap.get(PointChangeType.CONSUME.getCode()));
- userPointVO.setSharePoint(userBalanceMap.get(PointChangeType.COMMISSION_RETURN.getCode()));
+ userPointVO.setTotalPoint(appUser.getTotalPoint());
+ userPointVO.setConsumePoint(appUser.getLavePoint());
+ userPointVO.setShopPoint(appUser.getShopPoint());
+ userPointVO.setSharePoint(appUser.getSharePoint());
userPointVO.setPullNewPoint(userBalanceMap.get(PointChangeType.NEW_USER_REFERRAL.getCode()));
userPointVO.setShopAchievementPoint(userBalanceMap.get(PointChangeType.STORE_PERFORMANCE.getCode()));
userPointVO.setShopSharePoint(userBalanceMap.get(PointChangeType.STORE_COMMISSION_RETURN.getCode()));
- userPointVO.setGiftPoint(vipSetting.getVipGiftRole());
+ userPointVO.setGiftPoint(vipSetting.getVipGiftRole() == 1 && vipSetting.getId() == 1 ? 1 : 0);
return userPointVO;
}
@@ -107,7 +105,7 @@
if (vipSetting == null) {
throw new ServiceException("VIP 设置未找到");
}
- if (vipSetting.getVipGiftRole() == 0) {
+ if (vipSetting.getId() == 0 && vipSetting.getVipGiftRole() == 0) {
throw new ServiceException("转赠积分权限未开启");
}
--
Gitblit v1.7.1