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 |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 0ed6754..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
@@ -20,6 +20,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -53,10 +54,14 @@
         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());
@@ -71,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