From da97903850c3b720632206d6447efcfdd22616ec Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期六, 15 二月 2025 15:11:02 +0800
Subject: [PATCH] zjh20250215
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
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 0d5da1a..390ec2e 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
@@ -23,6 +23,7 @@
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.TjCollectFeesVo;
import com.ltkj.hosp.vodomain.TjRefundProInfoVo;
@@ -99,6 +100,10 @@
private TjOrderController tjOrderController;
@Autowired
private ITbTransitionService tbTransitionService;
+ @Autowired
+ private TjSamplingMapper tjSamplingMapper;
+ @Autowired
+ private TjProBlService blService;
/**
* 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
@@ -285,6 +290,23 @@
wrapper.gt(TbTransition::getNowPrice, 0);
List<TbTransition> list = transitionService.list(wrapper);
+
+ List<TbTransition> transitions = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), order.getCardId(), jxbz);
+
+
+
+ if(null==transitions || transitions.isEmpty()){
+ remarkService.deleteTjOrderDetailByjxbz(jxbz);
+ detailService.deleteTjOrderDetailByjxbz(jxbz);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(jxbz);
+ transitionService.deleteTjOrderDetailByjxbz(jxbz);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,order.getTjNumber()).eq(TjProBl::getBldh, jxbz));
+ List<String> ids=new ArrayList<>();
+ ids.add(jxbz);
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(order.getTjNumber(), order.getUserId(),ids);
+ return AjaxResult.error("琛ュ綍澶辫触,鎵�閫夐」鐩彲鑳藉凡瀛樺湪 涓嶅彲琛ュ綍!");
+ }
+
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -320,7 +342,7 @@
JSONObject data = object.getJSONObject("data");
tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
JSONArray mxList = data.getJSONArray("mxList");
- if (mxList != null && mxList.size() > 0) {
+ if (mxList != null && !mxList.isEmpty()) {
List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
tjFlowingWaterHisService.saveBatch(his);
}
@@ -656,7 +678,7 @@
.or()
.eq(TjCustomer::getCusPhone, tjPhone);
List<TjCustomer> customerList = customerService.list(wq0);
- if (null != customerList && customerList.size() > 0) {
+ if (null != customerList && !customerList.isEmpty()) {
List<TjRefundVo> tjRefundVoList = new ArrayList<>();
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
@@ -665,7 +687,7 @@
wq1.orderByDesc(TjOrder::getCreateTime);
List<TjOrder> tjOrders = orderService.list(wq1);
TjOrder order = null;
- if (null != tjOrders && tjOrders.size() > 0) {
+ if (null != tjOrders && !tjOrders.isEmpty()) {
order = tjOrders.get(0);
}
if (null == order) {
@@ -701,7 +723,7 @@
wq1.likeLeft(TjOrder::getTjNumber, tjNum);
wq1.eq(TjOrder::getCheckStatus, 0);
List<TjOrder> orderList = orderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
List<TjRefundVo> tjRefundVoList = new ArrayList<>();
for (TjOrder order : orderList) {
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0