From 5f25c762e2853e87fc4b86b157ba87cf1322df2f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 14:53:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 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 d022a8c..bce2fae 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
@@ -7,9 +7,12 @@
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
import com.ruoyi.order.mapper.TVipOrderMapper;
import com.ruoyi.order.service.TVipOrderService;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.feignClient.VipClient;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -23,6 +26,8 @@
@Service
public class TVipOrderServiceImpl extends ServiceImpl<TVipOrderMapper, TVipOrder> implements TVipOrderService {
+ @Resource
+ private VipClient vipClient;
@Override
public PageInfo<TVipOrder> pageList(VipShoppingOrderQuery query) {
String startTime1 = null;
@@ -36,7 +41,14 @@
}
PageInfo<TVipOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
List<TVipOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);
-
+ for (TVipOrder tVipOrder : list) {
+ tVipOrder.setUid(tVipOrder.getId().toString());
+ tVipOrder.setUserUid(tVipOrder.getAppUserId().toString());
+ TVip data = vipClient.getInfo(tVipOrder.getVipId()).getData();
+ if (data!=null){
+ tVipOrder.setName(data.getName());
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1