ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 5978f5146d123e81511455239612374ac02745ec 1 parent 1ad21aab

订单详情展示物流信息

Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
@@ -307,10 +307,13 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements @@ -307,10 +307,13 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
307 307
308 Integer status = pao.getStatus(); 308 Integer status = pao.getStatus();
309 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status); 309 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status);
  310 +
  311 + ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);
310 // 312 //
311 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail 313 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
312 .builder().status(status) 314 .builder().status(status)
313 .statuStr(aos.statusStr(oa)) 315 .statuStr(aos.statusStr(oa))
  316 + .expressShow(Objects.nonNull(lastExpressInfoDetail) ? true : false)
314 .detailDesc(aos.detailDesc(oa)).build(); 317 .detailDesc(aos.detailDesc(oa)).build();
315 // 318 //
316 String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS; 319 String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS;
@@ -336,7 +339,7 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements @@ -336,7 +339,7 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
336 .uid(uid).orderCode(orderCode) 339 .uid(uid).orderCode(orderCode)
337 .amount(BigDecimalHelper.formatNumber(pao.getAmount(), BigDecimalHelper.FORMAT_TWOBITAFTERPOINT)) 340 .amount(BigDecimalHelper.formatNumber(pao.getAmount(), BigDecimalHelper.FORMAT_TWOBITAFTERPOINT))
338 .statusDetail(statusDetail) 341 .statusDetail(statusDetail)
339 - .lastExpressInfoDetail(expressInfoService.getLastExpressInfoDetail(pao)) 342 + .lastExpressInfoDetail(lastExpressInfoDetail)
340 .createTime(DateUtil.formatDate(pao.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)) 343 .createTime(DateUtil.formatDate(pao.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS))
341 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog)) 344 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog))
342 .appraiseAddress(appraiseAddressInfo) 345 .appraiseAddress(appraiseAddressInfo)