ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit a341f912380d16c44b72064d43d3079f35033f50 1 parent 167ac504

fix bug

Inline Side-by-side
Showing 1 changed file with 5 additions and 9 deletions
@@ -3,7 +3,10 @@ package com.yohoufo.order.service.impl; @@ -3,7 +3,10 @@ package com.yohoufo.order.service.impl;
3 import com.google.common.collect.Maps; 3 import com.google.common.collect.Maps;
4 import com.yoho.error.ServiceError; 4 import com.yoho.error.ServiceError;
5 import com.yoho.error.exception.ServiceException; 5 import com.yoho.error.exception.ServiceException;
6 -import com.yohobuy.ufo.model.order.bo.*; 6 +import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
  7 +import com.yohobuy.ufo.model.order.bo.GoodsInfo;
  8 +import com.yohobuy.ufo.model.order.bo.OrderInfo;
  9 +import com.yohobuy.ufo.model.order.bo.TimeoutBo;
7 import com.yohobuy.ufo.model.order.common.*; 10 import com.yohobuy.ufo.model.order.common.*;
8 import com.yohobuy.ufo.model.order.constants.SkupType; 11 import com.yohobuy.ufo.model.order.constants.SkupType;
9 import com.yohobuy.ufo.model.order.resp.OrderListInfo; 12 import com.yohobuy.ufo.model.order.resp.OrderListInfo;
@@ -316,14 +319,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -316,14 +319,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
316 goodsInfo.setStorageNum(storageNum); 319 goodsInfo.setStorageNum(storageNum);
317 goodsInfo.setSkupList(sellerOrderGoods.getSkupList()); 320 goodsInfo.setSkupList(sellerOrderGoods.getSkupList());
318 321
319 - if(SkupStatus.CAN_SELL.getCode() == skupStatus.getCode()){  
320 - PrdPrice prdPrice = sellerOrderViewService.getPrdPrice(sellerOrderGoods.getStorageId());  
321 - BigDecimal leastPrice;  
322 - if (Objects.nonNull(leastPrice=prdPrice.getLeastPrice(skupType)) && leastPrice.compareTo(BigDecimal.ZERO)>0){  
323 - goodsInfo.setLeastPrice(leastPrice);  
324 - goodsInfo.setLeastPriceOfSkuTips(sellerOrderViewService.buildLeastPriceTips(leastPrice));  
325 - }  
326 - } 322 +
327 orderListInfo.setGoodsInfo(goodsInfo); 323 orderListInfo.setGoodsInfo(goodsInfo);
328 orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime()); 324 orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime());
329 orderListInfo.setCreateTime(DateUtil.formatDate(sellerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)); 325 orderListInfo.setCreateTime(DateUtil.formatDate(sellerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));