From d9006551fff47c172ea6a0672af7dd21df34f28f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期六, 15 二月 2025 15:05:45 +0800
Subject: [PATCH] 20250215
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
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 6461594..a442cf0 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
@@ -1085,7 +1085,11 @@
tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
return result;
}
- } finally {
+ }catch (Exception e){
+ log.error(String.valueOf(e),e.getMessage());
+ e.printStackTrace();
+ }
+ finally {
lock.unlock();
}
return AjaxResult.error();
@@ -1347,6 +1351,7 @@
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
@@ -1356,6 +1361,7 @@
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
return AjaxResult.success(tjNumber);
} else {
@@ -1522,6 +1528,28 @@
} else {
tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
}
+ }
+
+
+
+ @GetMapping("/addCaiYangDengJi")
+ @ApiOperation(value = "鎵嬪姩娣诲姞閲囨牱璁板綍鎺ュ彛")
+ public AjaxResult addCaiYangDengJi(@RequestParam("tjNum") String tjNum){
+
+ try {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if(null !=order){
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
+ }
+ } catch (NumberFormatException e) {
+ log.error(String.valueOf(e));
+ }
+
+ return AjaxResult.success();
}
@@ -1853,9 +1881,9 @@
tjOrder.setTjType("2");
}
- if (StringUtil.isBlank(tjOrder.getFirmId())) {
- tjOrder.setFirmId("0");
- }
+ if (StringUtil.isBlank(tjOrder.getFirmId())) {
+ tjOrder.setFirmId("0");
+ }
//
// tjReservation.setIsExpire(1);
// tjReservationService.updateById(tjReservation);
--
Gitblit v1.8.0