...
|
...
|
@@ -194,6 +194,15 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
orderCacheService.cacheSellerOrderDetailInfo(tsog, orderDetailInfo);
|
|
|
}
|
|
|
|
|
|
Integer skupStatusCode = sellerOrderGoods.getStatus();
|
|
|
SkupStatus skupStatus = SkupStatus.getSkupStatus(skupStatusCode);
|
|
|
Integer soga = sellerOrderGoods.getAttributes();
|
|
|
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
|
|
|
if(fromCache&&!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())){
|
|
|
SkupType skupType = SkupType.getSkupType(soga);
|
|
|
resetTips(orderDetailInfo,isAdvance,skupType,skupStatus,sellerOrderGoods,orderDetailInfo.getStatusDetail());
|
|
|
}
|
|
|
|
|
|
}else {
|
|
|
orderDetailInfo = orderCacheService.getOrderDetailInfo(uid, orderCode, TabType.SELL);
|
|
|
if (Objects.isNull(orderDetailInfo)) {
|
...
|
...
|
@@ -384,6 +393,22 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
|
|
|
Integer soga = sellerOrderGoods.getAttributes();
|
|
|
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
|
|
|
SkupType skupType = SkupType.getSkupType(soga);
|
|
|
|
|
|
//tips :最低价格时刻在变,不能缓存
|
|
|
resetTips(orderDetailInfo,isAdvance,skupType,skupStatus,sellerOrderGoods,statusDetail);
|
|
|
|
|
|
// 支付状态
|
|
|
setPayment(orderDetailInfo, order.getPayment());
|
|
|
//
|
|
|
orderDetailInfo.setIsPaid(getIsPaid(skupStatus));
|
|
|
orderDetailInfo.setSecendLevelCreateTime(order.getCreateTime());
|
|
|
orderDetailInfo.setCreateTime(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
|
|
|
orderDetailInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga));
|
|
|
return orderDetailInfo;
|
|
|
}
|
|
|
|
|
|
private void resetTips(OrderDetailInfo orderDetailInfo,boolean isAdvance,SkupType skupType,SkupStatus skupStatus,SellerOrderGoods sellerOrderGoods,OrderDetailInfo.StatusDetail statusDetail){
|
|
|
boolean existOverFlowPrice = false;
|
|
|
if(!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())) {
|
|
|
String tips = buildOverPriceTips(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice());
|
...
|
...
|
@@ -395,7 +420,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
orderDetailInfo.setStatusDetail(statusDetail);
|
|
|
GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods);
|
|
|
|
|
|
SkupType skupType = SkupType.getSkupType(soga);
|
|
|
if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){
|
|
|
PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId());
|
|
|
BigDecimal leastPrice;
|
...
|
...
|
@@ -415,15 +439,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
statusDetail.setDetailDesc(buildOtherLowerPriceTips(leastPrice));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 支付状态
|
|
|
setPayment(orderDetailInfo, order.getPayment());
|
|
|
//
|
|
|
orderDetailInfo.setIsPaid(getIsPaid(skupStatus));
|
|
|
orderDetailInfo.setSecendLevelCreateTime(order.getCreateTime());
|
|
|
orderDetailInfo.setCreateTime(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
|
|
|
orderDetailInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga));
|
|
|
return orderDetailInfo;
|
|
|
}
|
|
|
|
|
|
|
...
|
...
|
|