From 89052f1dd07ee5c5c014d536b8481db31b611b17 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 14 六月 2024 18:01:11 +0800
Subject: [PATCH] 根据时间过滤费用
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index ecf0c48..c85003a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -2,6 +2,7 @@
import java.io.*;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -1417,11 +1418,11 @@
LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper1.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper1.ne(TjFlowingWater::getPayStasus,2);
- tjFlowingWaterLambdaQueryWrapper1.eq(TjFlowingWater::getIsAddition,"N");
- TjFlowingWater tjFlowingWater1 = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper1);
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
// if (tjFlowingWater1.getPayStasus() != 1){
LambdaQueryWrapper<TjCustomer> tjCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
tjCustomerLambdaQueryWrapper.eq(TjCustomer::getCusId,tjOrder.getUserId());
@@ -1432,7 +1433,10 @@
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
- JSONArray jsonArray = JSONUtil.parseArray(data);
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<Map<String, String>> list = data.stream().filter(item -> String.valueOf(item.get("PayDate")).equals(dateFormat.format(date))).collect(Collectors.toList());
+ JSONArray jsonArray = JSONUtil.parseArray(list);
BigDecimal decimal = new BigDecimal("0");
for (Object o : jsonArray) {
JSONObject object = (JSONObject) o;
@@ -1446,11 +1450,6 @@
if (decimal.compareTo(new BigDecimal("0")) != 0){
return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
}
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
- TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
tjFlowingWater.setPayStasus(1L);
tjFlowingWater.setPayType(0L);
tjFlowingWater.setTollCollectorId("148");
--
Gitblit v1.8.0