From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 09:12:49 +0800
Subject: [PATCH] 2025-07-03
---
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 7dc3911..13344b5 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
@@ -24,10 +24,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -65,6 +62,8 @@
private TjOrderController tjOrderController;
@Autowired
private ISysUserService userService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
@@ -88,6 +87,10 @@
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
if(null !=water){
water.setPayStasus(1L);
+ water.setSfjs("1");
+ water.setJsrq(new Date());
+ water.setJsrxm("his鍥炶皟");
+ water.setJsrdm("999");
if (tjFlowingWaterService.updateById(water)) {
String jxbz = water.getJxbz();
if(StringUtil.isNotBlank(jxbz)){
@@ -126,24 +129,35 @@
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.removeById(order.getOrderId());*/
+ /* 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());
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
- tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
+
+
}
+ water.setPayStasus(2L);
+ water.setRefundPersonId("his鍥炶皟");
+ water.setRefundTime(new Date());
+ water.setRefundPrice(water.getPaidIn());
+ tjFlowingWaterService.updateById(water);
}
}
}
--
Gitblit v1.8.0