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 | 12 +++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 4 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 14 ++++++++++++++
3 files changed, 27 insertions(+), 3 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..7dc3911 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,10 @@
private TjProjectMapper tjProjectMapper;
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private TjOrderController tjOrderController;
+ @Autowired
+ private ISysUserService userService;
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
@@ -98,6 +105,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);
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 f79df97..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;
/**
* 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
@@ -437,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);
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index db7e2b4..63c41d8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1353,8 +1353,8 @@
return AjaxResult.success(tjNumber);
}else {
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
String s = configService.selectConfigByKey("is_request_common_his_api");
--
Gitblit v1.8.0