From a74b5ffd9c25edd8096220920934e3e42f62cc23 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 25 四月 2024 17:06:08 +0800
Subject: [PATCH] zjh 2024/04/25-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 94e7ce5..b7a9b2e 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
@@ -238,7 +238,12 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ if(tjFlowingWater.getDiscount()==null){
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),new BigDecimal(10), tjOrder.getTjNumber());
+ }else {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ }
+
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
// if (list != null) {
@@ -1006,6 +1011,10 @@
List<TjConsumables> list2=new ArrayList<>();
for (TbTransition transition : tbTransitionList) {
+ if(transition.getNowPrice().compareTo(BigDecimal.valueOf(0))==0){
+ continue;
+ }
+
TjProject tjProject = projectService.selectTjProjectByProId(transition.getProId());
//瀛愰」
if (null != tjProject) {
--
Gitblit v1.8.0