From 8f527398ba4a9b7e4b66d64bde808facbffebd8b Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 28 Nov 2024 16:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/order/domain/OrderInfoDto.java   | 5 ++++-
 .../bonus/material/order/service/impl/OrderServiceImpl.java  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
index ad02535..87a62fd 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
@@ -38,9 +38,12 @@ public class OrderInfoDto {
     @ApiModelProperty(value = "订单金额")
     private BigDecimal cost;
 
-    @ApiModelProperty(value = " 订单状态")
+    @ApiModelProperty(value = "出租方订单状态")
     private String orderStatus;
 
+    @ApiModelProperty(value = "承租方订单状态")
+    private String czOrderStatus;
+
     @ApiModelProperty(value = " 装备名称")
     private String deviceName;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
index 0c58c5e..b42bfd4 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
@@ -72,6 +72,10 @@ public class OrderServiceImpl implements OrderService {
                 if ("2".equals(orderDetailDto.getOrderStatus())){
                     dto.setOrderStatus("2");
                 }
+                // 待收货
+                if ("3".equals(orderDetailDto.getOrderStatus())){
+                    dto.setCzOrderStatus("3");
+                }
                 list.add(orderDetailDto);
             }
             dto.setDetailsList(list);