...
|
...
|
@@ -307,10 +307,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;
|
...
|
...
|
@@ -336,7 +339,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)
|
...
|
...
|
|