From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..b341dd9 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
@@ -53,11 +53,15 @@
         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());
         }

--
Gitblit v1.7.1