From 1f1410ec21358c69b678af86c561f435ad83ab9d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 13:48:49 +0800
Subject: [PATCH] 2025-06-24

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index ee9c8d3..048dc4b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -128,23 +128,27 @@
                     String bldh = water.getJxbz();
 //                    lisRevoke(water.getTjNumber(),bldh);
                     if (bldh != null){
-                        remarkService.deleteTjOrderDetailByjxbz(bldh);
+                        remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null);
+/*                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                         tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                         tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                         transitionService.deleteTjOrderDetailByjxbz(bldh);
                         blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh));
-                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);
+                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/
                     }else {
-                        tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+//                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
+//                        customer.setCardId("0");
+//                        tjCustomerService.updateById(customer);
+
+                       /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                         tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
                         remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
                         tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                         transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
                         ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
-                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
-                        customer.setCardId("0");
-                        tjCustomerService.updateById(customer);
-                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
+//                        tjOrderService.removeById(order.getOrderId());
+                        remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
                     }
                 }
             }

--
Gitblit v1.8.0