From 0ebc42ccd16d2e8ea1a5d815253021c91cc2836f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 07 三月 2025 16:43:52 +0800
Subject: [PATCH] 2025-03-07
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 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 acf5fba..8f32342 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
@@ -1236,6 +1236,7 @@
}*/
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
@@ -1246,14 +1247,18 @@
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
xdPictureService.saveBatch(xdPictureList);
-// 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);
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
} else {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
-
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
}
return AjaxResult.success(tjNumber);
} else {
@@ -3756,6 +3761,20 @@
}
+ @GetMapping("/chushenyemianyijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
@PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
@@ -4017,5 +4036,44 @@
}
return AjaxResult.error();
}
+
+
+
+ @PostMapping("/addBlTransition")
+ @ApiOperation(value = "琛ュ綍娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult addBlTransition(@RequestBody Map<String, Object> map) {
+ Object packId = map.get("pacId");
+ if (null == map.get("cusId")) return AjaxResult.error("璇烽�夋嫨浣撴浜�");
+ String cusId = map.get("cusId").toString();
+ Object proIds1 = map.get("proIds");
+ List<Long> proIds = null;
+ if (null != proIds1 && !proIds1.equals("")) {
+ proIds = JSON.parseArray(proIds1.toString(), Long.class);
+ }
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+ String cardId = "0";
+ if (null != tjCustomer) {
+ cardId = tjCustomer.getCardId();
+ }
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
+ transitionService.deletedTbTransitionByCusId(cusId);
+ }
+
+ //鍗曢」
+ if (null != proIds && !proIds.isEmpty()) {
+ //寮傛淇濆瓨鏁版嵁搴撹〃
+ for (Long proId : proIds) {
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if (null != project) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
+ }
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.8.0