From 1e91dc33009cfdc951b2642877f40280b51c3089 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 15:17:01 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 c8681df..ee9c8d3 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
@@ -7,11 +7,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TjProjectMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.system.TjOrderController;
import com.ltkj.web.wxUtils.HttpClientUtils;
import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -58,6 +61,12 @@
private TjProjectMapper tjProjectMapper;
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private TjOrderController tjOrderController;
+ @Autowired
+ private ISysUserService userService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
@@ -98,6 +107,13 @@
// wrapper1.set(TjSampling::getIsPay,1);
// tjSamplingService.update(wrapper1);
}
+ SysUser user = null;
+ if (water.getCreateId()!= null)
+ user = userService.getById(water.getCreateId());
+ else user = userService.getById(1L);
+ TjOrder tjOrder = orderService.getById(water.getOrderId());
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(water.getOrderId());
+ tjOrderController.addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, user, null);
}
}else {
return AjaxResult.error("鏌ヤ笉鍒版祦姘村彿: "+feiYongId);
@@ -124,7 +140,7 @@
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);
--
Gitblit v1.8.0