From 7bbe043b52f6e5ef7fa3aa92118c4960fae30fa6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 29 九月 2024 09:50:17 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 53d4fb7..23aeefd 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;
@@ -33,6 +35,8 @@
@Resource
private VipClient vipClient;
+ @Resource
+ private AppUserClient appUserClient;
@Override
public PageInfo<TVipOrder> pageList(VipShoppingOrderQuery query) {
String startTime1 = null;
@@ -53,6 +57,13 @@
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;
@@ -79,6 +90,6 @@
giveVipDto.setUserIds(tVipOrder.getAppUserId().toString());
giveVipDto.setVipId(tVipOrder.getVipId());
giveVipDto.setType(tVipOrder.getVipType());
-// vipClient.giveVip(giveVipDto);
+ vipClient.giveVip(giveVipDto);
}
}
--
Gitblit v1.7.1