From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 3a1afcf..48972f7 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
@@ -52,8 +52,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void create(OrderResponse response, OrderStatusEnum statusEnum) {
+ public void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName) {
String userType = ConstantsKey.BUYER;
+ String username = null;
switch (statusEnum) {
case ZERO:
case ONE:
@@ -62,10 +63,12 @@
userType = ConstantsKey.BUYER;
break;
case TWO:
+ username = response.getOrder().getUsername();
case FOUR:
userType = ConstantsKey.MERCHANT;
break;
case THREE:
+ orderMapper.updateRider(response.getOrder().getOrderNum(), SecurityUtils.getCurrentUserId(), SecurityUtils.getCurrentUsername(), cardName);
case FIVE:
case SIX:
case SEVEN:
@@ -73,7 +76,9 @@
break;
default:
}
- String username = SecurityUtils.getCurrentUsername();
+ if (username == null) {
+ username = SecurityUtils.getCurrentUsername();
+ }
Timestamp time = new Timestamp(System.currentTimeMillis());
OrderOperationLog resources = new OrderOperationLog();
resources.setOrderNum(response.getOrder().getOrderNum());
@@ -82,7 +87,10 @@
resources.setOperation(statusEnum.getKey());
resources.setOperationDescribe(statusEnum.getValue());
resources.setRemark(username + "：" + time + ">" + statusEnum.getValue() + "：" + response.getOrder().getOrderNum());
- resources.setSnapshotData(JSON.toJSONString(response));
+ Map<String, Object> map = new LinkedHashMap<>();
+ map.put("order", response.getOrder());
+ map.put("address", response.getAddress());
+ resources.setSnapshotData(JSON.toJSONString(map));
resources.setOperationTime(time);
orderOperationLogMapper.insert(resources);
orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());
--
Gitblit v1.9.3