...
|
...
|
@@ -8,7 +8,6 @@ import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo; |
|
|
import com.yohobuy.ufo.model.order.common.*;
|
|
|
import com.yohobuy.ufo.model.order.constants.OrderConstant;
|
|
|
import com.yohobuy.ufo.model.order.resp.ExpressInfoDetail;
|
|
|
import com.yohobuy.ufo.model.order.resp.ExpressInfoRespBo;
|
|
|
import com.yohobuy.ufo.model.order.vo.AddressInfo;
|
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
import com.yohoufo.dal.order.*;
|
...
|
...
|
@@ -31,7 +30,6 @@ import com.yohoufo.order.service.proxy.UserProxyService; |
|
|
import com.yohoufo.order.service.support.codegenerator.OrderCodeGenerator;
|
|
|
import com.yohoufo.order.service.support.codegenerator.bean.CodeMeta;
|
|
|
import com.yohoufo.order.utils.LoggerUtils;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
...
|
...
|
@@ -41,11 +39,6 @@ import java.math.BigDecimal; |
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Optional;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.yohobuy.ufo.model.order.common.OrderStatus.DONE;
|
|
|
import static com.yohobuy.ufo.model.order.common.OrderStatus.WAITING_RECEIVE;
|
|
|
|
|
|
/**
|
|
|
* Created by chenchao on 2018/9/20.
|
...
|
...
|
@@ -91,9 +84,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
@Autowired
|
|
|
private SellerOrderPrepareProcessor sellerOrderPrepareProcessor;
|
|
|
|
|
|
@Autowired
|
|
|
private QiniuLiveRecordService qiniuLiveRecordService;
|
|
|
|
|
|
private static List<SkupStatus> noNeedShowOrderCode = Arrays.asList(SkupStatus.CAN_NOT_SELL,SkupStatus.CAN_SELL,
|
|
|
SkupStatus.SELF_CANCEL_PAY, SkupStatus.TIMEOUT_CANCEL,
|
|
|
SkupStatus.SELLER_CANCEL_SELL, SkupStatus.YOHO_CANCEL_SELL);
|
...
|
...
|
@@ -204,11 +194,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
|
|
|
@Override
|
|
|
String getAppraiseVideoUrl(BuyerOrder buyerOrder) {
|
|
|
return Optional.ofNullable(buyerOrder)
|
|
|
.filter(e -> e.getStatus() == WAITING_RECEIVE.getCode() || e.getStatus() == DONE.getCode())
|
|
|
.map(BuyerOrder::getOrderCode)
|
|
|
.map(orderCode -> qiniuLiveRecordService.getAppraiseVideoUrl(orderCode))
|
|
|
.orElse(null);
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
/**
|
...
|
...
|
|