From c0f0bf3c1c598c10d4eb80751960bca76da50b0d Mon Sep 17 00:00:00 2001 From: zjh <zjh@888> Date: 星期五, 14 六月 2024 18:03:32 +0800 Subject: [PATCH] zjh 本地 2024/06/14 --1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 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 0cf4c0d..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 @@ -1,10 +1,15 @@ package com.ltkj.web.controller.system; import java.io.*; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -1413,11 +1418,12 @@ 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); - TjFlowingWater tjFlowingWater1 = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper1); - if (tjFlowingWater1.getPayStasus() != 1){ + 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()); TjCustomer tjCustomer = tjCustomerService.getOne(tjCustomerLambdaQueryWrapper); @@ -1426,9 +1432,24 @@ hisRequestParams.put("patientId",tjCustomer.getPationId()); AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams); if (Integer.parseInt(queryPay.get("code").toString()) == 200) { - LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>(); - tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId()); - TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper); + List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("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; + JSONArray items = object.getJSONArray("Items"); + for (Object item : items) { + JSONObject jsonObject = (JSONObject) item; + BigDecimal fee = jsonObject.getBigDecimal("Fee"); + decimal.add(fee); + } + } + if (decimal.compareTo(new BigDecimal("0")) != 0){ + return AjaxResult.error("瀛樺湪鏈即璐归」鐩�"); + } tjFlowingWater.setPayStasus(1L); tjFlowingWater.setPayType(0L); tjFlowingWater.setTollCollectorId("148"); @@ -1442,8 +1463,10 @@ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId,tjSerialNumber); tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId,detailIds); detailService.update(tjOrderDetailLambdaUpdateWrapper); + }else { + return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍"); } - } +// } } String config = configService.selectConfigByKey("qt_open_xdt"); String byKey = configService.selectConfigByKey("qt_kjksid"); -- Gitblit v1.8.0