From 0a6f6770dd3aecfc076e9cd5b46a728dd2b9b440 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 15:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
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 1cedad4..08487d3 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
@@ -5,12 +5,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.enums.PointChangeType;
import com.ruoyi.account.mapper.UserPointMapper;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserPointService;
+import com.ruoyi.account.service.VipSettingService;
import com.ruoyi.account.vo.UserPointDetailVO;
import com.ruoyi.account.vo.UserPointVO;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.RemoteVipSettingClient;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -32,31 +40,40 @@
@Service
public class UserPointServiceImpl extends ServiceImpl<UserPointMapper, UserPoint> implements UserPointService {
@Resource
- private AppUserClient appUserClient;
+ private AppUserService appUserService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private VipSettingService vipSettingService;
@Override
public UserPointVO getUserPoint(Long userId) {
- AppUser appUser = appUserClient.getAppUserById(userId);
+ AppUser appUser = appUserService.getById(userId);
List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
.eq(UserPoint::getAppUserId, 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.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());
return userPointVO;
}
@Override
- public List<UserPointDetailVO> getUserPointDetail(Long userId, LocalDateTime date, Integer type) {
+ public List<UserPointDetailVO> getUserPointDetail(Long userId, LocalDateTime startTime, LocalDateTime endTime, Integer type) {
List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
+ .between(startTime != null, UserPoint::getCreateTime, startTime, endTime)
+ .eq(type != null, UserPoint::getType, type)
.eq(UserPoint::getAppUserId, userId));
if (CollectionUtil.isNotEmpty(userPointList)) {
return userPointList.stream().map(p -> {
@@ -69,4 +86,17 @@
}
return Collections.emptyList();
}
+
+
+ @Override
+ public void transferPoint(BigDecimal point, Long phone) {
+ AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getPhone, phone));
+
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ Long userid = loginUserApplet.getUserid();
+ VipSetting vipSetting = vipSettingService.getVipSettingByUserId(userid);
+
+
+ }
}
--
Gitblit v1.7.1