Authored by tanling

子订单质检不通过,详情页展示物流

@@ -10,10 +10,7 @@ import com.yohobuy.ufo.model.order.constants.DepotType; @@ -10,10 +10,7 @@ import com.yohobuy.ufo.model.order.constants.DepotType;
10 import com.yohobuy.ufo.model.order.constants.SkupType; 10 import com.yohobuy.ufo.model.order.constants.SkupType;
11 import com.yohobuy.ufo.model.order.req.SellerDepositOrderDetailReq; 11 import com.yohobuy.ufo.model.order.req.SellerDepositOrderDetailReq;
12 import com.yohobuy.ufo.model.order.req.SellerDepositOrderPrdListReq; 12 import com.yohobuy.ufo.model.order.req.SellerDepositOrderPrdListReq;
13 -import com.yohobuy.ufo.model.order.resp.AppraiseAddressInfo;  
14 -import com.yohobuy.ufo.model.order.resp.OrderDetailInfo;  
15 -import com.yohobuy.ufo.model.order.resp.PageResp;  
16 -import com.yohobuy.ufo.model.order.resp.SellerDepositOrderDetailResp; 13 +import com.yohobuy.ufo.model.order.resp.*;
17 import com.yohobuy.ufo.model.order.vo.AddressInfo; 14 import com.yohobuy.ufo.model.order.vo.AddressInfo;
18 import com.yohobuy.ufo.model.order.vo.ProductVo; 15 import com.yohobuy.ufo.model.order.vo.ProductVo;
19 import com.yohoufo.common.utils.BigDecimalHelper; 16 import com.yohoufo.common.utils.BigDecimalHelper;
@@ -33,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
33 import org.springframework.stereotype.Service; 30 import org.springframework.stereotype.Service;
34 31
35 import java.util.List; 32 import java.util.List;
  33 +import java.util.Objects;
36 34
37 @Service 35 @Service
38 public class SellerDepositOrderDetailService extends AbsOrderViewService { 36 public class SellerDepositOrderDetailService extends AbsOrderViewService {
@@ -96,14 +94,15 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService { @@ -96,14 +94,15 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
96 // 94 //
97 TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(), 95 TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(),
98 pao.getCreateTime(), oa); 96 pao.getCreateTime(), oa);
99 - boolean expressShow = showEXpressInfoStatusList.contains(pao.getStatus()); 97 +
  98 + ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);
100 // 99 //
101 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(pao.getStatus()); 100 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(pao.getStatus());
102 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail 101 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
103 .builder() 102 .builder()
104 .statuStr(aos.statusStr(oa)) 103 .statuStr(aos.statusStr(oa))
105 .detailDesc(aos.detailDesc(oa)) 104 .detailDesc(aos.detailDesc(oa))
106 - .expressShow(expressShow) 105 + .expressShow(Objects.isNull(lastExpressInfoDetail) ? false : true)
107 .build(); 106 .build();
108 // 107 //
109 AppraiseAddressInfo appraiseAddressInfo = null; 108 AppraiseAddressInfo appraiseAddressInfo = null;