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

@@ -101,7 +101,7 @@ public interface IExpressInfoService {
         }else {
             switch (actor){
                 case BUY:
-                    return getExpressTypeBuyer(status);
+                    return ExpressInfoConstant.EXPRESS_TYPE_2;
                 case SELL:
                     return getExpressTypeSeller(status);
                 default:

@@ -90,7 +90,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
         if (!ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){
             return null;
         }
-        Integer type = expressInfoService.getExpressType(orderStatus.getCode(), TabType.BUY);
+        Integer type = expressInfoService.getExpressTypeBuyer(orderStatus.getCode());
         ExpressInfoDetail lastEID = null;
         ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type);
         List<ExpressInfoDetail> eidList;

@@ -182,7 +182,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         if (!ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){
             return null;
         }
-        Integer type = expressInfoService.getExpressType(orderStatus.getCode(), TabType.SELL);
+        Integer type = expressInfoService.getExpressTypeSeller(orderStatus.getCode());
         ExpressInfoDetail lastEID = null;
         ExpressInfoRespBo expressInfoResp = expressInfoService.queryLastExpressDetailInfo(orderCode, type);
         List<ExpressInfoDetail> eidList;