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);