Authored by chenchao

fix: buyer see express info while canceled order after seller deliver

... ... @@ -24,9 +24,19 @@ public class ActionStatusHold {
OrderStatus.SELLER_SEND_OUT.getCode(),
OrderStatus.PLATFORM_CHECKING.getCode(),
OrderStatus.WAITING_RECEIVE.getCode(),
OrderStatus.DONE.getCode()
OrderStatus.DONE.getCode(),
OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()
);
static final List<Integer> SHOW_BUYER_DELIVER_EXPRESS_STATUS_LIST ;
static {
SHOW_BUYER_DELIVER_EXPRESS_STATUS_LIST = Arrays.asList(
OrderStatus.SELLER_SEND_OUT.getCode(),
OrderStatus.PLATFORM_CHECKING.getCode(),
OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()
);
}
static List<Integer> CanDelStatusList = Arrays.asList(
OrderStatus.DONE.getCode(),
... ... @@ -54,6 +64,9 @@ public class ActionStatusHold {
return BuyerASH.SHOW_EXPRESS_STATUS_LIST;
}
public static boolean buyerCanShowBuyerDeliverExpressStatusList(Integer status){
return BuyerASH.SHOW_BUYER_DELIVER_EXPRESS_STATUS_LIST.contains(status);
}
private static class SellerASH{
final static List<Integer> View_Express_Status = Arrays.asList(OrderStatus.SELLER_SEND_OUT.getCode(),
... ...
... ... @@ -4,6 +4,7 @@ import com.yohobuy.ufo.model.order.common.OrderStatus;
import com.yohobuy.ufo.model.order.common.TabType;
import com.yohobuy.ufo.model.order.resp.ExpressInfoRespBo;
import com.yohoufo.common.constant.ExpressInfoConstant;
import com.yohoufo.order.common.ActionStatusHold;
import com.yohoufo.order.model.response.AppraiseAddressResp;
import java.util.Objects;
... ... @@ -126,8 +127,7 @@ public interface IExpressInfoService {
}
default Integer getExpressTypeBuyer(Integer status){
if (Objects.equals(status, OrderStatus.SELLER_SEND_OUT.getCode())
|| Objects.equals(status, OrderStatus.PLATFORM_CHECKING.getCode())){
if (ActionStatusHold.buyerCanShowBuyerDeliverExpressStatusList(status)){
return ExpressInfoConstant.EXPRESS_TYPE_1;
}
return ExpressInfoConstant.EXPRESS_TYPE_2;
... ...
... ... @@ -83,8 +83,6 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
}
@Override
ExpressInfoDetail getExpressInfoDetail(OrderStatus orderStatus, long orderCode) {
if (!ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){
... ...