赵文轩
2024-06-14 89052f1dd07ee5c5c014d536b8481db31b611b17
根据时间过滤费用
1个文件已修改
21 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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");