From 9199522e90b4f50dc0444dc90cad61366efd8db7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 21:33:46 +0800
Subject: [PATCH] 20250103-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 15 +++++++++++++--
1 files changed, 13 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 fd8b804..b1698ec 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
@@ -92,6 +92,8 @@
private TjFlowingWaterHisService tjFlowingWaterHisService;
@Autowired
private ITjSamplingService tjSamplingService;
+ @Autowired
+ private TjOrderController tjOrderController;
/**
* 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
@@ -248,7 +250,8 @@
}
String s = configService.selectConfigByKey("is_request_common_his_api");
- if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
+// if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
+ if (null != s && s.equals("Y")) {
String apiUrl = configService.selectConfigByKey("common_api_url");
String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
HashMap<String, Object> map = new HashMap<>();
@@ -436,10 +439,18 @@
if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
// extracted(order, list2, tbTransitionList);
//寮傛娣诲姞鏀惰垂鏄庣粏
- asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
+// asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
Map<String, Object> map = new HashMap<>();
map.put("waterId", tjFlowingWater.getWaterId());
map.put("mobanId", reportService.getMoBanIds());
+
+ SysUser user = null;
+ if (flowingWater.getCreateId()!= null)
+ user = userService.getById(flowingWater.getCreateId());
+ else user = userService.getById(1L);
+ TjOrder tjOrder = orderService.getById(flowingWater.getOrderId());
+ List<TjOrderDetail> detailList1 = detailService.getCaiYangDengJi(flowingWater.getOrderId());
+ tjOrderController.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, user, null);
return AjaxResult.success("鏀惰垂鎴愬姛", map);
}
}
--
Gitblit v1.8.0