From 3b0a898df3cafe2c876d20b5bf9dd0f1734acc81 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 九月 2024 10:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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..c96a21f 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
@@ -5,11 +5,17 @@
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.VipShoppingOrderQuery;
+import com.ruoyi.order.dto.SixVipDto;
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 java.math.BigDecimal;
+import java.time.LocalDate;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -23,6 +29,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,8 +44,25 @@
}
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;
}
+
+ @Override
+ public List<SixVipDto> sixBefore(LocalDate sixBefore) {
+ return this.baseMapper.sixBefore(sixBefore);
+ }
+
+ @Override
+ public BigDecimal getSumAmout(LocalDate sixBefore) {
+ return this.baseMapper.getSumAmout(sixBefore);
+ }
}
--
Gitblit v1.7.1