From fca6e337094ebe09090ce465701450ccb818d10d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 11 一月 2025 18:24:21 +0800
Subject: [PATCH] zjh20250111

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

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 9de2e65..4322d6c 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
@@ -3788,6 +3788,7 @@
                 log.info("鐖堕」鐩甶d涓�: "+dto.getParentProId());
                 log.info("鎶樻墸涓�: "+new BigDecimal(dto.getDiscount()));
                 if(null !=list && !list.isEmpty()){
+                    BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId());
                     for (TbTransition transition : list) {
                         BigDecimal ordPrice = transition.getOrdPrice();
                         BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
@@ -3796,6 +3797,15 @@
                         transition.setDiscount(new BigDecimal(dto.getDiscount()));
                         transitionService.updateById(transition);
                     }
+                    if(null !=dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO)>=0){
+                        List<TbTransition> transitionList = list.stream().filter(a ->
+                                transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+                        if(!transitionList.isEmpty()){
+                            TbTransition tbTransition = transitionList.get(0);
+                            tbTransition.setNowPrice(dxzj);
+                            transitionService.updateById(tbTransition);
+                        }
+                    }
                 }
             }
         }

--
Gitblit v1.8.0