From ae84ae528290f44c66ef14c92f4a68bd3c1ce617 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 十一月 2024 08:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index e08be7f..66b8377 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -58,6 +58,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -112,6 +113,8 @@
@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
@PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
List<TChargingOrderExport> tChargingOrderExports = new ArrayList<>();
List<ChargingOrderListVO> exportList = res.getList().getRecords();
@@ -149,10 +152,22 @@
tChargingOrderExport.setOrderClassification("1");
tChargingOrderExport.setStartType("扫码");
tChargingOrderExport.setOne("小程序");
- tChargingOrderExport.setTwo("小程序");
- tChargingOrderExport.setCreateTime(chargingOrderListVO.getCreateTime()+"");
- tChargingOrderExport.setStartTime(chargingOrderListVO.getStartTime()+"");
- tChargingOrderExport.setEndTime(chargingOrderListVO.getEndTime()+"");
+ if (chargingOrderListVO.getRechargePaymentType()!=null){
+ switch (chargingOrderListVO.getRechargePaymentType()){
+ case 1:
+ tChargingOrderExport.setTwo("微信小程序");
+ break;
+ case 2:
+ tChargingOrderExport.setTwo("支付宝小程序");
+ break;
+ }
+ }
+ String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
+ String s2 = DateUtils.localDateTimeToString(chargingOrderListVO.getStartTime());
+ String s3 = DateUtils.localDateTimeToString(chargingOrderListVO.getEndTime());
+ tChargingOrderExport.setCreateTime(s1);
+ tChargingOrderExport.setStartTime(s2);
+ tChargingOrderExport.setEndTime(s3);
tChargingOrderExport.setRechargePaymentStatus(chargingOrderListVO.getRechargePaymentStatus()+"");
tChargingOrderExport.setType("充电订单");
tChargingOrderExport.setChargingType("单桩双充");
@@ -174,7 +189,7 @@
BigDecimal size = new BigDecimal(stageCost.size());
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : stageCost) {
- bigDecimal1 = bigDecimal1.add(tChargingOrderAccountingStrategy.getElectrovalence());
+ bigDecimal1 = bigDecimal1.add(tChargingOrderAccountingStrategy.getPeriodElectricPrice());
bigDecimal2 = bigDecimal2.add(tChargingOrderAccountingStrategy.getPeriodServicePrice());
bigDecimal3 = bigDecimal3.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
}
@@ -205,7 +220,6 @@
tChargingOrderExport.setVipType(data1.getName());
}
}
-// tChargingOrderExport.setVipType();
tChargingOrderExport.setIsPlus(chargingOrderListVO.getVipDiscountAmount().compareTo(BigDecimal.ZERO)>0?"是":"否");
if (data3!=null){
tChargingOrderExport.setRealName(data3.getName());
@@ -268,8 +282,8 @@
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
- @GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time) {
+ @GetMapping(value = "/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time) {
time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
--
Gitblit v1.7.1