ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit b7c50126911949f388ee4ecf1eeef434f723ec41 2 parents 54455a38 13d72903

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
@@ -312,10 +312,13 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements @@ -312,10 +312,13 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
312 312
313 Integer status = pao.getStatus(); 313 Integer status = pao.getStatus();
314 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status); 314 AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status);
  315 +
  316 + ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);
315 // 317 //
316 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail 318 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
317 .builder().status(status) 319 .builder().status(status)
318 .statuStr(aos.statusStr(oa)) 320 .statuStr(aos.statusStr(oa))
  321 + .expressShow(Objects.nonNull(lastExpressInfoDetail) ? true : false)
319 .detailDesc(aos.detailDesc(oa)).build(); 322 .detailDesc(aos.detailDesc(oa)).build();
320 // 323 //
321 String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS; 324 String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS;
@@ -341,7 +344,7 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements @@ -341,7 +344,7 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
341 .uid(uid).orderCode(orderCode) 344 .uid(uid).orderCode(orderCode)
342 .amount(BigDecimalHelper.formatNumber(pao.getAmount(), BigDecimalHelper.FORMAT_TWOBITAFTERPOINT)) 345 .amount(BigDecimalHelper.formatNumber(pao.getAmount(), BigDecimalHelper.FORMAT_TWOBITAFTERPOINT))
343 .statusDetail(statusDetail) 346 .statusDetail(statusDetail)
344 - .lastExpressInfoDetail(expressInfoService.getLastExpressInfoDetail(pao)) 347 + .lastExpressInfoDetail(lastExpressInfoDetail)
345 .createTime(DateUtil.formatDate(pao.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)) 348 .createTime(DateUtil.formatDate(pao.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS))
346 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog)) 349 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog))
347 .appraiseAddress(appraiseAddressInfo) 350 .appraiseAddress(appraiseAddressInfo)
@@ -543,7 +543,7 @@ public class AppraiseService { @@ -543,7 +543,7 @@ public class AppraiseService {
543 543
544 if(!APPRAISE_FAIL_STATUS_CODE.contains(appraiseOrder.getStatus()) 544 if(!APPRAISE_FAIL_STATUS_CODE.contains(appraiseOrder.getStatus())
545 && !CANNOT_APPRAISE_STATUS_CODE.contains(appraiseOrder.getStatus()) 545 && !CANNOT_APPRAISE_STATUS_CODE.contains(appraiseOrder.getStatus())
546 - && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getOrderCode())){ 546 + && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus())){
547 547
548 LOGGER.warn("deliveryForAppraise status {}, orderCode {}", appraiseOrder.getStatus(), orderCode); 548 LOGGER.warn("deliveryForAppraise status {}, orderCode {}", appraiseOrder.getStatus(), orderCode);
549 throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE); 549 throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);