From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index f61894c..dbb8223 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -17,6 +18,8 @@
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -54,6 +57,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
@@ -86,7 +90,7 @@
@Resource
private ChargingPileClient chargingPileClient;
-
+
@Resource
private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
@@ -100,6 +104,8 @@
private AliPaymentClient aliPaymentClient;
+
+
@Resource
private AppUserVipDetailClient appUserVipDetailClient;
@@ -111,13 +117,13 @@
@Resource
private ChargingHandshakeClient chargingHandshakeClient;
-
+
@Resource
private SendMessageClient sendMessageClient;
-
+
@Resource
private TOrderEvaluateService orderEvaluateService;
-
+
@@ -438,7 +444,7 @@
//根据当前充值的金额和计费模板算出充电的金额
BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
//计算充电金额，会员需要将折扣金额加入到充电总金额中
-
+
// TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
// if(){
// appUser.getVipId()
@@ -519,21 +525,18 @@
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
//调用硬件停止充电，停止成功后开始计算费用退款
-
-
-
// todo 待完善
return AjaxResult.success();
}
-
-
+
+
public void endCharge(){
-
+
}
-
-
-
+
+
+
@Override
public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
@@ -656,6 +659,52 @@
}
@Override
+ public List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto) {
+
+ return this.baseMapper.chargingOrderGroup(chargingPercentProvinceDto);
+ }
+
+ @Override
+ public List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds) {
+ return this.baseMapper.charge(sixBefore,siteIds);
+ }
+
+ @Override
+ public List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore) {
+ return this.baseMapper.circle(siteIds,sixBefore);
+ }
+
+ @Override
+ public Map<String, BigDecimal> countAll(LocalDate sixBefore) {
+ return this.baseMapper.countAll(sixBefore);
+ }
+
+ @Override
+ public List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds) {
+ return this.baseMapper.getSumByType(chargingOrderIds);
+ }
+
+ @Override
+ public List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds) {
+ return this.baseMapper.getDateData(chargingOrderIds);
+ }
+
+ @Override
+ public List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds) {
+ return this.baseMapper.getWeekData(chargingOrderIds);
+ }
+
+ @Override
+ public List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds) {
+ return this.baseMapper.getMonthData(chargingOrderIds);
+ }
+
+ @Override
+ public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
+ return this.baseMapper.getYearData(chargingOrderIds);
+ }
+
+ @Override
public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
String startTime1 = null;
String startTime2 = null;
--
Gitblit v1.7.1