From 0f658843b92eb41a87cb113c9eb6416e25e76a2e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 14 三月 2025 08:42:10 +0800
Subject: [PATCH] zjh20250314
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 126 ++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 42 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 f62d974..0004245 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
@@ -3977,6 +3977,7 @@
if (null != dtos && !dtos.isEmpty()) {
int index = 0;
+ boolean flag = false;
for (UpdateTransitionnewPriceDto dto : dtos) {
index++;
LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
@@ -3988,49 +3989,90 @@
log.info("鐖堕」鐩甶d涓�: " + dto.getParentProId());
log.info("鎶樻墸涓�: " + new BigDecimal(dto.getDiscount()));
if (null != list && !list.isEmpty()) {
- BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
- log.info("dxzj:{}",dxzj.toString());
- if (index == dtos.size()){
- BigDecimal yhj = dto.getYhj();
- log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
- BigDecimal cj = yhj.subtract(dxzj);
- log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
- int index1 = 0;
- for (TbTransition transition : list) {
- BigDecimal ordPrice = transition.getOrdPrice();
- BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
- if (index1 == 0){
- log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
- multiply = multiply.add(cj);
- log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
- }
- index1++;
- log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
-// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
- transition.setNowPrice(multiply);
- transition.setDiscount(new BigDecimal(dto.getDiscount()));
- transitionService.updateById(transition);
- }
- }else {
- for (TbTransition transition : list) {
- BigDecimal ordPrice = transition.getOrdPrice();
- BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
- log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
-// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
- transition.setNowPrice(multiply);
- 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);
-// }
-// }
+
+ for (TbTransition transition : list) {
+ BigDecimal ordPrice = transition.getOrdPrice();
+ BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+ transition.setNowPrice(multiply);
+ transition.setDiscount(new BigDecimal(dto.getDiscount()));
+ transitionService.updateById(transition);
}
+
+ BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
+
+ BigDecimal yhj = dto.getYhj();
+ log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+ BigDecimal cj = yhj.subtract(dxzj);
+ log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+// int index1 = 0;
+ for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ BigDecimal result = transition.getNowPrice().add(cj);
+ log.info("琛ヤ笂宸环鍓嶇殑浠锋牸涓猴細{}",transition.getNowPrice().toString());
+ if (result.compareTo(BigDecimal.ZERO)>0 && !flag && cj.compareTo(BigDecimal.ZERO) != 0){
+ transition.setNowPrice(result);
+ transitionService.updateById(transition);
+ log.info("淇敼 琛ヤ笂宸环鍚庣殑浠锋牸涓猴細{}",result.toString());
+ flag = true;
+ break;
+ }
+// if (index1 == 0 ){
+// log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+// multiply = multiply.add(cj);
+// log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+// }
+// index1++;
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// transition.setDiscount(new BigDecimal(dto.getDiscount()));
+// transitionService.updateById(transition);
+ }
+
+// log.info("dxzj:{}",dxzj.toString());
+// if (index == dtos.size()){
+// BigDecimal yhj = dto.getYhj();
+// log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+// BigDecimal cj = yhj.subtract(dxzj);
+// log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+// int index1 = 0;
+// for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+// if (index1 == 0 ){
+// log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+// multiply = multiply.add(cj);
+// log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+// }
+// index1++;
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// transition.setDiscount(new BigDecimal(dto.getDiscount()));
+// transitionService.updateById(transition);
+// }
+// }else {
+// for (TbTransition transition : list) {
+// BigDecimal ordPrice = transition.getOrdPrice();
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+// log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+//// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+// transition.setNowPrice(multiply);
+// 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