ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit b75d58b66f71fa6962cb0271a7a2783def2151cb 2 parents 0eea858e 5b55bb85

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

Inline Side-by-side
Showing 2 changed files with 11 additions and 8 deletions
@@ -5,7 +5,9 @@ import com.google.common.collect.Maps; @@ -5,7 +5,9 @@ import com.google.common.collect.Maps;
5 import com.yohobuy.ufo.model.ProductInfo; 5 import com.yohobuy.ufo.model.ProductInfo;
6 import com.yohobuy.ufo.model.order.bo.DepositProductBo; 6 import com.yohobuy.ufo.model.order.bo.DepositProductBo;
7 import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus; 7 import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus;
  8 +import com.yohobuy.ufo.model.order.common.OrderAttributes;
8 import com.yohobuy.ufo.model.order.resp.DepositOrderComputeResp; 9 import com.yohobuy.ufo.model.order.resp.DepositOrderComputeResp;
  10 +import com.yohobuy.ufo.model.order.resp.OrderDetailInfo;
9 import com.yohobuy.ufo.model.response.StorageDataResp; 11 import com.yohobuy.ufo.model.response.StorageDataResp;
10 import com.yohoufo.common.caller.UfoServiceCaller; 12 import com.yohoufo.common.caller.UfoServiceCaller;
11 import com.yohoufo.common.helper.ImageUrlAssist; 13 import com.yohoufo.common.helper.ImageUrlAssist;
@@ -198,23 +200,23 @@ public class DepositHelpService { @@ -198,23 +200,23 @@ public class DepositHelpService {
198 return Maps.newHashMap(); 200 return Maps.newHashMap();
199 } 201 }
200 202
201 - String statusStrByCode = AppraiseOrderStatus.getStatusStrByCode(appraiseOrders.getStatus()); 203 + AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(appraiseOrders.getStatus());
202 204
203 205
204 Map<Long,List<String>> result = Maps.newHashMap(); 206 Map<Long,List<String>> result = Maps.newHashMap();
205 - result.put(appraiseOrder, Lists.newArrayList(statusStrByCode, getAppaiseOrderStatusDesc(appraiseOrders.getStatus()))); 207 + result.put(appraiseOrder, Lists.newArrayList(aos.statusStr(OrderAttributes.DEPOSITE), getAppaiseOrderStatusDesc(aos)));
206 208
207 209
208 return result; 210 return result;
209 } 211 }
210 212
211 - public String getAppaiseOrderStatusDesc(Integer status) {  
212 - switch (status) {  
213 - case 23: 213 + public String getAppaiseOrderStatusDesc(AppraiseOrderStatus appraiseOrderStatus) {
  214 + switch (appraiseOrderStatus) {
  215 + case PLATFORM_APPRAISE_UNSURE:
214 return "您的商品无法鉴定，保证金已退还，平台将在1-3个工作日内寄回，请留意物流动态"; 216 return "您的商品无法鉴定，保证金已退还，平台将在1-3个工作日内寄回，请留意物流动态";
215 - case 13: 217 + case CHECKING_FAKE:
216 return "您的商品鉴定未通过，保证金已扣除，平台将在1-3个工作日内到付寄回，请留意物流动态"; 218 return "您的商品鉴定未通过，保证金已扣除，平台将在1-3个工作日内到付寄回，请留意物流动态";
217 - case 20: 219 + case QUALITY_CHECK_FAKE:
218 return "商品质检未通过，保证金已赔付给买家，平台将在1-3个工作日内到付寄回，请留意物流动态"; 220 return "商品质检未通过，保证金已赔付给买家，平台将在1-3个工作日内到付寄回，请留意物流动态";
219 default: 221 default:
220 return ""; 222 return "";
@@ -243,6 +245,6 @@ public class DepositHelpService { @@ -243,6 +245,6 @@ public class DepositHelpService {
243 * @return 245 * @return
244 */ 246 */
245 public String queryEarnestMoneyStatus(Integer status) { 247 public String queryEarnestMoneyStatus(Integer status) {
246 - return Integer.valueOf(AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()).equals(status) ? "原路退还" : "已扣除"; 248 + return Integer.valueOf(AppraiseOrderStatus.CHECKING_FAKE.getCode()).equals(status) ? "已扣除" : "原路退还";
247 } 249 }
248 } 250 }
@@ -115,6 +115,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService { @@ -115,6 +115,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService {
115 OrderAttributes oa = getOrderAttributes(); 115 OrderAttributes oa = getOrderAttributes();
116 List<ProductVo> productList = aogList.parallelStream() 116 List<ProductVo> productList = aogList.parallelStream()
117 .sorted(Comparator.comparing(AppraiseOrderGoods::getOrderBy)) 117 .sorted(Comparator.comparing(AppraiseOrderGoods::getOrderBy))
  118 + .limit(4)
118 .map(paog -> ProductVo.builder() 119 .map(paog -> ProductVo.builder()
119 .imgUrl(ImageUrlAssist.getAllProductPicUrl(paog.getImageUrl(), "goodsimg", "center", "d2hpdGU=")) 120 .imgUrl(ImageUrlAssist.getAllProductPicUrl(paog.getImageUrl(), "goodsimg", "center", "d2hpdGU="))
120 .build()) 121 .build())