From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:33 +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 | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 1850b34..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,6 +5,7 @@
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;
@@ -12,6 +13,8 @@
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;
@@ -42,6 +45,8 @@
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());
@@ -50,4 +55,14 @@
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