二手

@@ -235,25 +235,28 @@ public class SecondhandProductService implements ISecondhandProductService{
     		List<SecondhandImages> secondhandImagesList = skupImageMap.get(skup);
     		rebuiltImageList(secondhandImagesList, flawMap);
     		rsp.setImageList(secondhandImagesList);
-    		SecondhandInfo info = infoMap.get(skup);
-    		rsp.setDescribeInfo(info.getDescribeInfo());
-    		rsp.setSku(item.getStorageId());
-    		SellerOrderGoods sellerGoods = sellerGoodsMap.get(skup);
-    		if(null == sellerGoods) {
-    			continue;
-    		}
     		rsp.setProductImage(ImagesHelper.getImageAbsoluteUrl(goodsIdImageMap.get(item.getProductId()), "goodsimg"));
-    		rsp.setColorName(sellerGoods.getColorName());
-    		rsp.setSizeName(sellerGoods.getSizeName());
     		rsp.setSellerUid(item.getSellerUid());
     		rsp.setPrice(String.valueOf(item.getPrice()));
     		rsp.setStatus(item.getStatus());
-    		rsp.setCreateTimeStr(DateUtil.getDateFormatFromInt(info.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
-    		rsp.setAuditTimeStr(null == info.getAuditTime() ? "" : DateUtil.getDateFormatFromInt(info.getAuditTime(), "yyyy-MM-dd HH:mm:ss"));
-    		rsp.setAuditName(null == info.getAuditName() ? "" : info.getAuditName());
+    		rsp.setSku(item.getStorageId());
     		rsp.setProductName(productIdNameMap.get(item.getProductId()));
-    		rsp.setRejectReason(info.getRejectReason());
-    		
+
+    		SellerOrderGoods sellerGoods = sellerGoodsMap.get(skup);
+    		if(null != sellerGoods) {
+        		rsp.setColorName(sellerGoods.getColorName());
+        		rsp.setSizeName(sellerGoods.getSizeName());
+    		}
+
+    		SecondhandInfo info = infoMap.get(skup);
+    		if(null != info) {
+        		rsp.setDescribeInfo(info.getDescribeInfo());
+        		rsp.setCreateTimeStr(DateUtil.getDateFormatFromInt(info.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+        		rsp.setAuditTimeStr(null == info.getAuditTime() ? "" : DateUtil.getDateFormatFromInt(info.getAuditTime(), "yyyy-MM-dd HH:mm:ss"));
+        		rsp.setAuditName(null == info.getAuditName() ? "" : info.getAuditName());
+        		rsp.setRejectReason(info.getRejectReason());
+    		}
+
     		respList.add(rsp);
     	}
     	
@@ -261,6 +264,9 @@ public class SecondhandProductService implements ISecondhandProductService{
     }
     
     private void rebuiltImageList(List<SecondhandImages> imageList, Map<Integer, String> flawIdNameMap) {
+    	if(CollectionUtils.isEmpty(imageList)) {
+    		return;
+    	}
     	for(SecondhandImages image : imageList) {
     		image.setImageDesc(flawIdNameMap.get(image.getCode()));
     		image.setImageUrl(ImagesHelper.getImageAbsoluteUrl(image.getImageUrl(), "goodsimg"));