From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index e4bd230..85f9b40 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -160,7 +160,7 @@
@Override
- public void saveOrderOne(OrderDTO OrderDTO) {
+ public Long saveOrderOne(OrderDTO OrderDTO) {
Order order=new Order();
if (OrderDTO.getOrderFrom().getCode()==1){
order.setOrderFrom(OrderFromEnum.COMMODITY_ORDER);
@@ -234,7 +234,7 @@
}
-
+ return order.getId();
}
/**
@@ -573,6 +573,7 @@
@Override
public MemberTiOrderVO updMemberOrder(MemberOrderDTO memberOrderDTO) {
+
Order order = baseMapper.selectById(memberOrderDTO.getId());
if(memberOrderDTO.getOrderRemark()!=null){
order.setOrderRemark(memberOrderDTO.getOrderRemark());
--
Gitblit v1.7.1