etrade / zr-etrade · Commits

Commit dcf1080b6e3a74f6ffcb3e43f50191063da643e1

Authored by fengliang
1 parent c42d07c8
build: skipped

update:订单配送信息

Inline Side-by-side
Showing 2 changed files with 15 additions and 0 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDetail.java
  View file @dcf1080
... ... @@ -4,6 +4,8 @@ import com.diligrp.etrade.order.model.Order;
4 4 import com.diligrp.etrade.order.model.OrderCoupon;
5 5 import com.diligrp.etrade.order.model.OrderGoods;
6 6 import com.diligrp.etrade.order.model.OrderPayment;
  7 +import com.diligrp.etrade.order.model.OrderDelivery;
  8 +
7 9  
8 10 import java.util.List;
9 11  
... ... @@ -20,6 +22,8 @@ public class OrderDetail {
20 22 /** 订单优惠券 */
21 23 private List<OrderCoupon> orderCoupons;
22 24  
  25 + private OrderDelivery orderDelivery;
  26 +
23 27 public Order getOrder() {
24 28 return order;
25 29 }
... ... @@ -51,4 +55,12 @@ public class OrderDetail {
51 55 public void setOrderCoupons(List<OrderCoupon> orderCoupons) {
52 56 this.orderCoupons = orderCoupons;
53 57 }
  58 +
  59 + public OrderDelivery getOrderDelivery() {
  60 + return orderDelivery;
  61 + }
  62 +
  63 + public void setOrderDelivery(OrderDelivery orderDelivery) {
  64 + this.orderDelivery = orderDelivery;
  65 + }
54 66 }
... ...
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
  View file @dcf1080
... ... @@ -60,6 +60,9 @@ public class OrderQueryServiceImpl implements OrderQueryService {
60 60 //获取交易单
61 61 orderDetail.setOrderPaymentDto(orderPaymentService.getOrderPaymentById(orderDetail.getOrder().getId(),orderGetDto.getMarketId(),OrderPaymentState.FINISH_PAY.getCodeInteger()));
62 62 }
  63 + if(OrderAchieveType.SELLER_DELIVERY.getCodeInteger().equals(orderDetail.getOrder().getAchieveType())){
  64 + orderDetail.setOrderDelivery(orderDeliveryService.selectOrderDeliveryByOrderCode(orderDetail.getOrder().getCode()));
  65 + }
63 66 return orderDetail;
64 67 }
65 68  
... ...