Merge branch 'test6.9.10' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.10

@@ -23,6 +23,7 @@ import com.yohoufo.dal.order.AppraiseOrderMetaMapper;
 import com.yohoufo.dal.order.AppraiseOrderStorageMapper;
 import com.yohoufo.dal.order.model.AppraiseOrder;
 import com.yohoufo.order.model.response.AppraiseAddressResp;
+import com.yohoufo.order.service.IExpressInfoService;
 import com.yohoufo.order.service.impl.AbsOrderViewService;
 import com.yohoufo.order.service.impl.AppraiseAddressService;
 import com.yohoufo.order.utils.LoggerUtils;
@@ -59,6 +60,9 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
     @Autowired
     private SellerDepositOrderListService sellerDepositOrderListService;
 
+    @Autowired
+    private IExpressInfoService expressInfoService;
+
 
     private static final List<Integer> showEXpressInfoStatusList = Lists.newArrayList(AppraiseOrderStatus.SELLER_SEND_OUT.getCode(),
             AppraiseOrderStatus.WAITING_RECEIVE.getCode(),
@@ -132,6 +136,7 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
                 .appraiseAddress(appraiseAddressInfo)
                 .addressUpgradable(addressUpgradable)
                 .buttons(aos.detailButtons(oa))
+                .lastExpressInfoDetail(expressInfoService.getLastExpressInfoDetail(pao))
                 .build()
                 ;
     }