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 { @@ -506,7 +506,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
506 ||OrderStatus.QUALITY_CHECK_FAKE.getCode()==status 506 ||OrderStatus.QUALITY_CHECK_FAKE.getCode()==status
507 ||OrderStatus.MINI_FAULT_REJECT.getCode()==status 507 ||OrderStatus.MINI_FAULT_REJECT.getCode()==status
508 ||OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode()==status 508 ||OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode()==status
509 - ||OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()==status){ 509 + ||OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()==status
  510 + ||OrderStatus.PLATFORM_BLOWN_CUSTOMS_CLEARANCE.getCode()==status
  511 + ||OrderStatus.BUYER_BLOWN_CUSTOMS_CLEARANCE.getCode()==status){
510 expressInfoRespBo.setStage(4); 512 expressInfoRespBo.setStage(4);
511 }else if(OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()==status){ 513 }else if(OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()==status){
512 expressInfoRespBo.setStage(5); 514 expressInfoRespBo.setStage(5);