From d425629234a22dbfdaf61f1e315d25495ef3de53 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 9 Dec 2019 10:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=96=B0=E6=9B=BE=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/mapper/YxStoreProductReplyMapper.java     |  2 +-
 .../impl/YxStoreProductReplyServiceImpl.java       | 14 +++++++++++++-
 .../shop/web/vo/YxStoreProductReplyQueryVo.java    |  5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
index 62561500..4881f141 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/mapper/YxStoreProductReplyMapper.java
@@ -36,7 +36,7 @@ public interface YxStoreProductReplyMapper extends BaseMapper<YxStoreProductRepl
 
     @Select("select A.product_score as productScore,A.service_score as serviceScore," +
             "A.comment,A.merchant_reply_content as merchantReplyContent," +
-            "A.merchant_reply_time as merchantReplyTime,A.pics,A.add_time as addTime," +
+            "A.merchant_reply_time as merchantReplyTime,A.pics as pictures,A.add_time as addTime," +
             "B.nickname,B.avatar,C.cart_info as cartInfo" +
             " from yx_store_product_reply A left join yx_user B " +
             "on A.uid = B.uid left join yx_store_order_cart_info C on A.unique = C.unique" +
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java
index 0a418da8..f8aab7d3 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java
@@ -15,6 +15,7 @@ import co.yixiang.common.web.vo.Paging;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 
 /**
@@ -128,7 +132,15 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl<YxStoreProdu
         Page<YxStoreProductReply> pageModel = new Page<>(page, limit);
         List<YxStoreProductReplyQueryVo> list = yxStoreProductReplyMapper
                 .selectReplyList(pageModel,productId);
-        for (YxStoreProductReplyQueryVo queryVo : list) {
+        List<YxStoreProductReplyQueryVo> list1 = list.stream().map(i ->{
+            YxStoreProductReplyQueryVo vo = new YxStoreProductReplyQueryVo();
+            BeanUtils.copyProperties(i,vo);
+            if(i.getPictures().contains(",")){
+                vo.setPics(i.getPictures().split(","));
+            }
+            return vo;
+        }).collect(Collectors.toList());
+        for (YxStoreProductReplyQueryVo queryVo : list1) {
             newList.add(handleReply(queryVo));
         }
         return newList;
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java
index f57db538..5067e13e 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/vo/YxStoreProductReplyQueryVo.java
@@ -42,7 +42,7 @@ public class YxStoreProductReplyQueryVo implements Serializable {
     private String comment;
 
     @ApiModelProperty(value = "评论图片")
-    private String pics;
+    private String[] pics;
 
     @ApiModelProperty(value = "评论时间")
     private Integer addTime;
@@ -62,6 +62,9 @@ public class YxStoreProductReplyQueryVo implements Serializable {
 
     private String suk;
 
+
+    private String pictures;
+
     @JsonIgnore
     private String cartInfo;