From 4efde34fdc23c22456742a08d3b18b8f5697ba3b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 27 Aug 2025 15:01:15 +0800
Subject: [PATCH] 售后订单-提示优化
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
index 10aa7b0..c599d6c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
@@ -2,6 +2,9 @@
import com.alibaba.fastjson2.JSON;
import com.oying.exception.BadRequestException;
+import com.oying.modules.message.common.MesTypeEnum;
+import com.oying.modules.message.common.MsgStatusEnum;
+import com.oying.modules.message.service.MesMsgRecordService;
import com.oying.modules.sh.domain.OrderOperationLog;
import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.modules.sh.mapper.OrderMapper;
@@ -35,6 +38,7 @@
private final OrderOperationLogMapper orderOperationLogMapper;
private final OrderMapper orderMapper;
+ private final MesMsgRecordService mesMsgRecordService;
@Override
public PageResult<OrderOperationLog> queryAll(OrderOperationLogQueryCriteria criteria, Page<Object> page) {
@@ -47,8 +51,8 @@
}
@Override
- public List<OrderOperationLog> getByOrderNum(String orderNum) {
- return orderOperationLogMapper.getByOrderNum(orderNum);
+ public List<OrderOperationLog> getByOrderNum(String orderNum, String type) {
+ return orderOperationLogMapper.getByOrderNum(orderNum, type);
}
@Override
@@ -57,17 +61,11 @@
String userType = ConstantsKey.BUYER;
String username = null;
Timestamp time = new Timestamp(System.currentTimeMillis());
+ MsgStatusEnum msgStatusEnum = null;
switch (statusEnum) {
- case NINE:
- if (response.getOrder().getOrderStatus().equals(OrderStatusEnum.NINE.getKey())) {
- throw new BadRequestException("订单已取消");
- }
- if (response.getOrder().getOrderStatus() > OrderStatusEnum.TWO.getKey()) {
- throw new BadRequestException(OrderStatusEnum.getValue(response.getOrder().getOrderStatus()));
- }
case ZERO:
case ONE:
- case EIGHT:
+ case TEN:
userType = ConstantsKey.BUYER;
break;
case TWO:
@@ -77,6 +75,7 @@
log1.setUsername(username);
log1.setUserType(userType);
log1.setOperation(OrderStatusEnum.ONE.getKey());
+ log1.setOperationType(OrderStatusEnum.ONE.getCode());
log1.setOperationDescribe(OrderStatusEnum.ONE.getValue());
log1.setRemark(username + "：" + time + ">" + OrderStatusEnum.ONE.getValue() + "：" + response.getOrder().getOrderNum());
Map<String, Object> map1 = new LinkedHashMap<>();
@@ -89,13 +88,26 @@
orderOperationLogMapper.insert(log1);
response.getOrder().setOrderStatus(OrderStatusEnum.TWO.getKey());
response.getOrder().setOrderStatusDescribe(OrderStatusEnum.TWO.getValue());
- case FOUR:
- userType = ConstantsKey.MERCHANT;
+ msgStatusEnum = MsgStatusEnum.MERCHANT_ACCEPTED;
+ userType = ConstantsKey.BUYER;
break;
case THREE:
+ msgStatusEnum = MsgStatusEnum.MERCHANT_PREPARED;
+ userType = ConstantsKey.BUYER;
+ break;
+ case FOUR:
orderMapper.updateRider(response.getOrder().getOrderNum(), SecurityUtils.getCurrentUserId(), SecurityUtils.getCurrentUsername(), cardName);
+ msgStatusEnum = MsgStatusEnum.RIDER_PENDING_ACCEPTANCE;
+ userType = ConstantsKey.RIDER;
+ break;
case FIVE:
+ msgStatusEnum = MsgStatusEnum.RIDER_ARRIVED;
+ userType = ConstantsKey.RIDER;
+ break;
case SIX:
+ msgStatusEnum = MsgStatusEnum.RIDER_PICKED_UP;
+ userType = ConstantsKey.RIDER;
+ break;
case SEVEN:
userType = ConstantsKey.RIDER;
username = SecurityUtils.getCurrentUsername();
@@ -104,6 +116,7 @@
log2.setUsername(username);
log2.setUserType(userType);
log2.setOperation(statusEnum.getKey());
+ log2.setOperationType(statusEnum.getCode());
log2.setOperationDescribe(statusEnum.getValue());
log2.setRemark(username + "：" + time + ">" + statusEnum.getValue() + "：" + response.getOrder().getOrderNum());
Map<String, Object> map2 = new LinkedHashMap<>();
@@ -113,9 +126,44 @@
log2.setOperationTime(time);
orderOperationLogMapper.insert(log2);
orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
+ msgStatusEnum = MsgStatusEnum.BUYER_ORDER_DELIVERED;
statusEnum = OrderStatusEnum.EIGHT;
break;
+ case EIGHT:
+ msgStatusEnum = MsgStatusEnum.BUYER_ORDER_COMPLETED;
+ userType = ConstantsKey.BUYER;
+ break;
+ case NINE:
+ if (response.getOrder().getOrderStatus().equals(OrderStatusEnum.NINE.getKey())) {
+ throw new BadRequestException("订单已取消");
+ }
+ if (response.getOrder().getOrderStatus() > OrderStatusEnum.TWO.getKey()) {
+ throw new BadRequestException(OrderStatusEnum.getValue(response.getOrder().getOrderStatus()));
+ }
+ msgStatusEnum = MsgStatusEnum.RIDER_ORDER_CANCELLED;
+ userType = ConstantsKey.BUYER;
+ break;
+ case ELEVEN:
+ userType = ConstantsKey.MERCHANT;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), OrderStatusEnum.EIGHT.getKey(), OrderStatusEnum.EIGHT.getValue());
+ break;
+ case TWELVE:
+ userType = ConstantsKey.BUYER;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
+ break;
+ case THIRTEEN:
+ userType = ConstantsKey.MERCHANT;
+ break;
+ case FOURTEEN:
+ userType = ConstantsKey.MERCHANT;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
+ break;
+ case FIFTEEN:
+ userType = ConstantsKey.BUYER;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), OrderStatusEnum.EIGHT.getKey(), OrderStatusEnum.EIGHT.getValue());
+ break;
default:
+ throw new BadRequestException("状态错误");
}
if (username == null) {
username = SecurityUtils.getCurrentUsername();
@@ -125,6 +173,7 @@
resources.setUsername(username);
resources.setUserType(userType);
resources.setOperation(statusEnum.getKey());
+ resources.setOperationType(statusEnum.getCode());
resources.setOperationDescribe(statusEnum.getValue());
resources.setRemark(username + "：" + time + ">" + statusEnum.getValue() + "：" + response.getOrder().getOrderNum());
Map<String, Object> map = new LinkedHashMap<>();
@@ -133,6 +182,9 @@
resources.setSnapshotData(JSON.toJSONString(map));
resources.setOperationTime(time);
orderOperationLogMapper.insert(resources);
+ if (msgStatusEnum != null){
+ mesMsgRecordService.insertOrderMsg(response.getOrder(), msgStatusEnum, MesTypeEnum.ORDER);
+ }
orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
}
--
Gitblit v1.9.3