From 4dc5a1ece2a58f768dea5c829bff9da842a6de95 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期六, 15 六月 2024 15:02:22 +0800
Subject: [PATCH] zjh 本地 2024/06/15 --2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 baf6870..756bb53 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
@@ -845,20 +845,22 @@
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
- if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+ if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏");
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
+// if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
+
+
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -1035,8 +1037,8 @@
if(null !=config && config.equals("Y")){
hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
}
- tjCustomer.setCardId("0");
- tjCustomerService.updateById(tjCustomer);
+// tjCustomer.setCardId("0");
+// tjCustomerService.updateById(tjCustomer);
return AjaxResult.success(tjNumber);
}
@@ -1684,7 +1686,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1738,7 +1740,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1800,6 +1802,7 @@
*/
@PostMapping("/tjGoOut")
@ApiOperation(value = "浣撴绛剧")
+ @Transactional
public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1807,6 +1810,7 @@
String jsonString = com.alibaba.fastjson.JSON.toJSONString(domainVos1);
List<QjDomainVo> domainVos = com.alibaba.fastjson.JSON.parseArray(jsonString, QjDomainVo.class);
String tjNumber = map.get("tjNumber").toString();
+ TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != domainVos && domainVos.size() > 0) {
Set<String> list = new HashSet<>();
for (QjDomainVo domainVo : domainVos) {
@@ -1820,7 +1824,6 @@
if (domainVo.getType() == 3) {
list.add(String.valueOf(domainVo.getTjNumber()));
} else {
- TjOrder tjOrder = tjOrderService.getOrderByTjNum(remark.getTjNumber());
if (null != tjOrder) {
tjOrder.setFinishTime(new Date());
tjOrder.setStatus(TjConstants.TJ_CONFIRM);
@@ -1830,6 +1833,11 @@
}
}
asyncService.tjGoutAsync(domainVos, sysUser, list);
+
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
return getAjaxResult(tjNumber);
@@ -1842,6 +1850,7 @@
*/
@GetMapping("/goOut")
@ApiOperation(value = "绛剧")
+ @Transactional
public AjaxResult goOut(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
return getAjaxResult(tjNumber);
}
@@ -1938,13 +1947,17 @@
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq0);
+
if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+
LambdaQueryWrapper<TjOrderDetail> wq11 = new LambdaQueryWrapper<>();
wq11.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq11.eq(TjOrderDetail::getTjStatus, 0);
wq11.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> list = tjOrderDetailService.list(wq11);
-
if (list != null) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
--
Gitblit v1.8.0