From e61c9a72006d91c1932e306aaf08dc7c676b2223 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 十月 2024 15:09:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++++++----
ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml | 6 +++---
ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml | 7 +++----
3 files changed, 14 insertions(+), 11 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 3846c00..d5de104 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
@@ -1700,7 +1700,7 @@
if(com.ruoyi.common.core.utils.StringUtils.isNotEmpty(query.getTransaction_serial_number())){
//获取当前的计费策略
TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, query.getTransaction_serial_number()));
- BigDecimal residualAmount = chargingOrder.getResidualAmount().add(chargingOrder.getVipDiscountAmount()).subtract(query.getPaid_amount());
+ BigDecimal residualAmount = chargingOrder.getRechargeAmount().add(chargingOrder.getVipDiscountAmount()).subtract(query.getPaid_amount());
chargingOrder.setResidualAmount(residualAmount);
if(query.getOutput_current().compareTo(BigDecimal.ZERO) != 0){
BigDecimal divide = (query.getOutput_current().multiply(query.getOutput_voltage())).divide(new BigDecimal(1000));
@@ -1774,13 +1774,17 @@
//获取订单的计费策略
List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
+ AccountingStrategyDetailOrder accountingStrategyDetailOrder = accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1);
+ if(accountingStrategyDetailOrder.getEndTime().equals("00:00")){
+ accountingStrategyDetailOrder.setEndTime("24:00");
+ }
chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
for (int i = 0; i < 12; i++) {
Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
try {
- String time = (String) clazz.getMethod("getTime" + (i + 1)).invoke(vo);
- if(StringUtils.hasLength(time)){
- String[] split = time.split("-");
+ Object invoke1 = clazz.getMethod("getTime" + (i + 1)).invoke(vo);
+ if(null != invoke1){
+ String[] split = invoke1.toString().split("-");
AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
Object invoke = null;
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
index 5e2f534..d0b8691 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/bootstrap.yml
@@ -56,7 +56,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -74,7 +74,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -89,7 +89,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 127.0.0.1:8848 # nacos注册中心地址
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
@@ -121,7 +121,6 @@
namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
username: nacos
password: nacos
- ip: 192.168.110.111
config:
# 配置中心地址
server-addr: 192.168.0.137:8848,192.168.0.123:8848
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
index f26cb9f..fc51ae5 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/bootstrap.yml
@@ -56,7 +56,7 @@
type: nacos
nacos:
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
data-id: seata-server.properties
@@ -74,7 +74,7 @@
nacos:
application: seata-server
# 开发环境
- server-addr: 127.0.0.1:8848
+ server-addr: 192.168.110.169:8848
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
group: DEFAULT_GROUP
username: nacos
@@ -89,7 +89,7 @@
nacos:
discovery:
# 开发环境
- server-addr: 127.0.0.1:8848 # nacos注册中心地址
+ server-addr: 192.168.110.169:8848 # nacos注册中心地址
namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
group: DEFAULT_GROUP
application: seata-server #Nacos 中 Seata 名称
--
Gitblit v1.7.1