From 8aea3ecc955f5c55024686375bc6b2fc3a989a35 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 03 七月 2024 15:44:32 +0800
Subject: [PATCH] zjh 2024/07/3-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java |   19 ++++++++++---------
 1 files changed, 10 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 1d4157b..a7a40fe 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
@@ -1436,18 +1436,18 @@
                 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");
-                    ArrayList<String> sqdhs = new ArrayList<>();
-                    ArrayList<String> xmfls = new ArrayList<>();
+//                    ArrayList<String> sqdhs = new ArrayList<>();
+//                    ArrayList<String> xmfls = new ArrayList<>();
                     BigDecimal cateFeeAll = BigDecimal.ZERO;
                     for (Map<String, String> datum : data) {
-                        String advId = datum.get("Adv_Id").split("_")[1];
+//                        String advId = datum.get("Adv_Id").split("_")[1];
                         BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
-                        String cateCode = datum.get("CateCode");
+//                        String cateCode = datum.get("CateCode");
                         cateFeeAll = cateFeeAll.add(cateFee);
-                        sqdhs.add(advId);
-                        xmfls.add(cateCode);
+//                        sqdhs.add(advId);
+//                        xmfls.add(cateCode);
                     }
-                    LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
+       /*             LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
                             .in(LtkjJianchajianyanTree::getXmfl, xmfls)
                             .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
@@ -1456,8 +1456,9 @@
                     List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
                     BigDecimal total = results.stream()
                             .map(item -> new BigDecimal(item.getFyhj()))
-                            .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    if (cateFeeAll.compareTo(total) != 0){
+                            .reduce(BigDecimal.ZERO, BigDecimal::add);*/
+                    BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
+                    if (cateFeeAll.compareTo(fyhj) != 0){
                         return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
                     }
 

--
Gitblit v1.8.0