From a825d8faec61b2d3582cdb79d256fb1b412a80da Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 27 三月 2024 08:34:01 +0800
Subject: [PATCH] zjh 2024/03/27-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 aaedd52..aad0ec9 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
@@ -1184,6 +1184,8 @@
}
}
}
+
+
if (null != tbTransitionList && tbTransitionList.size() > 0) {
if (redisCache.hasKey(cardId + cusId)) {
redisCache.deleteObject(cardId + cusId);
@@ -1427,19 +1429,20 @@
if (!handleOption.isCanship()) {
return AjaxResult.error("璁㈠崟涓嶈兘鏍搁攢");
}
+ Date date = new Date();
order.setOrderStatus(OrderUtil.STATUS_SHIP.longValue());
- order.setShipTime(new Date());
- order.setConfirmTime(new Date());
+ order.setShipTime(date);
+ order.setConfirmTime(date);
MallCheckLog checkLog = new MallCheckLog();
- String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(new Date());
+ String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date);
checkLog.setCheckBy(String.valueOf(SecurityUtils.getUserId()));
checkLog.setUserId(order.getUserId());
checkLog.setConsignee(order.getConsignee());
checkLog.setIdCard(order.getIdCard());
checkLog.setOrderId(String.valueOf(order.getId()));
checkLog.setOrderSn(order.getOrderSn());
- checkLog.setCheckTime(new Date());
+ checkLog.setCheckTime(date);
checkLog.setShipSn("HX" + s1);
mallCheckLogService.save(checkLog);
mallOrderService.updateById(order);
@@ -1450,11 +1453,11 @@
private List<Map<String, Object>> getMaps(String cusId, String cardId) {
List<TbTransition> transitionList = null;
- if (redisCache.hasKey(cardId + cusId)) {
- transitionList = redisCache.getCacheList(cardId + cusId);
- } else {
+// if (redisCache.hasKey(cardId + cusId)) {
+// transitionList = redisCache.getCacheList(cardId + cusId);
+// } else {
transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
- }
+// }
if (null == transitionList) return null;
Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
List<Map<String, Object>> list = new ArrayList<>();
--
Gitblit v1.8.0