From e995152347bd980bb48806132ae6be1ffee90a64 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 18:50:51 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
index d4a1f7f..7a18e61 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java
@@ -12,16 +12,14 @@
import com.oying.modules.sh.domain.*;
import com.oying.modules.sh.domain.request.GeneratorOrder;
import com.oying.modules.sh.domain.request.ProductOrder;
+import com.oying.modules.sh.domain.request.StatusOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.domain.vo.OrderInfo;
import com.oying.modules.sh.domain.vo.OrderResponse;
import com.oying.modules.sh.domain.vo.ProductInfo;
import com.oying.modules.sh.service.*;
import com.oying.utils.*;
-import com.oying.utils.enums.GenerateEnum;
-import com.oying.utils.enums.OrderStatusEnum;
-import com.oying.utils.enums.PayStateEnum;
-import com.oying.utils.enums.PayTypeEnum;
+import com.oying.utils.enums.*;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -132,12 +130,16 @@
order.setOrderStatusDescribe(OrderStatusEnum.ZERO.getValue());
order.setOrderRemark(submit.getRemark() != null ? submit.getRemark() : "");
order.setOrderTime(submit.getDateTime());
+ order.setSendPrice(store.getDeliveryFee());
+ order.setSendType(SendTypeEnum.LY.getKey());
order.setUserId(SecurityUtils.getCurrentUserId());
order.setUsername(SecurityUtils.getCurrentUsername());
order.setStoreId(submit.getStoreId());
order.setStoreName(store.getStoreName());
order.setStoreLogo(store.getLogoImageUrl());
- order.setSendPrice(store.getDeliveryFee());
+ order.setStoreAddress(store.getAddress());
+ order.setStoreLongitude(BigDecimal.valueOf(store.getLongitude()));
+ order.setStoreLatitude(BigDecimal.valueOf(store.getLatitude()));
order.setOrderDescribe(DESCRIBE + submit.getStoreId());
order.setOriginalPrice(amount);
order.setPaidPrice(amount);
@@ -168,6 +170,7 @@
UserAddress address = userAddressService.getById(submit.getAddressId());
OrderAddressSnapshot addressSnapshot = getOrderAddressSnapshot(orderNum, address);
+
addressSnapshotService.save(addressSnapshot);
orderMapper.insert(order);
productSnapshotService.saveBatch(snapshots);
@@ -175,7 +178,7 @@
order.setProductSnapshots(new HashSet<>(snapshots));
OrderResponse response = new OrderResponse(order, addressSnapshot, null);
- operationLogService.create(response, OrderStatusEnum.ZERO);
+ operationLogService.create(response, OrderStatusEnum.ZERO, null);
return order;
}
@@ -237,6 +240,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public void statusOrder(StatusOrder statusOrder) {
+ operationLog(getByOrderNum(statusOrder.getOrderNum()), statusOrder.getStatus(), null);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public OrderResponse getByOrderNum(String orderNum) {
return new OrderResponse(orderMapper.getByOrderNum(orderNum),
addressSnapshotService.queryByOrderNum(orderNum),
@@ -245,8 +254,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void operationLog(OrderResponse order, OrderStatusEnum stateEnum) {
- operationLogService.create(order, stateEnum);
+ public void operationLog(OrderResponse order, OrderStatusEnum stateEnum, String cardName) {
+ operationLogService.create(order, stateEnum, null);
}
@Override
@@ -280,7 +289,7 @@
swiftPassService.closeOrder(orderNum, anEnum);
break;
}
- operationLogService.create(response, OrderStatusEnum.NINE);
+ operationLogService.create(response, OrderStatusEnum.NINE, null);
orderMapper.updateCloseStatus(orderNum, PayStateEnum.CLOSED.getKey(), PayStateEnum.CLOSED.getValue());
}
--
Gitblit v1.9.3