From 8acc98732aba58ad5c710f92d72e6fa5bf888d11 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 24 二月 2025 01:08:06 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 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 b56c623..6a314ce 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
@@ -23,6 +23,8 @@
import com.ruoyi.common.core.utils.PhoneNumberValidator;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.OrderGood;
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.enums.PointChangeType;
@@ -61,6 +63,8 @@
private PointSettingService pointSettingService;
@Resource
private UserPointService userPointService;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
@@ -72,7 +76,15 @@
UserPointVO userPointVO = new UserPointVO();
// todo bug说取剩余积分
- userPointVO.setTotalPoint(appUser.getLavePoint());
+
+ R<List<OrderGood>> unDistributedOrder = remoteOrderGoodsClient.getUnDistributedOrder(userId);
+ List<OrderGood> unDistributedOrderList = unDistributedOrder.getData();
+ Integer totalPoint = unDistributedOrderList.stream()
+ .mapToInt(OrderGood::getSuperiorRebatePoints)
+ .sum();
+
+
+ userPointVO.setTotalPoint(appUser.getLavePoint()+totalPoint);
userPointVO.setConsumePoint(appUser.getAvailablePoint());
userPointVO.setShopPoint(appUser.getShopPoint());
userPointVO.setSharePoint(appUser.getSharePoint());
@@ -93,6 +105,11 @@
if (CollectionUtil.isNotEmpty(page.getRecords())) {
List<UserPointDetailVO> collect = page.getRecords().stream().map(p -> {
UserPointDetailVO userPointDetailVO = new UserPointDetailVO();
+ if (p.getType() != null && (p.getType().equals(12) || p.getType().equals(13))){
+ Long appUserId = p.getObjectId();
+ AppUser appUser = appUserService.getById(appUserId);
+ userPointDetailVO.setName(appUser.getName());
+ }
userPointDetailVO.setType(p.getType());
userPointDetailVO.setVariablePoint(p.getVariablePoint());
String format = p.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
@@ -162,14 +179,17 @@
appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);
appUserService.updateById(appUserForPhoe);
//构建积分流水记录
- UserPoint userPoint = new UserPoint();
- userPoint.setType(12);
- userPoint.setHistoricalPoint(lavePoint1);
- userPoint.setVariablePoint(point);
- userPoint.setBalance(appUserForPhoe.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUserForPhoe.getId());
- userPointService.save(userPoint);
+ if(point > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(12);
+ userPoint.setHistoricalPoint(lavePoint1);
+ userPoint.setVariablePoint(point);
+ userPoint.setBalance(appUserForPhoe.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUserForPhoe.getId());
+ userPoint.setObjectId(userid);
+ userPointService.save(userPoint);
+ }
Integer lavePoint = appUser.getLavePoint();
appUser.setLavePoint(appUser.getLavePoint() - point);
@@ -177,14 +197,17 @@
appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
appUserService.updateById(appUser);
//构建积分流水记录
- userPoint = new UserPoint();
- userPoint.setType(13);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(point);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPointService.save(userPoint);
+ if(point > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(13);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(point);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(appUserForPhoe.getId());
+ userPointService.save(userPoint);
+ }
return R.ok();
}
--
Gitblit v1.7.1