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

@@ -5,7 +5,9 @@ import com.google.common.collect.Maps;
 import com.yohobuy.ufo.model.ProductInfo;
 import com.yohobuy.ufo.model.order.bo.DepositProductBo;
 import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus;
+import com.yohobuy.ufo.model.order.common.OrderAttributes;
 import com.yohobuy.ufo.model.order.resp.DepositOrderComputeResp;
+import com.yohobuy.ufo.model.order.resp.OrderDetailInfo;
 import com.yohobuy.ufo.model.response.StorageDataResp;
 import com.yohoufo.common.caller.UfoServiceCaller;
 import com.yohoufo.common.helper.ImageUrlAssist;
@@ -198,23 +200,23 @@ public class DepositHelpService {
             return Maps.newHashMap();
         }
 
-        String statusStrByCode = AppraiseOrderStatus.getStatusStrByCode(appraiseOrders.getStatus());
+        AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(appraiseOrders.getStatus());
 
 
         Map<Long,List<String>> result = Maps.newHashMap();
-        result.put(appraiseOrder, Lists.newArrayList(statusStrByCode, getAppaiseOrderStatusDesc(appraiseOrders.getStatus())));
+        result.put(appraiseOrder, Lists.newArrayList(aos.statusStr(OrderAttributes.DEPOSITE), getAppaiseOrderStatusDesc(aos)));
 
 
         return result;
     }
 
-    public String getAppaiseOrderStatusDesc(Integer status) {
-        switch (status) {
-            case 23:
+    public String getAppaiseOrderStatusDesc(AppraiseOrderStatus appraiseOrderStatus) {
+        switch (appraiseOrderStatus) {
+            case PLATFORM_APPRAISE_UNSURE:
                 return "您的商品无法鉴定，保证金已退还，平台将在1-3个工作日内寄回，请留意物流动态";
-            case 13:
+            case CHECKING_FAKE:
                 return "您的商品鉴定未通过，保证金已扣除，平台将在1-3个工作日内到付寄回，请留意物流动态";
-            case 20:
+            case QUALITY_CHECK_FAKE:
                 return "商品质检未通过，保证金已赔付给买家，平台将在1-3个工作日内到付寄回，请留意物流动态";
             default:
                 return "";
@@ -243,6 +245,6 @@ public class DepositHelpService {
      * @return
      */
     public String queryEarnestMoneyStatus(Integer status) {
-        return Integer.valueOf(AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()).equals(status) ? "原路退还" : "已扣除";
+        return Integer.valueOf(AppraiseOrderStatus.CHECKING_FAKE.getCode()).equals(status) ? "已扣除" : "原路退还";
     }
 }

@@ -115,6 +115,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService {
         OrderAttributes oa = getOrderAttributes();
         List<ProductVo> productList = aogList.parallelStream()
                 .sorted(Comparator.comparing(AppraiseOrderGoods::getOrderBy))
+                .limit(4)
                 .map(paog -> ProductVo.builder()
                         .imgUrl(ImageUrlAssist.getAllProductPicUrl(paog.getImageUrl(), "goodsimg", "center", "d2hpdGU="))
                         .build())