From 227b029030818925089cbe91dc1288594a5d4aa9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 21 Aug 2025 14:28:58 +0800
Subject: [PATCH] 退款订单
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 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..a091f1b 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
@@ -47,8 +47,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
@@ -77,6 +77,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,10 +90,10 @@
orderOperationLogMapper.insert(log1);
response.getOrder().setOrderStatus(OrderStatusEnum.TWO.getKey());
response.getOrder().setOrderStatusDescribe(OrderStatusEnum.TWO.getValue());
- case FOUR:
+ case THREE:
userType = ConstantsKey.MERCHANT;
break;
- case THREE:
+ case FOUR:
orderMapper.updateRider(response.getOrder().getOrderNum(), SecurityUtils.getCurrentUserId(), SecurityUtils.getCurrentUsername(), cardName);
case FIVE:
case SIX:
@@ -104,6 +105,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<>();
@@ -115,7 +117,26 @@
orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
statusEnum = OrderStatusEnum.EIGHT;
break;
+ case TEN:
+ case TWELVE:
+ userType = ConstantsKey.BUYER;
+ 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;
+ case ELEVEN:
+ userType = ConstantsKey.MERCHANT;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), OrderStatusEnum.EIGHT.getKey(), OrderStatusEnum.EIGHT.getValue());
+ break;
+ case THIRTEEN:
+ case FOURTEEN:
+ userType = ConstantsKey.MERCHANT;
+ orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
+ break;
default:
+ throw new BadRequestException("状态错误");
}
if (username == null) {
username = SecurityUtils.getCurrentUsername();
@@ -125,6 +146,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<>();
--
Gitblit v1.9.3