Merge branch 'master' into dev

@@ -2,6 +2,7 @@ package com.yohoufo.order.service.impl;
 
 import com.google.common.collect.Lists;
 import com.yohobuy.ufo.model.order.resp.PageResp;
+import com.yohoufo.common.helper.ImageUrlAssist;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.dal.order.model.BuyerOrder;
 import com.yohoufo.dal.order.model.BuyerOrderGoods;
@@ -153,7 +154,7 @@ public abstract class AbsOrderListService implements IOrderListService{
         GoodsInfo goodsInfo = new GoodsInfo();
         goodsInfo.setColorName(sellerOrderGoods.getColorName());
         goodsInfo.setProductName(sellerOrderGoods.getProductName());
-        goodsInfo.setGoodImg(sellerOrderGoods.getImageUrl());
+        goodsInfo.setGoodImg(ImageUrlAssist.getAllProductPicUrl(sellerOrderGoods.getImageUrl(), "goodsimg", "center", "d2hpdGU="));
         goodsInfo.setSizeName(sellerOrderGoods.getSizeName());
         goodsInfo.setGoodPrice(buyerOrderGoods.getGoodsPrice() == null ? "" :buyerOrderGoods.getGoodsPrice().toPlainString());
         goodsInfo.setStorageId(sellerOrderGoods.getStorageId());

@@ -122,7 +122,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
         com.yohoufo.order.model.response.GoodsInfo goodsInfo = new com.yohoufo.order.model.response.GoodsInfo();
         goodsInfo.setColorName(sellerOrderGoods.getColorName());
         goodsInfo.setProductName(sellerOrderGoods.getProductName());
-        goodsInfo.setGoodImg(sellerOrderGoods.getImageUrl());
+        goodsInfo.setGoodImg(ImageUrlAssist.getAllProductPicUrl(sellerOrderGoods.getImageUrl(), "goodsimg", "center", "d2hpdGU="));
         goodsInfo.setSizeName(sellerOrderGoods.getSizeName());
         goodsInfo.setProductId(sellerOrderGoods.getProductId());
         goodsInfo.setGoodPrice(sellerOrderGoods.getGoodsPrice().toPlainString());

 package com.yohoufo.order.service.support;
 
+import com.yohoufo.common.helper.ImageUrlAssist;
 import com.yohoufo.dal.order.model.SellerOrderGoods;
 import com.yohoufo.order.constants.OrderConstant;
 import com.yohoufo.order.model.response.GoodsInfo;
@@ -58,7 +59,7 @@ public class ShoppingSupport {
         goods.setSizeId(skup.getSizeId() == null ? 0:skup.getSizeId());
         goods.setSizeName(skup.getSizeName());
         goods.setGoodPrice(skup.getGoodsPrice() == null ? "0" : skup.getGoodsPrice().toPlainString());
-        goods.setGoodImg(skup.getImageUrl());
+        goods.setGoodImg(ImageUrlAssist.getAllProductPicUrl(skup.getImageUrl(), "goodsimg", "center", "d2hpdGU="));
         return goods;
     }