From d0a80136bc66ad8ac24382a133a3b792bd7925f5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 20:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index f8ebd3d..2d0a858 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -37,6 +37,7 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -77,6 +78,8 @@
}
}
ChargingBillVO chargingBillVO = new ChargingBillVO();
+ List<TChargingOrder> exports = new ArrayList<>();
+
String startTime1 = null;
String startTime2 = null;
if (StringUtils.hasLength(dto.getStartTime())){
@@ -173,6 +176,16 @@
if (data1!=null && data2!=null){
tChargingOrder.setTerminalName(data1.getName()+data2.getName());
tChargingOrder.setTerminalCode(data2.getCode());
+ }
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
+ chargingBillListVO.setPayTypeName("微信商户");
+ }
+ if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
+ if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
+ chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
+ }else{
+ chargingBillListVO.setPayTypeName("支付宝商户");
+ }
}
tChargingOrder.setOrderClassification1("线上订单");
tChargingOrder.setRechargePaymentType1("预付");
@@ -289,6 +302,7 @@
}
}
+ exports.addAll(tChargingOrders);
// 将chargingSecond 这是以秒为单位存放的总秒数 将其转化为xx小时xx分钟xx秒
int hours = chargingSecond / 3600;
int minutes = (chargingSecond % 3600) / 60;
--
Gitblit v1.7.1