Authored by chenchao

show deliver info 4 seller

... ... @@ -102,7 +102,8 @@ public interface IExpressInfoService {
OrderStatus.MINI_FAULT_WAITING.getCode(),
OrderStatus.MINI_FAULT_ACCEPT.getCode(),
OrderStatus.JUDGE_PASS.getCode(),
OrderStatus.DONE.getCode());
OrderStatus.DONE.getCode(),
OrderStatus.BUYER_BLOWN_CUSTOMS_CLEARANCE.getCode());
/**
* 注意express的添加顺序不能变
... ... @@ -115,12 +116,17 @@ public interface IExpressInfoService {
||Objects.equals(OrderStatus.QUALITY_CHECK_FAKE.getCode(), status)
||Objects.equals(OrderStatus.MINI_FAULT_REJECT.getCode(), status)
||Objects.equals(OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode(), status)){
types = Arrays.asList( EnumExpressType.EXPRESS_TYPE_3.getCode(),EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),EnumExpressType.EXPRESS_TYPE_1.getCode());
types = Arrays.asList( EnumExpressType.EXPRESS_TYPE_3.getCode(),
EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),
EnumExpressType.EXPRESS_TYPE_1.getCode());
}else if(Objects.equals(OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(), status)
||Objects.equals(OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode(), status)){
types = Arrays.asList( EnumExpressType.EXPRESS_TYPE_REBACK.getCode() ,EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),EnumExpressType.EXPRESS_TYPE_1.getCode());
types = Arrays.asList( EnumExpressType.EXPRESS_TYPE_REBACK.getCode() ,
EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),
EnumExpressType.EXPRESS_TYPE_1.getCode());
}else if(status2OnlySellerExpressType.contains( status)){
types = Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),EnumExpressType.EXPRESS_TYPE_1.getCode());
types = Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),
EnumExpressType.EXPRESS_TYPE_1.getCode());
}
return types;
}
... ... @@ -147,8 +153,11 @@ public interface IExpressInfoService {
if(Objects.equals(OrderStatus.SELLER_SEND_OUT.getCode(), status)){
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
} else if (status2BuyerDeliverExpressStatusList.contains(status)){
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),EnumExpressType.EXPRESS_TYPE_1.getCode());
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),
EnumExpressType.EXPRESS_TYPE_1.getCode());
}
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),EnumExpressType.EXPRESS_TYPE_1.getCode());
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),
EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(),
EnumExpressType.EXPRESS_TYPE_1.getCode());
}
}
... ...