From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
index 2e2f137..91dc159 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
@@ -18,6 +20,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -33,6 +36,8 @@
@Resource
private VipClient vipClient;
+ @Resource
+ private AppUserClient appUserClient;
@Override
public PageInfo<TVipOrder> pageList(VipShoppingOrderQuery query) {
String startTime1 = null;
@@ -49,10 +54,17 @@
for (TVipOrder tVipOrder : list) {
tVipOrder.setUid(tVipOrder.getId().toString());
tVipOrder.setUserUid(tVipOrder.getAppUserId().toString());
- TVip data = vipClient.getInfo(tVipOrder.getVipId()).getData();
+ TVip data = vipClient.getInfo1(tVipOrder.getVipId()).getData();
if (data!=null){
tVipOrder.setName(data.getName());
}
+ if (StringUtils.hasLength(tVipOrder.getTitle()))
+ {
+ // 去除最后两个字符
+ tVipOrder.setName(tVipOrder.getTitle().substring(0, tVipOrder.getTitle().length() - 2));
+ }
+ TAppUser data1 = appUserClient.getUserById(tVipOrder.getAppUserId()).getData();
+ if (data1!=null)tVipOrder.setUserPhone(data1.getPhone());
}
pageInfo.setRecords(list);
return pageInfo;
@@ -64,8 +76,8 @@
}
@Override
- public BigDecimal getSumAmout(LocalDate sixBefore) {
- return this.baseMapper.getSumAmout(sixBefore);
+ public BigDecimal getSumAmout() {
+ return this.baseMapper.getSumAmout();
}
@Override
--
Gitblit v1.7.1