From f42cce5f1b56371413f50676576b0ca195bec6b6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期五, 02 二月 2024 20:06:35 +0800
Subject: [PATCH] zjh 本地 2024/02/2 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 56c4b2d..e2a3f10 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
@@ -542,7 +542,7 @@
} else {
tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId);
}
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber());
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if (null != tjProjectList && tjProjectList.size() > 0) {
for (TjProject project : tjProjectList) {
@@ -634,7 +634,7 @@
wq.ne(TjOrderDetail::getTjStatus, 3);
wq.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> detailList = detailService.list(wq);
- String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber());
+ String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(),tjOrder.getCardId());
if (null != detailList && detailList.size() > 0) {
List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>();
for (TjOrderDetail detail : detailList) {
--
Gitblit v1.8.0