ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 75ebbe2c28a43c70d9332cab0becfc205fd80e7e 2 parents f37d25c8 94f36fe0

Merge branch 'hotfix_非入驻卖家出售列表提示问题' into test6.8.7

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
... ... @@ -336,8 +336,9 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
//卖家
assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId());
OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
if(SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())) {
Integer soga = sellerOrderGoods.getAttributes();
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
if(!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())) {
String tips = buildOverPriceTips(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice());
if (StringUtils.isNotBlank(tips)) {
statusDetail.setDetailDesc(tips);
... ... @@ -345,7 +346,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
}
orderDetailInfo.setStatusDetail(statusDetail);
GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods);
Integer soga = sellerOrderGoods.getAttributes();
SkupType skupType = SkupType.getSkupType(soga);
if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){
PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId());
... ...
... ... @@ -286,6 +286,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
goodsInfo.setStorageNum(storageNum);
goodsInfo.setSkupList(sellerOrderGoods.getSkupList());
Integer soga = sellerOrderGoods.getAttributes();
boolean isAdvance = OrderAssist.skupIsAdvance(soga);
SkupType skupType = SkupType.getSkupType(soga);
if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){
PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId());
... ... @@ -298,7 +299,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
orderListInfo.setGoodsInfo(goodsInfo);
orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime());
orderListInfo.setCreateTime(DateUtil.formatDate(sellerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
if (SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())){
if (!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())){
orderListInfo.setTips(overPriceTipsMap.get(OrderAssist.overFlowPriceKey(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice())));
}
orderListInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga));
... ...