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 | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 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 d4b2546..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
@@ -1,9 +1,9 @@
package com.oying.modules.sh.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.oying.modules.sh.domain.Order;
-import com.oying.modules.sh.domain.OrderAddressSnapshot;
import com.oying.modules.sh.domain.OrderOperationLog;
+import com.oying.modules.sh.domain.vo.OrderResponse;
+import com.oying.modules.sh.mapper.OrderMapper;
import com.oying.utils.*;
import com.oying.utils.enums.OrderStatusEnum;
import lombok.RequiredArgsConstructor;
@@ -33,6 +33,7 @@
public class OrderOperationLogServiceImpl extends ServiceImpl<OrderOperationLogMapper, OrderOperationLog> implements OrderOperationLogService {
private final OrderOperationLogMapper orderOperationLogMapper;
+ private final OrderMapper orderMapper;
@Override
public PageResult<OrderOperationLog> queryAll(OrderOperationLogQueryCriteria criteria, Page<Object> page) {
@@ -51,27 +52,48 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void create(OrderOperationLog resources) {
- orderOperationLogMapper.insert(resources);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void create(Order order, OrderAddressSnapshot addressSnapshot) {
- Map<String, Object> map = new LinkedHashMap<>();
- map.put("order", order);
- map.put("address", addressSnapshot);
- String username = SecurityUtils.getCurrentUsername();
+ public void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName) {
+ String userType = ConstantsKey.BUYER;
+ String username = null;
+ switch (statusEnum) {
+ case ZERO:
+ case ONE:
+ case EIGHT:
+ case NINE:
+ 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:
+ userType = ConstantsKey.RIDER;
+ break;
+ default:
+ }
+ if (username == null) {
+ username = SecurityUtils.getCurrentUsername();
+ }
Timestamp time = new Timestamp(System.currentTimeMillis());
OrderOperationLog resources = new OrderOperationLog();
- resources.setOrderNum(order.getOrderNum());
+ resources.setOrderNum(response.getOrder().getOrderNum());
resources.setUsername(username);
- resources.setUserType(ConstantsKey.BUYER);
- resources.setOperation(OrderStatusEnum.ZERO.getKey());
- resources.setOperationDescribe(OrderStatusEnum.ZERO.getValue());
- resources.setRemark(username + "：" + time + ">" + OrderStatusEnum.ZERO.getValue() + "：" + order.getOrderNum());
+ resources.setUserType(userType);
+ resources.setOperation(statusEnum.getKey());
+ resources.setOperationDescribe(statusEnum.getValue());
+ resources.setRemark(username + "：" + time + ">" + statusEnum.getValue() + "：" + response.getOrder().getOrderNum());
+ 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());
}
@Override
--
Gitblit v1.9.3