From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 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 f010f2e..1cedad4 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
@@ -1,15 +1,29 @@
package com.ruoyi.account.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.UserPointMapper;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserPoint;
+import com.ruoyi.account.enums.PointChangeType;
+import com.ruoyi.account.mapper.UserPointMapper;
import com.ruoyi.account.service.UserPointService;
+import com.ruoyi.account.vo.UserPointDetailVO;
import com.ruoyi.account.vo.UserPointVO;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author luodangjia
@@ -17,10 +31,42 @@
*/
@Service
public class UserPointServiceImpl extends ServiceImpl<UserPointMapper, UserPoint> implements UserPointService {
+ @Resource
+ private AppUserClient appUserClient;
@Override
public UserPointVO getUserPoint(Long userId) {
- // TODO 待实现
- return null;
+ AppUser appUser = appUserClient.getAppUserById(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));
+
+ Integer lavePoint = appUser.getLavePoint();
+ UserPointVO userPointVO = new UserPointVO();
+ userPointVO.setTotalPoint(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()));
+ return userPointVO;
+ }
+
+ @Override
+ public List<UserPointDetailVO> getUserPointDetail(Long userId, LocalDateTime date, Integer type) {
+ List<UserPoint> userPointList = list(new LambdaQueryWrapper<UserPoint>()
+ .eq(UserPoint::getAppUserId, userId));
+ if (CollectionUtil.isNotEmpty(userPointList)) {
+ return userPointList.stream().map(p -> {
+ UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
+ userPointDetailVO.setType(p.getType());
+ userPointDetailVO.setVariablePoint(p.getVariablePoint());
+ userPointDetailVO.setCreateTime(p.getCreateTime());
+ return userPointDetailVO;
+ }).collect(Collectors.toList());
+ }
+ return Collections.emptyList();
}
}
--
Gitblit v1.7.1