快评

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java

@@ -212,6 +212,7 @@ public class EvaluateDTO implements Serializable {
     private List<String> imgList;
     private Double orderMount;
     private double avgScore;
+    private List<EvaluateTagsDTO> quickReplyTagList;
 
     public Integer getEvaluateId() {
         return evaluateId;
@@ -592,5 +593,13 @@ public class EvaluateDTO implements Serializable {
     public void setQuickIds(String quickIds) {
         this.quickIds = quickIds;
     }
+
+    public void setQuickReplyTagList(List<EvaluateTagsDTO> quickReplyTagList) {
+        this.quickReplyTagList = quickReplyTagList;
+    }
+
+    public List<EvaluateTagsDTO> getQuickReplyTagList() {
+        return quickReplyTagList;
+    }
 }
 

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateReplyDTO.java

@@ -68,6 +68,7 @@ public class EvaluateReplyDTO implements Serializable {
      */
     private String userName;
     private List<String> imgList;
+    private List<EvaluateTagsDTO> quickReplyTagList;
 
     public Integer getEvaluateReplyId() {
         return evaluateReplyId;
@@ -172,4 +173,12 @@ public class EvaluateReplyDTO implements Serializable {
     public void setShowStatus(Integer showStatus) {
         this.showStatus = showStatus;
     }
+
+    public void setQuickReplyTagList(List<EvaluateTagsDTO> quickReplyTagList) {
+        this.quickReplyTagList = quickReplyTagList;
+    }
+
+    public List<EvaluateTagsDTO> getQuickReplyTagList() {
+        return quickReplyTagList;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateTagsDTO.java

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-05-06 14:45
+ */
+public class EvaluateTagsDTO implements Serializable {
+
+    private static final long serialVersionUID = -7475204633631521759L;
+    /**
+     * 评价快捷标签统计表ID
+     */
+    private Integer evaluateTagsId;
+
+    /**
+     * 评价ID
+     */
+    private Integer evaluateId;
+
+    /**
+     * 评价回复ID
+     */
+    private Integer evaluateReplyId;
+
+    /**
+     * 会员ID
+     */
+    private Long memberId;
+
+    /**
+     * 标签类型 1:负面评价  2：正面评价  3：后台回复
+     */
+    private Integer tagType;
+
+    /**
+     * 评价快捷标签
+     */
+    private String tagName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 企业ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 状态（0：无效，1：有效）
+     */
+    private Integer status;
+
+    public Integer getEvaluateTagsId() {
+        return evaluateTagsId;
+    }
+
+    public void setEvaluateTagsId(Integer evaluateTagsId) {
+        this.evaluateTagsId = evaluateTagsId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public Integer getEvaluateReplyId() {
+        return evaluateReplyId;
+    }
+
+    public void setEvaluateReplyId(Integer evaluateReplyId) {
+        this.evaluateReplyId = evaluateReplyId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Integer getTagType() {
+        return tagType;
+    }
+
+    public void setTagType(Integer tagType) {
+        this.tagType = tagType;
+    }
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateTagsMapper.java

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluateTags;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface TabEvaluateTagsMapper {
     /**
@@ -50,4 +53,6 @@ public interface TabEvaluateTagsMapper {
      * @return 更新条目数
      */
     int updateByPrimaryKey(TabEvaluateTags record);
+
+    List<TabEvaluateTags> listEvaluateTags(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("evaluateReplyId") Integer evaluateReplyId);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateTags.java

@@ -17,6 +17,11 @@ public class TabEvaluateTags {
     private Integer evaluateId;
 
     /**
+     * 评价回复ID
+     */
+    private Integer evaluateReplyId;
+
+    /**
      * 会员ID
      */
     private Long memberId;
@@ -67,6 +72,14 @@ public class TabEvaluateTags {
         this.evaluateId = evaluateId;
     }
 
+    public Integer getEvaluateReplyId() {
+        return evaluateReplyId;
+    }
+
+    public void setEvaluateReplyId(Integer evaluateReplyId) {
+        this.evaluateReplyId = evaluateReplyId;
+    }
+
     public Long getMemberId() {
         return memberId;
     }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateTagsService.java

 package com.gic.evaluate.service;
 
+import com.gic.evaluate.entity.TabEvaluateTags;
+
+import java.util.List;
+
 /**
  * @author zhiwj
  * @Description:
@@ -7,4 +11,11 @@ package com.gic.evaluate.service;
  */
 public interface EvaluateTagsService {
     void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Long memberId);
+
+    void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, Long memberId);
+
+    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId);
+
+    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId);
+
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateTagsServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author zhiwj
@@ -30,10 +31,16 @@ public class EvaluateTagsServiceImpl implements EvaluateTagsService {
 
     @Override
     public void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Long memberId) {
+        this.saveQuick(quickTagsId, enterpriseId, evaluateId, null, memberId);
+    }
+
+    @Override
+    public void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, Long memberId) {
         TabEvaluateQuick evaluateQuick = evaluateQuickService.getById(quickTagsId);
         if (evaluateQuick != null) {
             TabEvaluateTags tabEvaluateTags = new TabEvaluateTags();
             tabEvaluateTags.setEvaluateId(evaluateId);
+            tabEvaluateTags.setEvaluateReplyId(evaluateReplyId);
             tabEvaluateTags.setMemberId(memberId);
             tabEvaluateTags.setTagType(evaluateQuick.getTagType());
             tabEvaluateTags.setTagName(evaluateQuick.getTagName());
@@ -46,4 +53,14 @@ public class EvaluateTagsServiceImpl implements EvaluateTagsService {
             logger.info("该快评不存在:{}, evaluateId:{}", quickTagsId, evaluateId);
         }
     }
+
+    @Override
+    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId) {
+        return this.listEvaluateTags(enterpriseId, evaluateId, null);
+    }
+
+    @Override
+    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId) {
+        return tabEvaluateTagsMapper.listEvaluateTags(enterpriseId, evaluateId, evaluateReplyId);
+    }
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateManageApiServiceImpl.java

@@ -12,10 +12,7 @@ import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.evaluate.constant.Constants;
 import com.gic.evaluate.constant.ReplyEnum;
 import com.gic.evaluate.constant.ReplyerTypeEnum;
-import com.gic.evaluate.dto.EvaluateDTO;
-import com.gic.evaluate.dto.EvaluateQuickDTO;
-import com.gic.evaluate.dto.EvaluateReplyDTO;
-import com.gic.evaluate.dto.UserReplyDTO;
+import com.gic.evaluate.dto.*;
 import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
@@ -55,6 +52,8 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     private StoreApiService storeApiService;
     @Autowired
     private EvaluateOrderConfigService evaluateOrderConfigService;
+    @Autowired
+    private EvaluateTagsService evaluateTagsService;
 
 
     @Override
@@ -90,6 +89,8 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
             List<TabEvaluateImg> tabEvaluateImgs = evaluateImgService.listImageByEvaluateReplyId(evaluateReplyDTO.getEvaluateReplyId());
             List<String> replyImgList = Optional.ofNullable(tabEvaluateImgs).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
             evaluateReplyDTO.setImgList(replyImgList);
+            List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateReplyDTO.getEnterpriseId(), evaluateReplyDTO.getEvaluateId(), evaluateReplyDTO.getEvaluateReplyId());
+            evaluateReplyDTO.setQuickReplyTagList(EntityUtil.changeEntityListByJSON(EvaluateTagsDTO.class, tagsList));
         }
         evaluateDTO.setReplyList(replyDTOList);
 
@@ -103,6 +104,8 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         evaluateReplyDTO.setMemberImgUrl(evaluateDTO.getMemberImgUrl());
         evaluateReplyDTO.setImgList(evaluateDTO.getImgList());
         evaluateReplyDTO.setShowStatus(evaluateDTO.getShowStatus());
+        List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+        evaluateReplyDTO.setQuickReplyTagList(EntityUtil.changeEntityListByJSON(EvaluateTagsDTO.class, tagsList));
         List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
         if (replyList == null) {
             replyList = new ArrayList<>();

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java

@@ -12,10 +12,7 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.Constants;
 import com.gic.evaluate.constant.OrderReplyEnum;
 import com.gic.evaluate.constant.ReplyEnum;
-import com.gic.evaluate.dto.EvaluateDTO;
-import com.gic.evaluate.dto.EvaluateReplyDTO;
-import com.gic.evaluate.dto.MemberReplyDTO;
-import com.gic.evaluate.dto.OrderGoodsDTO;
+import com.gic.evaluate.dto.*;
 import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateOutQO;
 import com.gic.evaluate.qo.EvaluateQO;
@@ -165,15 +162,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         return EnterpriseServiceResponse.success();
     }
 
-    private void saveQuick(String tagIds, Integer enterpriseId, Integer evaluateId, Long memberId) {
-        if (StringUtils.isNotBlank(tagIds)) {
-            String[] tagIdArr = tagIds.split(GlobalInfo.FLAG_COMMA);
-            for (String tagId : tagIdArr) {
-                evaluateTagsService.saveQuick(Integer.valueOf(tagId), enterpriseId, evaluateId, memberId);
-            }
-        }
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> saveReply(MemberReplyDTO memberReplyDTO) {
@@ -232,7 +220,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         //        void saveList(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, List<String> imgUrlList);
         evaluateImgService.saveList(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId(), evaluateRelayId, memberReplyDTO.getImgList());
 
-        saveQuick(evaluateDTO.getQuickIds(), evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), evaluateDTO.getMemberId());
+        saveQuick(evaluateDTO.getQuickIds(), evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), evaluateRelayId, evaluateDTO.getMemberId());
 
         return EnterpriseServiceResponse.success();
     }
@@ -308,11 +296,18 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         // 追评和回复
         List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), Constants.OPEN);
         List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
+
+
+        List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+        evaluateDTO.setQuickReplyTagList(EntityUtil.changeEntityListByJSON(EvaluateTagsDTO.class, tagsList));
         // 追评和回复的图片
         for (EvaluateReplyDTO replyDTO : replyDTOList) {
             List<TabEvaluateImg> evaluateReplyImgList = evaluateImgService.listImageByEvaluateReplyId(replyDTO.getEvaluateReplyId());
             List<String> replyImgList = Optional.ofNullable(evaluateReplyImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
             replyDTO.setImgList(replyImgList);
+
+            List<TabEvaluateTags> replyTagsList = evaluateTagsService.listEvaluateTags(replyDTO.getEnterpriseId(), replyDTO.getEvaluateId(), replyDTO.getEvaluateReplyId());
+            replyDTO.setQuickReplyTagList(EntityUtil.changeEntityListByJSON(EvaluateTagsDTO.class, tagsList));
         }
         evaluateDTO.setReplyList(replyDTOList);
 
@@ -528,4 +523,23 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         }
         return false;
     }
+
+    private void saveQuick(String tagIds, Integer enterpriseId, Integer evaluateId, Long memberId) {
+        if (StringUtils.isNotBlank(tagIds)) {
+            String[] tagIdArr = tagIds.split(GlobalInfo.FLAG_COMMA);
+            for (String tagId : tagIdArr) {
+                evaluateTagsService.saveQuick(Integer.valueOf(tagId), enterpriseId, evaluateId, memberId);
+            }
+        }
+    }
+
+    private void saveQuick(String tagIds, Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, Long memberId) {
+        if (StringUtils.isNotBlank(tagIds)) {
+            String[] tagIdArr = tagIds.split(GlobalInfo.FLAG_COMMA);
+            for (String tagId : tagIdArr) {
+                evaluateTagsService.saveQuick(Integer.valueOf(tagId), enterpriseId, evaluateId, evaluateReplyId, memberId);
+            }
+        }
+    }
+
 }

gic-evaluate-service/src/main/resources/mapper/TabEvaluateTagsMapper.xml

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.gic.evaluate.entity.TabEvaluateTags">
     <id column="evaluate_tags_id" jdbcType="INTEGER" property="evaluateTagsId" />
     <result column="evaluate_id" jdbcType="INTEGER" property="evaluateId" />
+    <result column="evaluate_reply_id" jdbcType="INTEGER" property="evaluateReplyId" />
     <result column="member_id" jdbcType="BIGINT" property="memberId" />
     <result column="tag_type" jdbcType="INTEGER" property="tagType" />
     <result column="tag_name" jdbcType="VARCHAR" property="tagName" />
@@ -13,8 +14,8 @@
     <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <sql id="Base_Column_List">
-    evaluate_tags_id, evaluate_id, member_id, tag_type, tag_name, create_time, update_time, 
-    enterprise_id, status
+    evaluate_tags_id, evaluate_id, evaluate_reply_id, member_id, tag_type, tag_name, 
+    create_time, update_time, enterprise_id, status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,14 +28,14 @@
     where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
-    insert into tab_evaluate_tags (evaluate_tags_id, evaluate_id, member_id, 
-      tag_type, tag_name, create_time, 
-      update_time, enterprise_id, status
-      )
-    values (#{evaluateTagsId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, #{memberId,jdbcType=BIGINT}, 
-      #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}
-      )
+    insert into tab_evaluate_tags (evaluate_tags_id, evaluate_id, evaluate_reply_id, 
+      member_id, tag_type, tag_name, 
+      create_time, update_time, enterprise_id, 
+      status)
+    values (#{evaluateTagsId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, #{evaluateReplyId,jdbcType=INTEGER}, 
+      #{memberId,jdbcType=BIGINT}, #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
     insert into tab_evaluate_tags
@@ -45,6 +46,9 @@
       <if test="evaluateId != null">
         evaluate_id,
       </if>
+      <if test="evaluateReplyId != null">
+        evaluate_reply_id,
+      </if>
       <if test="memberId != null">
         member_id,
       </if>
@@ -74,6 +78,9 @@
       <if test="evaluateId != null">
         #{evaluateId,jdbcType=INTEGER},
       </if>
+      <if test="evaluateReplyId != null">
+        #{evaluateReplyId,jdbcType=INTEGER},
+      </if>
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
@@ -103,6 +110,9 @@
       <if test="evaluateId != null">
         evaluate_id = #{evaluateId,jdbcType=INTEGER},
       </if>
+      <if test="evaluateReplyId != null">
+        evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER},
+      </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
@@ -130,6 +140,7 @@
   <update id="updateByPrimaryKey" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
     update tab_evaluate_tags
     set evaluate_id = #{evaluateId,jdbcType=INTEGER},
+      evaluate_reply_id = #{evaluateReplyId,jdbcType=INTEGER},
       member_id = #{memberId,jdbcType=BIGINT},
       tag_type = #{tagType,jdbcType=INTEGER},
       tag_name = #{tagName,jdbcType=VARCHAR},
@@ -139,4 +150,18 @@
       status = #{status,jdbcType=INTEGER}
     where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
   </update>
+  <select id="listEvaluateTags" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_tags
+    where enterprise_id = #{enterpriseId}
+    and status = 1
+    and evaluate_id = #{evaluateId}
+    <if test="evaluateReplyId != null ">
+        and evaluate_reply_id = #{evaluateReplyId}
+    </if>
+    <if test="evaluateReplyId == null ">
+        and evaluate_reply_id is null
+    </if>
+  </select>
 </mapper>
\ No newline at end of file