Authored by LUOXC

删除卖家订单列表/详情鉴定视频

@@ -8,7 +8,6 @@ import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo; @@ -8,7 +8,6 @@ import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
8 import com.yohobuy.ufo.model.order.common.*; 8 import com.yohobuy.ufo.model.order.common.*;
9 import com.yohobuy.ufo.model.order.constants.OrderConstant; 9 import com.yohobuy.ufo.model.order.constants.OrderConstant;
10 import com.yohobuy.ufo.model.order.resp.ExpressInfoDetail; 10 import com.yohobuy.ufo.model.order.resp.ExpressInfoDetail;
11 -import com.yohobuy.ufo.model.order.resp.ExpressInfoRespBo;  
12 import com.yohobuy.ufo.model.order.vo.AddressInfo; 11 import com.yohobuy.ufo.model.order.vo.AddressInfo;
13 import com.yohoufo.common.utils.DateUtil; 12 import com.yohoufo.common.utils.DateUtil;
14 import com.yohoufo.dal.order.*; 13 import com.yohoufo.dal.order.*;
@@ -31,7 +30,6 @@ import com.yohoufo.order.service.proxy.UserProxyService; @@ -31,7 +30,6 @@ import com.yohoufo.order.service.proxy.UserProxyService;
31 import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator; 30 import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator;
32 import com.yohoufo.order.service.support.codegenerator.bean.CodeMeta; 31 import com.yohoufo.order.service.support.codegenerator.bean.CodeMeta;
33 import com.yohoufo.order.utils.LoggerUtils; 32 import com.yohoufo.order.utils.LoggerUtils;
34 -import org.apache.commons.collections.CollectionUtils;  
35 import org.apache.commons.lang3.StringUtils; 33 import org.apache.commons.lang3.StringUtils;
36 import org.slf4j.Logger; 34 import org.slf4j.Logger;
37 import org.springframework.beans.factory.annotation.Autowired; 35 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,11 +39,6 @@ import java.math.BigDecimal; @@ -41,11 +39,6 @@ import java.math.BigDecimal;
41 import java.util.Arrays; 39 import java.util.Arrays;
42 import java.util.List; 40 import java.util.List;
43 import java.util.Objects; 41 import java.util.Objects;
44 -import java.util.Optional;  
45 -import java.util.stream.Collectors;  
46 -  
47 -import static com.yohobuy.ufo.model.order.common.OrderStatus.DONE;  
48 -import static com.yohobuy.ufo.model.order.common.OrderStatus.WAITING_RECEIVE;  
49 42
50 /** 43 /**
51 * Created by chenchao on 2018/9/20. 44 * Created by chenchao on 2018/9/20.
@@ -91,9 +84,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -91,9 +84,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
91 @Autowired 84 @Autowired
92 private SellerOrderPrepareProcessor sellerOrderPrepareProcessor; 85 private SellerOrderPrepareProcessor sellerOrderPrepareProcessor;
93 86
94 - @Autowired  
95 - private QiniuLiveRecordService qiniuLiveRecordService;  
96 -  
97 private static List<SkupStatus> noNeedShowOrderCode = Arrays.asList(SkupStatus.CAN_NOT_SELL,SkupStatus.CAN_SELL, 87 private static List<SkupStatus> noNeedShowOrderCode = Arrays.asList(SkupStatus.CAN_NOT_SELL,SkupStatus.CAN_SELL,
98 SkupStatus.SELF_CANCEL_PAY, SkupStatus.TIMEOUT_CANCEL, 88 SkupStatus.SELF_CANCEL_PAY, SkupStatus.TIMEOUT_CANCEL,
99 SkupStatus.SELLER_CANCEL_SELL, SkupStatus.YOHO_CANCEL_SELL); 89 SkupStatus.SELLER_CANCEL_SELL, SkupStatus.YOHO_CANCEL_SELL);
@@ -204,11 +194,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -204,11 +194,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
204 194
205 @Override 195 @Override
206 String getAppraiseVideoUrl(BuyerOrder buyerOrder) { 196 String getAppraiseVideoUrl(BuyerOrder buyerOrder) {
207 - return Optional.ofNullable(buyerOrder)  
208 - .filter(e -> e.getStatus() == WAITING_RECEIVE.getCode() || e.getStatus() == DONE.getCode())  
209 - .map(BuyerOrder::getOrderCode)  
210 - .map(orderCode -> qiniuLiveRecordService.getAppraiseVideoUrl(orderCode))  
211 - .orElse(null); 197 + return null;
212 } 198 }
213 199
214 /** 200 /**
@@ -37,8 +37,6 @@ import java.util.Map; @@ -37,8 +37,6 @@ import java.util.Map;
37 import java.util.Objects; 37 import java.util.Objects;
38 import java.util.stream.Collectors; 38 import java.util.stream.Collectors;
39 39
40 -import static com.yohobuy.ufo.model.order.common.OrderStatus.DONE;  
41 -import static com.yohobuy.ufo.model.order.common.OrderStatus.WAITING_RECEIVE;  
42 40
43 /** 41 /**
44 * Created by chenchao on 2018/9/20. 42 * Created by chenchao on 2018/9/20.
@@ -71,8 +69,6 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -71,8 +69,6 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
71 @Autowired 69 @Autowired
72 private SellerOrderPrepareProcessor sellerOrderPrepareProcessor; 70 private SellerOrderPrepareProcessor sellerOrderPrepareProcessor;
73 71
74 - @Autowired  
75 - private QiniuLiveRecordService qiniuLiveRecordService;  
76 72
77 public List<OrderListInfo> buildOrderList(List<SellerOrderGoods> sogList, SellerType sellerType){ 73 public List<OrderListInfo> buildOrderList(List<SellerOrderGoods> sogList, SellerType sellerType){
78 sogList.stream().forEach(item -> { 74 sogList.stream().forEach(item -> {
@@ -334,14 +330,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -334,14 +330,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
334 330
335 @Override 331 @Override
336 Map<Long, String> getAppraiseVideo(List<BuyerOrder> buyerOrderList) { 332 Map<Long, String> getAppraiseVideo(List<BuyerOrder> buyerOrderList) {
337 - List<Long> orderCodes = buyerOrderList.stream()  
338 - .filter(e -> e.getStatus() == WAITING_RECEIVE.getCode() || e.getStatus() == DONE.getCode())  
339 - .map(BuyerOrder::getOrderCode)  
340 - .collect(Collectors.toList());  
341 - if (CollectionUtils.isEmpty(orderCodes)) {  
342 - return Maps.newHashMap();  
343 - }  
344 - return qiniuLiveRecordService.getAppraiseVideoUrl(orderCodes); 333 + return Maps.newHashMap();
345 } 334 }
346 335
347 @Override 336 @Override