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

@@ -312,10 +312,13 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
 
         Integer status = pao.getStatus();
         AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status);
+
+        ExpressInfoDetail lastExpressInfoDetail =  expressInfoService.getLastExpressInfoDetail(pao);
         //
         OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
                 .builder().status(status)
                 .statuStr(aos.statusStr(oa))
+                .expressShow(Objects.nonNull(lastExpressInfoDetail) ? true : false)
                 .detailDesc(aos.detailDesc(oa)).build();
         //
         String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS;
@@ -341,7 +344,7 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
                 .uid(uid).orderCode(orderCode)
                 .amount(BigDecimalHelper.formatNumber(pao.getAmount(), BigDecimalHelper.FORMAT_TWOBITAFTERPOINT))
                 .statusDetail(statusDetail)
-                .lastExpressInfoDetail(expressInfoService.getLastExpressInfoDetail(pao))
+                .lastExpressInfoDetail(lastExpressInfoDetail)
                 .createTime(DateUtil.formatDate(pao.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS))
                 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog))
                 .appraiseAddress(appraiseAddressInfo)

@@ -543,7 +543,7 @@ public class AppraiseService {
 
         if(!APPRAISE_FAIL_STATUS_CODE.contains(appraiseOrder.getStatus())
                 && !CANNOT_APPRAISE_STATUS_CODE.contains(appraiseOrder.getStatus())
-                && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getOrderCode())){
+                && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus())){
 
             LOGGER.warn("deliveryForAppraise status {}, orderCode {}", appraiseOrder.getStatus(), orderCode);
             throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);