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

@@ -371,7 +371,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         }
 
         //1.物流单号信息
-        constructWayBillInfo(orderCode,expressTypeList,expressInfoRespBo);
+        if(TabType.BUY==actor){
+            //买家只能看到自己的物流
+            constructWayBillInfo(orderCode,Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode()),expressInfoRespBo);
+        }else{
+            constructWayBillInfo(orderCode,expressTypeList,expressInfoRespBo);
+        }
+
 
         // 构造物流信息
         if(expressTypeList.size()==1){
@@ -410,6 +416,11 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         //5.设定三个阶段的信息
         buildExpressStage(actor,buyerOrder.getStatus(), expressInfoRespBo);
 
+        //鉴定阶段的物流仍然属于卖家
+        if(expressInfoRespBo.getExpressType()!=null&&EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode()==expressInfoRespBo.getExpressType().intValue()){
+            expressInfoRespBo.setExpressType(EnumExpressType.EXPRESS_TYPE_1.getCode().byteValue());
+        }
+
         LOGGER.info("queryExpressDetailInfo result = {}", JSON.toJSONString(expressInfoRespBo));
         return expressInfoRespBo;
     }

@@ -346,14 +346,16 @@ public class SellerEnterApplyService {
 
     public void processWithLevel(Integer currentLevel, Integer targetLevel, Integer uid){
         logger.info("processWithLevel currentLevel {} targetLevel {} uid {}",currentLevel, targetLevel, uid);
-        if (SellerConfig.ENTER_TYPE_DEFAULT_LEVEL == currentLevel){
+        if (SellerConfig.ENTER_TYPE_DEFAULT_LEVEL == currentLevel ||
+                currentLevel== SuperEnterStageLevel.DISABLE.getCode()){
             if(targetLevel == SuperEnterStageLevel.FULL.getCode()
                     ||targetLevel == SuperEnterStageLevel.PARTITION.getCode()){
                 productProxyService.cancelHiddenGoods(uid);
             }
         }
 
-        if (SellerConfig.ENTER_TYPE_DEFAULT_LEVEL == targetLevel) {
+        if (SellerConfig.ENTER_TYPE_DEFAULT_LEVEL == targetLevel
+                || targetLevel == SuperEnterStageLevel.DISABLE.getCode()) {
             if (currentLevel == SuperEnterStageLevel.FULL.getCode()
                     || currentLevel == SuperEnterStageLevel.PARTITION.getCode()) {
                 productProxyService.hiddenGoods(uid);

@@ -31,7 +31,7 @@ public class SellerHelper {
                 }else if (et.getGoodsOnOffShelveAmount().compareTo(left) <= 0){
                     level = SuperEnterStageLevel.PARTITION.getCode();
                 }else if (et.getHiddenGoodsAmount().compareTo(left) <=0){
-                    level = SuperEnterStageLevel.PARTITION.getCode();
+                    level = SuperEnterStageLevel.DISABLE.getCode();
                 }
                 break;
         }