...
|
...
|
@@ -10,11 +10,11 @@ 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.yohoufo.common.constant.ExpressInfoConstant;
|
|
|
import com.yohoufo.common.helper.ImageUrlAssist;
|
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
import com.yohoufo.dal.order.*;
|
|
|
import com.yohoufo.dal.order.model.*;
|
|
|
import com.yohoufo.order.common.*;
|
|
|
import com.yohoufo.order.common.ActionStatusHold;
|
|
|
import com.yohoufo.order.common.Payment;
|
|
|
import com.yohoufo.order.constants.MetaKey;
|
|
|
import com.yohoufo.order.convert.GoodsInfoConvertor;
|
|
|
import com.yohoufo.order.convert.SellerOrderConvertor;
|
...
|
...
|
@@ -30,12 +30,9 @@ import com.yohoufo.order.service.proxy.ProductProxyService; |
|
|
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.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
...
|
...
|
@@ -95,8 +92,6 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
private static final List<Long> SELLER_TYPES = Arrays.asList(OrderCodeType.SELLER_TYPE.getType());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
public OrderDetailInfo getOrderDetail(OrderRequest orderRequest) {
|
|
|
int uid;
|
...
|
...
|
@@ -361,13 +356,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
orderDetailInfo.setGoodsInfo(goodsInfo);
|
|
|
|
|
|
// 支付状态
|
|
|
if (order.getPayment() != null){
|
|
|
Payment payment = Payment.getPayment(order.getPayment());
|
|
|
if (payment != null){
|
|
|
orderDetailInfo.setPaymentStr(payment.getDesc());
|
|
|
orderDetailInfo.setPayment(order.getPayment());
|
|
|
}
|
|
|
}
|
|
|
setPayment(orderDetailInfo, order.getPayment());
|
|
|
//
|
|
|
orderDetailInfo.setIsPaid(getIsPaid(skupStatus));
|
|
|
orderDetailInfo.setSecendLevelCreateTime(order.getCreateTime());
|
...
|
...
|
@@ -412,6 +401,11 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public Logger getLogger() {
|
|
|
return logger;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public ProductProxyService getProductProxyService() {
|
|
|
return productProxyService;
|
|
|
}
|
...
|
...
|
|