update:订单配送信息

fengliang
1 parent c42d07c8
Showing 2 changed files with 15 additions and 0 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDetail.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
@@ -4,6 +4,8 @@ import com.diligrp.etrade.order.model.Order;
 import com.diligrp.etrade.order.model.OrderCoupon;
 import com.diligrp.etrade.order.model.OrderGoods;
 import com.diligrp.etrade.order.model.OrderPayment;
+import com.diligrp.etrade.order.model.OrderDelivery;
+
 import java.util.List;
@@ -20,6 +22,8 @@ public class OrderDetail {
     /** 订单优惠券 */
     private List<OrderCoupon> orderCoupons;
+    private OrderDelivery orderDelivery;
+
     public Order getOrder() {
         return order;
     }
@@ -51,4 +55,12 @@ public class OrderDetail {
     public void setOrderCoupons(List<OrderCoupon> orderCoupons) {
         this.orderCoupons = orderCoupons;
     }
+
+    public OrderDelivery getOrderDelivery() {
+        return orderDelivery;
+    }
+
+    public void setOrderDelivery(OrderDelivery orderDelivery) {
+        this.orderDelivery = orderDelivery;
+    }
 }
@@ -60,6 +60,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             //获取交易单
             orderDetail.setOrderPaymentDto(orderPaymentService.getOrderPaymentById(orderDetail.getOrder().getId(),orderGetDto.getMarketId(),OrderPaymentState.FINISH_PAY.getCodeInteger()));
         }
+        if(OrderAchieveType.SELLER_DELIVERY.getCodeInteger().equals(orderDetail.getOrder().getAchieveType())){
+            orderDetail.setOrderDelivery(orderDeliveryService.selectOrderDeliveryByOrderCode(orderDetail.getOrder().getCode()));
+        }
         return orderDetail;
     }