From 4af1e0cab60c25d6c969474b3517b33e2ebcbb9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 17:47:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 9 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 4
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 9 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml | 16 +---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/RptUtils.java | 33 +++++++++++
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java | 44 ++++++++++----
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java | 3
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java | 26 ++++----
ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml | 4
ruoyi-service/ruoyi-order/src/main/resources/logback.xml | 4
11 files changed, 117 insertions(+), 47 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
index 7117147..d85c948 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/SettlementListQuery.java
@@ -14,7 +14,7 @@
@ApiModelProperty(value = "类型（1=开始，2=结束）")
private Integer type;
@ApiModelProperty(value = "站点ids 选择全部 不传")
- private List<Integer> siteIds;
+ private Integer siteIds;
@ApiModelProperty(value = "合作商id ")
private Integer partnerId;
@ApiModelProperty(value = "开始时间2020-01-01 00:00:00")
@@ -22,4 +22,5 @@
@ApiModelProperty(value = "结束时间2021-01-01 23:59:59")
private String endTime;
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
index 72656e7..bd17572 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.account.mapper.TAppUserMapper;
import com.ruoyi.account.service.TAppUserService;
import com.ruoyi.account.service.TInviteUserService;
+import com.ruoyi.account.util.RptUtils;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.account.wx.pojo.AppletUserDecodeData;
import com.ruoyi.common.core.exception.ServiceException;
@@ -18,6 +19,7 @@
import com.ruoyi.system.api.model.LoginUserApplet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
@@ -69,9 +71,10 @@
break;
}
}
- appUser.setAvatar(appletUserDecodeData.getAvatarUrl());
+
+ appUser.setAvatar(StringUtils.hasLength(appletUserDecodeData.getAvatarUrl())?appletUserDecodeData.getAvatarUrl():"http://221.182.45.100:8090/2024-10-26/logo.png");
+ appUser.setName(StringUtils.hasLength(appletUserDecodeData.getNickName())?appletUserDecodeData.getNickName():RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
appUser.setCity(appletUserDecodeData.getCity());
- appUser.setName(appletUserDecodeData.getNickName());
appUser.setProvince(appletUserDecodeData.getProvince());
appUser.setWxOpenid(appletUserDecodeData.getOpenId());
this.saveOrUpdate(appUser);
@@ -113,6 +116,8 @@
}
}
appUser.setAliOpenid(response.getOpenId());
+ appUser.setAvatar("http://221.182.45.100:8090/2024-10-26/logo.png");
+ appUser.setName(RptUtils.around(phone,3,4));
this.saveOrUpdate(appUser);
if(Objects.nonNull(inviteUserId)){
inviteUserService.saveInviteUser(appUser.getId(), inviteUserId);
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
index 2ac66fd..3da1a3f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/CarUtil.java
@@ -877,91 +877,91 @@
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京B\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京C\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京D\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京E\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京F\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京G\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京H\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京J\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京K\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京L\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京M\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"京Y\",\n" +
" \"city\": \"北京\",\n" +
" \"province\": \"北京\",\n" +
" \"Pcode\": \"BJ\",\n" +
- " \"AreaCode\": \"110110\"\n" +
+ " \"AreaCode\": \"110100\"\n" +
" },\n" +
" {\n" +
" \"Hp\": \"豫A\",\n" +
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/RptUtils.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/RptUtils.java
new file mode 100644
index 0000000..41e207a
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/RptUtils.java
@@ -0,0 +1,33 @@
+package com.ruoyi.account.util;
+
+/**
+ * 脱敏工具类
+ */
+public class RptUtils {
+ private static final String SYMBOL = "*";
+
+ /**
+ * 脱敏
+ * @param str 待脱敏字符串
+ * @param left 左边保留多少位
+ * @param right 右边保留多少位
+ * @return 脱敏结果，除左右外，其余字符将被替换为*
+ */
+ public static String around(String str, int left, int right){
+ if (str == null || (str.length() < left + right +1)){
+ return str;
+ }
+ String regex = String.format("(?<=\\w{%d})\\w(?=\\w{%d})", left, right);
+ return str.replaceAll(regex, SYMBOL);
+ }
+
+ /**
+ * 正则表达式实现金额数据脱敏
+ * @param money
+ * @return
+ */
+ public static String getMoney(String money){
+ //保留0个数到0个结束
+ return around(money,0,0);
+ }
+ }
\ No newline at end of file
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 0ce1585..dbd0aa4 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
@@ -18,6 +18,7 @@
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -125,9 +126,11 @@
Site byId = siteService.getById(one.getSiteId());
TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
// 当前时间属于那个阶段 取哪个阶段的电价
- if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ 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));
@@ -168,9 +171,11 @@
Site byId = siteService.getById(one.getSiteId());
TAccountingStrategy byId1 = accountingStrategyService.getById(byId.getAccountingStrategyId());
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId1.getId()).list();
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
for (TAccountingStrategyDetail tAccountingStrategyDetail : list) {
// 当前时间属于那个阶段 取哪个阶段的电价
- if(LocalTime.now().isAfter(LocalTime.parse(tAccountingStrategyDetail.getStartTime())) && LocalTime.now().isBefore(LocalTime.parse(tAccountingStrategyDetail.getEndTime()))){
+ 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));
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index 3bd8ac6..9d81853 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -10,12 +10,14 @@
import com.ruoyi.chargingPile.service.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalTime;
import java.util.List;
import java.util.Objects;
@@ -100,10 +102,16 @@
public R<TAccountingStrategyDetail> getDetailBySiteId(@RequestParam("siteId") Integer siteId){
Site site = siteService.getById(siteId);
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
- TAccountingStrategyDetail one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
- .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
- return R.ok(one);
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
+ for (TAccountingStrategyDetail accountingStrategyDetail : list) {
+ if(DateUtils.string2LocalTime(accountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
+ && DateUtils.string2LocalTime(accountingStrategyDetail.getEndTime() + ("23:59:59".equals(accountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
+ return R.ok(accountingStrategyDetail);
+ }
+ }
+ return R.ok();
}
/**
* 通过桩id查询当前时段使用的策略明细
@@ -123,19 +131,31 @@
.eq(TChargingGun::getChargingPileId, chargingPile.getId()).eq(TChargingGun::getDelFlag, 0)
.last("LIMIT 1"));
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(chargingGun.getAccountingStrategyId());
- TAccountingStrategyDetail one;
+ TAccountingStrategyDetail one = null;
if(Objects.nonNull(accountingStrategy)){
- one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
- .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
+ for (TAccountingStrategyDetail accountingStrategyDetail : list) {
+ if(DateUtils.string2LocalTime(accountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
+ && DateUtils.string2LocalTime(accountingStrategyDetail.getEndTime() + ("23:59:59".equals(accountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
+ return R.ok(accountingStrategyDetail);
+ }
+ }
}else {
Site site = siteService.getById(chargingPile.getSiteId());
accountingStrategy = accountingStrategyService.getById(site.getAccountingStrategyId());
- one = accountingStrategyDetailService.getOne(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId())
- .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
+ List<TAccountingStrategyDetail> list = accountingStrategyDetailService.list(Wrappers.<TAccountingStrategyDetail>lambdaQuery()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategy.getId()));
+ list.stream().filter(item -> "00:00".equals(item.getEndTime())).forEach(item -> item.setEndTime("23:59:59"));
+ for (TAccountingStrategyDetail accountingStrategyDetail : list) {
+ if(DateUtils.string2LocalTime(accountingStrategyDetail.getStartTime() + ":00").compareTo(LocalTime.now()) <= 0
+ && DateUtils.string2LocalTime(accountingStrategyDetail.getEndTime() + ("23:59:59".equals(accountingStrategyDetail.getEndTime())?"":":00")).compareTo(LocalTime.now()) > 0){
+ return R.ok(accountingStrategyDetail);
+ }
+ }
}
- return R.ok(one);
+ return R.ok();
}
/**
* 校验充电桩计费模版是否准确
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml b/ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml
index a1c5267..774e490 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/resources/logback.xml
@@ -58,11 +58,11 @@
</appender>
<!-- 系统模块日志级别控制 -->
- <logger name="com.ruoyi" level="debug" />
+ <logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="debug" />
- <root level="debug">
+ <root level="info">
<appender-ref ref="console" />
</root>
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 9ac5b25..a74b6dc 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
@@ -71,10 +71,10 @@
query.addCriteria(Criteria.where("transaction_serial_number").regex(mongoChargingOrderQuery.getCode(), "i")); // "i" 表示不区分大小写
}
if (mongoChargingOrderQuery.getOrderType() !=null){
- query.addCriteria(Criteria.where("order_type").is(mongoChargingOrderQuery.getOrderType()));
+ query.addCriteria(Criteria.where("orderType").is(mongoChargingOrderQuery.getOrderType()));
}
if (mongoChargingOrderQuery.getSiteId() != null){
- query.addCriteria(Criteria.where("site_id").is(mongoChargingOrderQuery.getSiteId()));
+ query.addCriteria(Criteria.where("siteId").is(mongoChargingOrderQuery.getSiteId()));
}
if (mongoChargingOrderQuery.getChargingPileCode() != null && !mongoChargingOrderQuery.getChargingPileCode().isEmpty()) {
query.addCriteria(Criteria.where("charging_pile_code").is(mongoChargingOrderQuery.getChargingPileCode()));
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 9440d8d..a5b335c 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
@@ -2435,6 +2435,18 @@
@Override
public PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto) {
+ if (StringUtils.hasLength(dto.getStartTime())){
+ dto.setType(1);
+ String[] split = dto.getStartTime().split(" - ");
+ dto.setStartTime(split[0]);
+ dto.setEndTime(split[1]);
+ }
+ if (StringUtils.hasLength(dto.getEndTime())){
+ dto.setType(2);
+ String[] split = dto.getStartTime().split(" - ");
+ dto.setStartTime(split[0]);
+ dto.setEndTime(split[1]);
+ }
PageInfo<TSettlementConfirm> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<TSettlementConfirm> list = tSettlementConfirmMapper.settlementList(pageInfo,dto);
for (TSettlementConfirm tSettlementConfirm : list) {
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/logback.xml b/ruoyi-service/ruoyi-order/src/main/resources/logback.xml
index ea899ba..61d523e 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/logback.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/logback.xml
@@ -60,9 +60,9 @@
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
- <logger name="org.springframework" level="debug" />
+ <logger name="org.springframework" level="warn" />
- <root level="debug">
+ <root level="info">
<appender-ref ref="console" />
</root>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
index cd7c16b..5b7209c 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TSettlementConfirmMapper.xml
@@ -13,28 +13,22 @@
select t1.* from
t_settlement_confirm t1
where 1=1
- <if test="req.type != null ">
- and t1.type = #{req.type}
- </if>
<if test="req.partnerId != null ">
- and t1.partnerId = #{req.partnerId}
+ and t1.partner_id = #{req.partnerId}
+ </if>
+ <if test="req.siteIds != null ">
+ and t1.site_id = #{req.siteIds}
</if>
<if test="req.type == 1 ">
<if test="req.startTime != null and req.startTime!=''">
and (t1.start_time between #{req.startTime} and #{req.endTime}
</if>
</if>
- <if test="req.siteIds != null and req.siteIds.size() > 0">
- AND t1.site_id IN
- <foreach collection="req.siteIds" item="siteId" open="(" separator="," close=")">
- #{siteId}
- </foreach>
- </if>
<if test="req.type == 2 ">
<if test="req.startTime != null and req.startTime!=''">
and (t1.end_time between #{req.startTime} and #{req.endTime}
</if>
</if>
-and t1.del_flag = 0
+ and t1.del_flag = 0
</select>
</mapper>
--
Gitblit v1.7.1