From d634bc5f395dd6b2d73b47fbac98ae5144294cb8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 24 一月 2024 10:43:45 +0800
Subject: [PATCH] zjh 2024/01/24--1

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java       |    5 +
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java |   78 +++++++++++++++++--------
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java                  |    3 +
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java               |    2 
 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java   |    4 
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java        |   46 +++++++++------
 6 files changed, 93 insertions(+), 45 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 1cb5e54..aad0fcf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -281,8 +281,8 @@
         orderRemarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
         redisCache.deleteObject("getOrderDetailByProParentId" + order.getTjNumber());
         for (TbTransition transition : tbTransitionList) {
-            transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
-            transitionService.updateById(transition);
+//            transition.setNowPrice(transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(discount)).divide(BigDecimal.valueOf(10))));
+//            transitionService.updateById(transition);
             TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
             //瀛愰」
             if (null != tjProject) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index ae5a863..e5ca640 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -69,7 +69,8 @@
     private TjAsyncService asyncService;
     @Resource
     private IJimuOnlineReportService reportService;
-
+    @Resource
+    private ITjPackageProjectService tjPackageProjectService;
 
     /**
      * 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
@@ -304,8 +305,8 @@
                     List<TjOrderDetail> detailList = detailService.list(wq2);
                     if (null != detailList && detailList.size() > 0) {
                         TjRefundVo tjRefundVo = new TjRefundVo();
-                        tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
-                        tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+                        tjRefundVo.setTjName(customer.getCusName());
+                        tjRefundVo.setTjPhone(customer.getCusPhone());
                         tjRefundVo.setTjNumber(order.getTjNumber());
                         tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
                         if (null != order.getDictCompName()) tjRefundVo.setTjComp(order.getDictCompName());
@@ -351,8 +352,8 @@
                         TjCustomer customer = customerService.getById(order.getUserId());
                         if (null != customer) {
                             TjRefundVo tjRefundVo = new TjRefundVo();
-                            tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
-                            tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+                            tjRefundVo.setTjName(customer.getCusName());
+                            tjRefundVo.setTjPhone(customer.getCusPhone());
                             tjRefundVo.setTjNumber(order.getTjNumber());
                             tjRefundVo.setTjOrderId(String.valueOf(order.getOrderId()));
                             if (null != order.getDictCompName()) tjRefundVo.setTjComp(order.getDictCompName());
@@ -416,8 +417,8 @@
                             if (null != detailList && detailList.size() > 0) {
                                 TjCollectFeesVo tjRefundVo = new TjCollectFeesVo();
                                 tjRefundVo.setTjCusId(String.valueOf(customer.getCusId()));
-                                tjRefundVo.setTjName(MatchUtils.hideCusName(customer.getCusName()));
-                                tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+                                tjRefundVo.setTjName(customer.getCusName());
+                                tjRefundVo.setTjPhone(customer.getCusPhone());
                                 tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
                                if(null !=customer.getCusIdcard()) tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                                 DictComp dictComp = compService.getById(order.getFirmId());
@@ -544,7 +545,7 @@
                 if (null != tjProjectList && tjProjectList.size() > 0) {
                     for (TjProject project : tjProjectList) {
                         if (project.getProParentId() == 0) {
-                            //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+/*                            //LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
 //                            wqq1.eq(TbTransition::getCusId, customerService.getById(order.getUserId()).getCusIdcard());
 //                            wqq1.eq(TbTransition::getParentProId, project.getProId());
 //                            List<TbTransition> tbTransitionList = transitionService.list(wqq1);
@@ -573,6 +574,22 @@
                                     project.setProPrice(new BigDecimal("0.00").setScale(2));
                                     project.setProOrdPrice(new BigDecimal("0.00").setScale(2));
                                 }
+                            }*/
+                            String s = tjFlowingWaterService.getDiscount(OrderId);
+                            String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(), String.valueOf(project.getProId()));
+                            if(null !=pacId){
+                                TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+                                        .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
+                                if(null !=pp){
+                                    project.setProPrice(pp.getPriceNow());
+                                    project.setProOrdPrice(pp.getPriceNow().multiply(new BigDecimal(s)));
+                                }else {
+                                    project.setProPrice(project.getProPrice().setScale(2));
+                                    project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
+                                }
+                            }else {
+                                project.setProPrice(project.getProPrice().setScale(2));
+                                project.setProOrdPrice(project.getProPrice().multiply(new BigDecimal(s)).setScale(2));
                             }
                         }
                     }
@@ -593,7 +610,7 @@
     public AjaxResult getTjRefundProInfoVoList(@RequestParam @ApiParam(value = "浣撴璁㈠崟id") String orderId) {
         TjOrder tjOrder = orderService.getById(orderId);
         if (null == tjOrder) return AjaxResult.error("璇ヤ綋妫�璁板綍涓嶅瓨鍦�");
-        TjCustomer customer = customerService.getById(tjOrder.getUserId());
+//        TjCustomer customer = customerService.getById(tjOrder.getUserId());
         if (tjOrder.getCheckStatus() == 0 && tjOrder.getReportTime() == null) {
             LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
             wq.eq(TjOrderDetail::getOrderId, orderId);
@@ -607,27 +624,38 @@
                 for (TjOrderDetail detail : detailList) {
                     TjProject project = projectService.getById(detail.getProId());
                     if (project.getProParentId() == 0) {
-                        LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
-                        wqq1.eq(TbTransition::getCusId, customer.getCusIdcard());
-                        wqq1.eq(TbTransition::getParentProId, project.getProId());
-                        List<TbTransition> tbTransitionList = transitionService.list(wqq1);
-                        BigDecimal bigDecimal = new BigDecimal("0.00");
-                        BigDecimal bigDecimal1 = new BigDecimal("0.00");
-                        for (TbTransition transition : tbTransitionList) {
-                            bigDecimal = bigDecimal.add(transition.getNowPrice());
-                            bigDecimal1 = bigDecimal1.add(transition.getOrdPrice());
-                        }
+//                        LambdaQueryWrapper<TbTransition> wqq1 = new LambdaQueryWrapper<>();
+//                        wqq1.eq(TbTransition::getCusId, customer.getCusIdcard());
+//                        wqq1.eq(TbTransition::getParentProId, project.getProId());
+//                        List<TbTransition> tbTransitionList = transitionService.list(wqq1);
+//                        BigDecimal bigDecimal = new BigDecimal("0.00");
+//                        BigDecimal bigDecimal1 = new BigDecimal("0.00");
+//                        for (TbTransition transition : tbTransitionList) {
+//                            bigDecimal = bigDecimal.add(transition.getNowPrice());
+//                            bigDecimal1 = bigDecimal1.add(transition.getOrdPrice());
+//                        }
+                        String s = tjFlowingWaterService.getDiscount(orderId);
+                        String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(), String.valueOf(project.getProId()));
                         TjRefundProInfoVo proInfoVo = new TjRefundProInfoVo();
-                       // double discount = Double.parseDouble(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getDiscount());
-                        //BigDecimal decimal = BigDecimal.valueOf(discount).divide(BigDecimal.valueOf(100));
-                        //proInfoVo.setNetReceipts(bigDecimal.multiply(decimal).setScale(2, BigDecimal.ROUND_DOWN));
-                        proInfoVo.setNetReceipts(bigDecimal);
+
+                        if(null !=pacId){
+                            TjPackageProject pp = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+                                    .eq(TjPackageProject::getProId,String.valueOf(project.getProId())));
+                            if(null !=pp){
+                                proInfoVo.setNetReceipts(pp.getPriceNow().multiply(new BigDecimal(s)));
+                                proInfoVo.setPrice(pp.getPriceNow());
+                            }else {
+                                proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
+                                proInfoVo.setPrice(project.getProPrice());
+                            }
+                        }else {
+                            proInfoVo.setNetReceipts(project.getProPrice().multiply(new BigDecimal(s)));
+                            proInfoVo.setPrice(project.getProPrice());
+                        }
                         proInfoVo.setCollectFeesTime(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getUpdateTime());
                         proInfoVo.setTollCollector(userService.getById(tjFlowingWaterService.getById(detail.getFlowingWaterId()).getTollCollectorId()).getNickName());
                         proInfoVo.setProName(project.getProName());
                         proInfoVo.setProId(String.valueOf(project.getProId()));
-                        //proInfoVo.setPrice(project.getProPrice().setScale(2, BigDecimal.ROUND_DOWN));
-                        proInfoVo.setPrice(bigDecimal1);
                         tjRefundProInfoVoList.add(proInfoVo);
                     }
                 }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 9788811..93442c0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1051,9 +1051,12 @@
         }
         if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
             transitionService.deletedTbTransitionByCusId(cusId);
-            if (redisCache.hasKey(cusId)) redisCache.deleteObject(cusId);
-            if (redisCache.hasKey(cardId+cusId + "cusId")) redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);
-
+            if (redisCache.hasKey(cardId+cusId)) {
+                redisCache.deleteObject(cardId+cusId);
+            }
+            if (redisCache.hasKey(cardId+cusId + "cusId")){
+                redisCache.deleteCacheMapValue(cardId+cusId + "cusId", cardId+cusId);
+            }
         }
         List<TbTransition> tbTransitionList = null;
         if (!redisCache.hasKey(cardId+cusId)) {
@@ -1439,26 +1442,33 @@
             if (null != pacId) {
                 TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                 map.put("pacName", aPackage.getPacName());
+                TjProject tjProject = projectService.getById(entry.getKey());
+                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
+                        .eq(TjPackageProject::getProId, entry.getKey()));
+                map.put("ordPrice",tjProject.getProPrice());
+                if(null !=project){
+                    map.put("nowPrice",project.getPriceNow());
+                }else {
+                    map.put("nowPrice",tjProject.getProPrice());
+                }
             } else {
                 map.put("pacName", "鍗曢」");
+                List<TbTransition> tbTransitionList = entry.getValue();
+                if (null != tbTransitionList && tbTransitionList.size() > 0) {
+                    BigDecimal money1 = new BigDecimal("0.00");
+                    BigDecimal money2 = new BigDecimal("0.00");
+                    for (TbTransition tbTransition : tbTransitionList) {
+                        money1 = money1.add(tbTransition.getOrdPrice());
+                        money2 = money2.add(tbTransition.getNowPrice());
+                    }
+                    map.put("ordPrice", money1);
+                    map.put("nowPrice", money2);
+                 }
             }
             map.put("parentName", projectService.getById(entry.getKey()).getProName());
             map.put("list", entry.getValue());
-//            List<TbTransition> tbTransitionList = entry.getValue();
-//            if (null != tbTransitionList && tbTransitionList.size() > 0) {
-//                BigDecimal money1 = new BigDecimal("0.00");
-//                BigDecimal money2 = new BigDecimal("0.00");
-//                for (TbTransition tbTransition : tbTransitionList) {
-//                    money1 = money1.add(tbTransition.getOrdPrice());
-//                    money2 = money2.add(tbTransition.getNowPrice());
-//                }
-//                map.put("ordPrice", money1);
-//                map.put("nowPrice", money2);
-//            }
-            TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
-                    .eq(TjPackageProject::getProId, entry.getKey()));
-            map.put("ordPrice", project.getPriceNow());
-            map.put("nowPrice", projectService.getById(entry.getKey()).getPriceNow());
+
+
             list.add(map);
         }
         return list;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
index d07b15f..f0b952e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -208,4 +208,7 @@
             " b.cus_id=(SELECT a.cus_idcard FROM tj_customer a " +
             "WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId})  ")
     BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId);
+
+    @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum} AND a.parent_pro_id=#{proId}")
+    String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("proId")String proId);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
index c24afb9..c68b3f3 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -106,4 +106,6 @@
     BigDecimal getTbTransitionPriceAndOrdPrice(String cusId,Long proId);
 
     BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);
+
+    String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String proId);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
index 163f156..58eeec5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -166,4 +166,9 @@
     public BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId, Long proId) {
         return tbTransitionMapper.getTbTransitionDxPriceAndOrdPrice(cusId,proId);
     }
+
+    @Override
+    public String selectPacIdByTbTransitionTjNumAndProId(String tjNum, String proId) {
+        return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,proId);
+    }
 }

--
Gitblit v1.8.0