From e3f6f42c3056a8fac0308ec93b3e192c82cfc3dd Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 23 十月 2024 11:49:43 +0800
Subject: [PATCH] 团体票不走his请求、增加团体票收费状态
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 2f3b4d1..001aaaf 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
@@ -942,9 +942,9 @@
// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo()) {
+ if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
tjOrder.setTjType("1");
- } else {
+ } else if (tjOrder.getTjType().equals("2")){
tjOrder.setTjType("2");
}
}
@@ -1089,9 +1089,12 @@
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}else {
hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
}
@@ -1582,7 +1585,7 @@
if (null != tjCustomer) {
cardId = tjCustomer.getCardId();
}
- if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
transitionService.deletedTbTransitionByCusId(cusId);
if (redisCache.hasKey(cardId + cusId)) {
redisCache.deleteObject(cardId + cusId);
--
Gitblit v1.8.0