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 @@ -336,8 +336,9 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
336 //卖家 336 //卖家
337 assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId()); 337 assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId());
338 OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus); 338 OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
339 -  
340 - if(SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())) { 339 + Integer soga = sellerOrderGoods.getAttributes();
  340 + boolean isAdvance = OrderAssist.skupIsAdvance(soga);
  341 + if(!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())) {
341 String tips = buildOverPriceTips(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice()); 342 String tips = buildOverPriceTips(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice());
342 if (StringUtils.isNotBlank(tips)) { 343 if (StringUtils.isNotBlank(tips)) {
343 statusDetail.setDetailDesc(tips); 344 statusDetail.setDetailDesc(tips);
@@ -345,7 +346,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -345,7 +346,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
345 } 346 }
346 orderDetailInfo.setStatusDetail(statusDetail); 347 orderDetailInfo.setStatusDetail(statusDetail);
347 GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods); 348 GoodsInfo goodsInfo = getGoodsInfo(sellerOrderGoods);
348 - Integer soga = sellerOrderGoods.getAttributes(); 349 +
349 SkupType skupType = SkupType.getSkupType(soga); 350 SkupType skupType = SkupType.getSkupType(soga);
350 if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){ 351 if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){
351 PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId()); 352 PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId());
@@ -286,6 +286,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -286,6 +286,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
286 goodsInfo.setStorageNum(storageNum); 286 goodsInfo.setStorageNum(storageNum);
287 goodsInfo.setSkupList(sellerOrderGoods.getSkupList()); 287 goodsInfo.setSkupList(sellerOrderGoods.getSkupList());
288 Integer soga = sellerOrderGoods.getAttributes(); 288 Integer soga = sellerOrderGoods.getAttributes();
  289 + boolean isAdvance = OrderAssist.skupIsAdvance(soga);
289 SkupType skupType = SkupType.getSkupType(soga); 290 SkupType skupType = SkupType.getSkupType(soga);
290 if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){ 291 if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){
291 PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId()); 292 PrdPrice prdPrice = getPrdPrice(sellerOrderGoods.getStorageId());
@@ -298,7 +299,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -298,7 +299,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
298 orderListInfo.setGoodsInfo(goodsInfo); 299 orderListInfo.setGoodsInfo(goodsInfo);
299 orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime()); 300 orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime());
300 orderListInfo.setCreateTime(DateUtil.formatDate(sellerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)); 301 orderListInfo.setCreateTime(DateUtil.formatDate(sellerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
301 - if (SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())){ 302 + if (!isAdvance && SHOW_OVER_FLOW_PRICE_STATUS.contains(skupStatus.getCode())){
302 orderListInfo.setTips(overPriceTipsMap.get(OrderAssist.overFlowPriceKey(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice()))); 303 orderListInfo.setTips(overPriceTipsMap.get(OrderAssist.overFlowPriceKey(sellerOrderGoods.getStorageId(), sellerOrderGoods.getGoodsPrice())));
303 } 304 }
304 orderListInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga)); 305 orderListInfo.setIsAdvance(OrderAssist.getSkupIsAdvance(soga));