From 57e9aceebe283f45bac772a58f43e88dcb3b1753 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 24 六月 2025 11:56:17 +0800
Subject: [PATCH] zjh20250624

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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..9837d49 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
@@ -135,16 +135,18 @@
                         blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, 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());
                     }
                 }
             }

--
Gitblit v1.8.0