...
|
...
|
@@ -778,13 +778,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
// 用户发货
|
|
|
if(status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
|
|
|
}else if(status == AppraiseOrderStatus.JUDGE_PASS.getCode()
|
|
|
|| status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),
|
|
|
EnumExpressType.EXPRESS_TYPE_3.getCode(),
|
|
|
EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
|
|
|
}else if(status == AppraiseOrderStatus.JUDGE_PASS.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode());
|
|
|
}else if(status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_3.getCode());
|
|
|
}else if(status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
|
|
|
}
|
|
|
}
|
|
|
// 付费寄存
|
...
|
...
|
@@ -795,12 +795,11 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
if (isSubOrder){
|
|
|
|
|
|
// 子订单状态: 虚假发货,质检不通过, 鉴定通过,鉴定不通过,无法鉴定,等待用户收货
|
|
|
if (status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),
|
|
|
EnumExpressType.EXPRESS_TYPE_3.getCode(),
|
|
|
EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
|
|
|
if(status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
|
|
|
|| status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_3.getCode());
|
|
|
}else if(status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
|
|
|
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
|
|
|
}
|
|
|
|
|
|
}else{
|
...
|
...
|
|