From 1917e1b69a8480654c086df54e32b0be94a88e7d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 17 三月 2025 17:51:35 +0800
Subject: [PATCH] zjh20250317
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 61 +-----------------------------
1 files changed, 3 insertions(+), 58 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 0004245..2604291 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
@@ -2153,9 +2153,11 @@
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
//琛ュ樊浠�
- List<Map<String, Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+ List<Map<String, Object>> cjMaps = transitionService.addTbhuoquxiangmuchajia(pacId.toString(), cusId);
if (null != cjMaps && !cjMaps.isEmpty()) {
+ log.info("璇ュ椁�"+pacId+"涓湁宸环:"+cjMaps.size()+"涓�");
for (Map<String, Object> cjMap : cjMaps) {
+ log.info("娣诲姞涓存椂琛ㄥ椁愭暟鎹椂鎵�閫夌殑宸环涓�:"+ cjMap.get("cj").toString());
transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString()));
}
}
@@ -4005,10 +4007,7 @@
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){
@@ -4018,61 +4017,7 @@
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