Authored by qinchao

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.3

package com.yohoufo.order.service;
import com.yohobuy.ufo.model.order.resp.OrderListInfo;
import com.yohobuy.ufo.model.order.vo.AddressInfo;
import com.yohoufo.order.common.ActionStatusHold;
import com.yohoufo.order.service.IBuyerOrderMetaService;
/**
* Created by chao.chen on 2018/12/11.
... ... @@ -12,7 +10,6 @@ public interface AbsBuyerOrderViewService {
IBuyerOrderMetaService getBuyerOrderMetaService();
void setAddressInfo(OrderListInfo orderListInfo);
default AddressInfo getAddressInfo(int uid, long orderCode, Integer orderStauts){
if (!ActionStatusHold.buyerCanModifyAddress(orderStauts)){
... ...
... ... @@ -169,9 +169,11 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
orderListInfo.setGoodsInfo(goodsInfo);
orderListInfo.setSecendLevelCreateTime(buyerOrder.getCreateTime());
orderListInfo.setCreateTime(DateUtil.formatDate(buyerOrder.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
setAddressInfo(orderListInfo);
return orderListInfo;
}
abstract void setAddressInfo(OrderListInfo orderListInfo);
protected abstract void resetDynamicProporties(List<OrderListInfo> list,int type);
}
... ...
... ... @@ -145,6 +145,11 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
}
@Override
void setAddressInfo(OrderListInfo orderListInfo) {
}
@Override
protected void resetDynamicProporties(List<OrderListInfo> list, int type) {
if(CollectionUtils.isNotEmpty(list)){
list.forEach(oli -> {
... ...
... ... @@ -705,4 +705,10 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
return total;
}
public List<OrderListInfo> refresh(){
return null;
}
}
... ...