物流增加鉴定的调拨信息

@@ -349,11 +349,6 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         List<ExpressInfo> expressInfoList = getExpressInfoListByStage( orderCode, expressType);
         processExpressInfo(expressInfoList, expressInfoRespBo);
 
-        //设定鉴定的物流调拨信息
-        expressInfoRespBo.setJudgeExpressInfoDetailList(Lists.newArrayList());
-        List<ExpressInfo> judgeExpressInfoList=getExpressInfoListByStage( orderCode, EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode());
-        constructExpressInfo(judgeExpressInfoList, expressInfoRespBo.getJudgeExpressInfoDetailList());
-
         //没有物流详情，但是有物流单号信息
         if(CollectionUtils.isEmpty(expressInfoList)){
             ExpressRecord expressRecord = expressRecordMapper.selectByOrderCodeAndExpressType(orderCode,expressType);
@@ -370,6 +365,11 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             }
         }
 
+        //设定鉴定的物流调拨信息
+        expressInfoRespBo.setJudgeExpressInfoDetailList(Lists.newArrayList());
+        List<ExpressInfo> judgeExpressInfoList=getExpressInfoListByStage( orderCode, EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode());
+        constructExpressInfo(judgeExpressInfoList, expressInfoRespBo.getJudgeExpressInfoDetailList());
+
         //获取上一阶段的辅助物流信息
         List<ExpressInfoDetail> supplementExpressInfoDetailList = Lists.newArrayList();
         expressInfoRespBo.setSupplementExpressInfoDetailList(supplementExpressInfoDetailList);
@@ -405,6 +405,17 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                 constructExpressInfo(previousExpressInfoList, supplementExpressInfoDetailList);
             }
         }
+
+        //设定三个阶段的信息
+
+        //根据状态重设expressType
+        if(Objects.equals(OrderStatus.PLATFORM_RECEIVE.getCode(),buyerOrder.getStatus())
+                ||Objects.equals(OrderStatus.PLATFORM_CHECKING.getCode(),buyerOrder.getStatus())
+                ||Objects.equals(OrderStatus.JUDGE_PASS.getCode(),buyerOrder.getStatus())
+                ){
+            expressInfoRespBo.setExpressType(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().byteValue());
+        }
+
         LOGGER.info("queryExpressDetailInfo result = {}", JSON.toJSONString(expressInfoRespBo));
         return expressInfoRespBo;
     }