From 599eec089eefdb2482c26d1183ba92fe231a68ae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 09:46:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 3826d19..fcbe4ed 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -14,9 +14,11 @@
import com.ruoyi.order.enums.OrderType;
import com.ruoyi.order.mapper.OrderGoodMapper;
import com.ruoyi.order.mapper.OrderMapper;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.service.OrderService;
-import com.ruoyi.vo.OrderDetailVO;
-import com.ruoyi.vo.OrderGoodsVO;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderGoodsVO;
import com.ruoyi.order.vo.OrderVO;
import com.ruoyi.other.api.domain.CouponInfo;
import com.ruoyi.other.api.domain.Goods;
@@ -24,8 +26,6 @@
import com.ruoyi.other.api.domain.Technician;
import com.ruoyi.other.api.feignClient.TechnicianClient;
import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.model.Order;
-import com.ruoyi.model.OrderGood;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -115,6 +115,7 @@
OrderDetailVO orderDetailVO = new OrderDetailVO();
orderDetailVO.setId(order.getId());
+ orderDetailVO.setOrderStatus(order.getOrderStatus());
orderDetailVO.setPoint(order.getPoint());
orderDetailVO.setAddressId(userAddress.getId());
orderDetailVO.setRecieveName(userAddress.getRecieveName());
--
Gitblit v1.7.1