From 0ccd64289150070d798e6ee94589ac120e0539dc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 05 三月 2025 17:42:06 +0800
Subject: [PATCH] 引流平台
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 5ffa92c..50c910b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -552,14 +552,18 @@
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
String format = "";
String format1 = "";
- String temp1=list.get(0).getStartTime().split(":")[0];
- String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
+ System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
+ System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
+ String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
- String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
@@ -1051,9 +1055,21 @@
map.put("shopAmount",data1);
BigDecimal data2 = vipOrderService.getSumAmout(sixBefore);
map.put("vipAmount",data2);
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, sixBefore, LocalDate.now()).list();
+ BigDecimal serviceCharge = new BigDecimal("0");
+ BigDecimal commissionAmount = new BigDecimal("0");
+ for (TChargingOrder chargingOrder : list) {
+ if (chargingOrder.getOrderSource().equals(2)){
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ }else{
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge());
+ }
-
+ }
+ map.put("service_charge",serviceCharge);
+ map.put("commission_amount",commissionAmount);
return R.ok(map);
}
--
Gitblit v1.7.1