Authored by qinchao

fix 物流阶段

@@ -408,13 +408,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -408,13 +408,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
408 } 408 }
409 409
410 //5.设定三个阶段的信息 410 //5.设定三个阶段的信息
411 - buildExpressStage(buyerOrder.getStatus(), expressInfoRespBo); 411 + buildExpressStage(actor,buyerOrder.getStatus(), expressInfoRespBo);
412 412
413 LOGGER.info("queryExpressDetailInfo result = {}", JSON.toJSONString(expressInfoRespBo)); 413 LOGGER.info("queryExpressDetailInfo result = {}", JSON.toJSONString(expressInfoRespBo));
414 return expressInfoRespBo; 414 return expressInfoRespBo;
415 } 415 }
416 416
417 - private void buildExpressStage(int status,ExpressInfoRespBo expressInfoRespBo ){ 417 + private void buildExpressStage(TabType actor,int status,ExpressInfoRespBo expressInfoRespBo ){
418 // 1 卖家发货 -- 平台鉴定 -- 交易成功 ,其中卖家发货点亮 418 // 1 卖家发货 -- 平台鉴定 -- 交易成功 ,其中卖家发货点亮
419 // 2 卖家发货 == 平台鉴定 -- 交易成功 ,其中卖家发货和平台鉴定点亮 419 // 2 卖家发货 == 平台鉴定 -- 交易成功 ,其中卖家发货和平台鉴定点亮
420 // 3 卖家发货 == 平台鉴定 == 交易成功 ,全部点亮 420 // 3 卖家发货 == 平台鉴定 == 交易成功 ,全部点亮
@@ -424,7 +424,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -424,7 +424,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
424 if(OrderStatus.PLATFORM_RECEIVE.getCode()==status 424 if(OrderStatus.PLATFORM_RECEIVE.getCode()==status
425 ||OrderStatus.PLATFORM_CHECKING.getCode()==status){ 425 ||OrderStatus.PLATFORM_CHECKING.getCode()==status){
426 expressInfoRespBo.setStage(2); 426 expressInfoRespBo.setStage(2);
427 - }else if(OrderStatus.WAITING_RECEIVE.getCode()==status||OrderStatus.DONE.getCode()==status){ 427 + }else if(OrderStatus.WAITING_RECEIVE.getCode()==status){
  428 + if(TabType.BUY==actor){
  429 + //买家
  430 + expressInfoRespBo.setStage(2);
  431 + }else{
  432 + //卖家
  433 + expressInfoRespBo.setStage(3);
  434 + }
  435 + }else if(OrderStatus.DONE.getCode()==status){
428 expressInfoRespBo.setStage(3); 436 expressInfoRespBo.setStage(3);
429 }else if(OrderStatus.CHECKING_FAKE.getCode()==status){ 437 }else if(OrderStatus.CHECKING_FAKE.getCode()==status){
430 expressInfoRespBo.setStage(4); 438 expressInfoRespBo.setStage(4);