From 0d0e4d01652499b722d655f3bd0e64a6b0bf6359 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 09 七月 2025 15:21:31 +0800
Subject: [PATCH] zjh20250709
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 84 +++++++++++++-----------------------------
1 files changed, 26 insertions(+), 58 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 5222178..2403675 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
@@ -482,7 +482,8 @@
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ if(null !=tjCustomer.getCusBrithday())
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(tjCustomer.getCusPhone());
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -549,7 +550,8 @@
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ if(null !=tjCustomer.getCusBrithday())
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(tjCustomer.getCusPhone());
order.setTjCusIdCard(tjCustomer.getCusIdcard());
@@ -1204,9 +1206,12 @@
boolean b = lock.tryLock(3, TimeUnit.MINUTES);
if (b) {
AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
- if (!result.get("code").toString().equals("200"))
+ if (!result.get("code").toString().equals("200")) {
+ hisApiMethod.ZfHisApiMethod(tjOrder.getCardId());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ }else {
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ }
return result;
}
}catch (Exception e){
@@ -1405,7 +1410,10 @@
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;
+ if (!ajaxResult.get("code").toString().equals("200")){
+ throw new IllegalStateException("鍥綋鐢宠鍗曞彂閫佸け璐�!" + result.get("msg").toString());
+// return ajaxResult;
+ }
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
@@ -1765,16 +1773,11 @@
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
-// threadPools.execute(new Runnable() {
-// @Override
-// public void run() {
try {
getAjaxResults(cusId);
} catch (Exception e) {
}
-// }
-// });
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.in(TjCustomer::getCusIdcard, cusIds);
@@ -1783,18 +1786,6 @@
// ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor();
for (Long aLong : list) {
-// threadPool.execute(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// AjaxResult result = getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
-// threadPool.shutdown();
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
-// });
-
Future<AjaxResult> future = executor.submit(new Callable<AjaxResult>() {
@Override
public AjaxResult call() throws Exception {
@@ -2006,14 +1997,6 @@
if (tjReservation != null) {
tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
-// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
-// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
-// }
-// if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
-// tjReservation.setIsExpire(1);
-// tjReservationService.updateById(tjReservation);
-// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
-// }
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
@@ -2036,39 +2019,18 @@
if (StringUtil.isBlank(tjOrder.getFirmId())) {
tjOrder.setFirmId("0");
}
-//
-// tjReservation.setIsExpire(1);
-// tjReservationService.updateById(tjReservation);
-
- //鐢熸垚浣撴鍙�
-// String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
-// tjNumber = tjNumber.replaceAll(".{6}$", userId.toString().substring(userId.toString().length() - 6));
//鑾峰彇鎷兼帴鍓嶇紑
- String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
-// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
-// String tjNumber = idUtils.getTjNumber();
+ String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz");
+ String makeLisTmhPrefix = "";
+ if(sfkqtjhqz.equalsIgnoreCase("Y")){
+ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ }
+
String tjNumber = idUtils.getNewTjNumberRedisLockAndMysql();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
-
-// if (redisCache.hasKey(TJH)) {
-// while (true){
-// List<String> tjh = redisCache.getCacheList(TJH);
-// if(tjh.contains(tjNumber)){
-// tjNumber =(sysUser.getUserName() + IdUtils.getTjNumber());
-// if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
-// }else {
-// tjh.add(tjNumber);
-// }
-// }
-// }else {
-// List<String> stringList = tjOrderService.
-// list(new LambdaQueryWrapper<TjOrder>().select(TjOrder::getTjNumber)).stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
-// stringList.add(tjNumber);
-// redisCache.setCacheList(TJH,stringList);
-// }
tjOrder.setTjNumber(tjNumber);
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -3421,6 +3383,9 @@
}
tjCustomer.setCardId("0");
+ Long cusNumber = tjCustomer.getCusNumber();
+ cusNumber -= 1;
+ tjCustomer.setCusNumber(cusNumber);
tjCustomerService.updateById(tjCustomer);
tjOrderService.removeById(order.getOrderId());
return AjaxResult.success("鎾ら攢鎴愬姛");
@@ -4102,8 +4067,11 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+ Map<String, Object> map = new HashMap<>();
List<TbTransition> list = transitionService.newgetTransitionList(cusId);
- return AjaxResult.success(list);
+ map.put("list", list);
+ map.put("tjCategory", transitionService.getTjCategoryByTbTransition(cusId));
+ return AjaxResult.success(map);
}
@PostMapping(value = "updateTransitionnewPrice")
--
Gitblit v1.8.0