From 8971663448a123240332e5cb63f62da3b70d472e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 14:36:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml | 2 +-
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 7 ++++---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 5 +++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 40 ++--------------------------------------
4 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index dbd0aa4..c020452 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -131,25 +131,7 @@
// 当前时间属于那个阶段 取哪个阶段的电价
if(DateUtils.string2LocalTime(tAccountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
&& DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
- siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
- if(null != byId1.getDiscount()){
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
- }else{
- // 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
- if(Objects.nonNull(appUser)){
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- if(Objects.nonNull(vip) && vip.getType() == 2){
- siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
- }
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
- }
- }
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));
}
}
siteInfoVO.setChargingGunId(chargingGun.getId());
@@ -176,25 +158,7 @@
// 当前时间属于那个阶段 取哪个阶段的电价
if(DateUtils.string2LocalTime(tAccountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
&& DateUtils.string2LocalTime(tAccountingStrategyDetail.getEndTime() + ("23:59:59".equals(tAccountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
- siteInfoVO.setElectrovalence(tAccountingStrategyDetail.getElectrovalence().add(tAccountingStrategyDetail.getServiceCharge()).setScale(4, BigDecimal.ROUND_HALF_UP));
- if(null != byId1.getDiscount()){
- siteInfoVO.setVipElectrovalence((tAccountingStrategyDetail.getServiceCharge().multiply(byId1.getDiscount()).add(tAccountingStrategyDetail.getElectrovalence())).setScale(4, BigDecimal.ROUND_HALF_UP));
- }else{
- // 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
- // 根据id查询用户信息
- TAppUser appUser = appUserClient.getUserById(userId).getData();
- if(Objects.nonNull(appUser)){
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
- if(Objects.nonNull(vip) && vip.getType() == 2){
- siteInfoVO.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(tAccountingStrategyDetail.getServiceCharge()).add(tAccountingStrategyDetail.getElectrovalence()));
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
- }
- }else {
- siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence());
- }
- }
+ siteInfoVO.setVipElectrovalence(tAccountingStrategyDetail.getElectrovalence().setScale(4, BigDecimal.ROUND_HALF_UP));
}
}
siteInfoVO.setChargingPileId(one.getId());
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
index 934b624..de75d47 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/SiteMapper.xml
@@ -300,7 +300,7 @@
and ts.`name` like CONCAT('%', #{query.name}, '%')
</if>
<if test="null != query.cityCode and '' != query.cityCode">
- and ts.cityCode = #{query.cityCode}
+ and ts.city_code = #{query.cityCode}
</if>
AND ts.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
AND ts.status = ${@com.ruoyi.common.core.enums.status.SiteStatusEnum@NORMAL_USE.getCode()}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
index f8718a0..c23a6a6 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java
@@ -108,6 +108,10 @@
+
+
+
+ long totalElements = mongoTemplate.count(query, UploadRealTimeMonitoringData.class);
// 设置分页
Pageable pageable = PageRequest.of(mongoChargingOrderQuery.getPageCurr(), mongoChargingOrderQuery.getPageSize());
query.with(pageable);
@@ -115,9 +119,6 @@
List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find(
query
, UploadRealTimeMonitoringData.class);
-
-
- long totalElements = mongoTemplate.count(query, UploadRealTimeMonitoringData.class);
UploadRealTimeMonitoringPageData uploadRealTimeMonitoringPageData = new UploadRealTimeMonitoringPageData();
uploadRealTimeMonitoringPageData.setCount(totalElements);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
index b23259a..798b95d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -206,6 +206,11 @@
List<TEvaluationTag> data = evaluationTagClient.getListByIds(tagIds).getData();
tOrderEvaluateVO.setOrderEvaluateTags(data);
}
+ TAppUser data = appUserClient.getUserById(tOrderEvaluateVO.getAppUserId()).getData();
+ if(Objects.nonNull(data)){
+ tOrderEvaluateVO.setName(data.getName());
+ tOrderEvaluateVO.setAvatar(data.getAvatar());
+ }
}
}
siteDetailEvaluateVO.setOrderEvaluateVOS(collect);
--
Gitblit v1.7.1