Authored by chenchao

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

... ... @@ -506,7 +506,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
||OrderStatus.QUALITY_CHECK_FAKE.getCode()==status
||OrderStatus.MINI_FAULT_REJECT.getCode()==status
||OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode()==status
||OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()==status){
||OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()==status
||OrderStatus.PLATFORM_BLOWN_CUSTOMS_CLEARANCE.getCode()==status
||OrderStatus.BUYER_BLOWN_CUSTOMS_CLEARANCE.getCode()==status){
expressInfoRespBo.setStage(4);
}else if(OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()==status){
expressInfoRespBo.setStage(5);
... ...