添加接口

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

+package com.gic.evaluate.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-01-14 15:47
+ */
+public class EvaluateQuickDTO implements Serializable {
+    private static final long serialVersionUID = -7244265977730686632L;
+
+    /**
+     * 快捷标签id
+     */
+    private Integer evaluateQuickId;
+
+    /**
+     * 标签类型 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 getEvaluateQuickId() {
+        return evaluateQuickId;
+    }
+
+    public void setEvaluateQuickId(Integer evaluateQuickId) {
+        this.evaluateQuickId = evaluateQuickId;
+    }
+
+    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-api/src/main/java/com/gic/evaluate/dto/UserReplyDTO.java

@@ -20,10 +20,11 @@ public class UserReplyDTO implements Serializable {
      */
     private Integer enterpriseId;
 
+    private Integer evaluateId;
     /**
      * 评论id
      */
-    private Integer evaluateId;
+    private Integer[] evaluateIds;
 
     /**
      * 回复内容
@@ -56,12 +57,12 @@ public class UserReplyDTO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getEvaluateId() {
-        return evaluateId;
+    public Integer[] getEvaluateIds() {
+        return evaluateIds;
     }
 
-    public void setEvaluateId(Integer evaluateId) {
-        this.evaluateId = evaluateId;
+    public void setEvaluateIds(Integer[] evaluateIds) {
+        this.evaluateIds = evaluateIds;
     }
 
     public String getReplyContent() {
@@ -87,4 +88,12 @@ public class UserReplyDTO implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/EvaluateQO.java

@@ -2,6 +2,8 @@ package com.gic.evaluate.qo;
 
 import com.gic.enterprise.qo.PageQO;
 
+import java.util.List;
+
 /**
  * 
  * @ClassName: EvaluateQO
@@ -86,6 +88,13 @@ public class EvaluateQO extends PageQO{
      */
     private Integer orderByType;
 
+    /**
+     * 门店选择器d
+     */
+    private Integer storeWidgetId;
+
+    private List<Integer> storeIdList;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -269,4 +278,20 @@ public class EvaluateQO extends PageQO{
     public void setOrderByType(Integer orderByType) {
         this.orderByType = orderByType;
     }
+
+    public Integer getStoreWidgetId() {
+        return storeWidgetId;
+    }
+
+    public void setStoreWidgetId(Integer storeWidgetId) {
+        this.storeWidgetId = storeWidgetId;
+    }
+
+    public List<Integer> getStoreIdList() {
+        return storeIdList;
+    }
+
+    public void setStoreIdList(List<Integer> storeIdList) {
+        this.storeIdList = storeIdList;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateManageApiService.java

@@ -3,6 +3,7 @@ package com.gic.evaluate.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.EvaluateQuickDTO;
 import com.gic.evaluate.dto.UserReplyDTO;
 import com.gic.evaluate.qo.EvaluateQO;
 
@@ -110,4 +111,16 @@ public interface EvaluateManageApiService {
      * @throws
      */
     ServiceResponse<Integer> getStoreTopHot(Integer enterpriseId, Integer storeId);
+
+    /**
+     * 快捷标签表
+     * @Title: listEvaluateQuickReply
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param quickReplyType
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.evaluate.dto.EvaluateQuickDTO>
+     * @throws
+     */
+    ServiceResponse<List<EvaluateQuickDTO>> listEvaluateQuickReply(Integer enterpriseId, Integer quickReplyType);
 }

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

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.qo.StoreTrendQO;

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

@@ -8,6 +8,7 @@ import com.gic.evaluate.constant.QuickReplyTypeEnum;
 import com.gic.evaluate.dao.mapper.TabEvaluateMapper;
 import com.gic.evaluate.dto.EvaluateDTO;
 import com.gic.evaluate.entity.TabEvaluate;
+import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.qo.StoreTrendQO;

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

@@ -8,12 +8,15 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.Constants;
 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.entity.TabEvaluate;
+import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.entity.TabEvaluateReply;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.service.EvaluateManageApiService;
+import com.gic.evaluate.service.EvaluateQuickService;
 import com.gic.evaluate.service.EvaluateReplyService;
 import com.gic.evaluate.service.EvaluateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,8 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     private EvaluateService evaluateService;
     @Autowired
     private EvaluateReplyService evaluateReplyService;
+    @Autowired
+    private EvaluateQuickService evaluateQuickService;
 
     @Override
     public ServiceResponse<Page<EvaluateDTO>> listEvaluateForManage(EvaluateQO evaluateQO) {
@@ -88,11 +93,14 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> replyEvaluate(UserReplyDTO userReplyDTO) {
-        this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
-        EvaluateDTO evaluateDTO = new EvaluateDTO();
-        evaluateDTO.setEvaluateId(userReplyDTO.getEvaluateId());
-        evaluateDTO.setReplyStatus(Constants.CLOSE);
-        this.evaluateService.updateEvaluate(evaluateDTO);
+        for(Integer evaluateId : userReplyDTO.getEvaluateIds()) {
+            userReplyDTO.setEvaluateId(evaluateId);
+            this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
+            EvaluateDTO evaluateDTO = new EvaluateDTO();
+            evaluateDTO.setEvaluateId(evaluateId);
+            evaluateDTO.setReplyStatus(Constants.CLOSE);
+            this.evaluateService.updateEvaluate(evaluateDTO);
+        }
         return EnterpriseServiceResponse.success();
     }
 
@@ -108,4 +116,10 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         return EnterpriseServiceResponse.success(evaluateId);
     }
 
+    @Override
+    public ServiceResponse<List<EvaluateQuickDTO>> listEvaluateQuickReply(Integer enterpriseId, Integer quickReplyType) {
+        List<TabEvaluateQuick> evaluateQuickList = this.evaluateQuickService.listEvaluateQuick(enterpriseId, quickReplyType);
+        return EnterpriseServiceResponse.success(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, evaluateQuickList));
+    }
+
 }

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

@@ -455,6 +455,12 @@
       <if test="enterpriseId != null ">
           and enterprise_id = #{enterpriseId}
       </if>
+      <if test="null != storeIdList and storeIdList.size > 0">
+        and store_id in
+        <foreach collection="storeIdList" index="index" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="search != null and search != '' ">
         and ( order_number like concat('%', #{search}, '%')
             or member_name like concat('%', #{search}, '%')

gic-evaluate-web/pom.xml

@@ -134,6 +134,11 @@
             <artifactId>gic-evaluate-api</artifactId>
             <version>${gic-evaluate-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-store-api</artifactId>
+            <version>${gic-store-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java

@@ -7,15 +7,18 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.evaluate.dto.EvaluateDTO;
+import com.gic.evaluate.dto.EvaluateQuickDTO;
 import com.gic.evaluate.dto.UserReplyDTO;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.service.EvaluateManageApiService;
 import com.gic.evaluate.web.vo.UserReplyVO;
+import com.gic.store.service.StoreWidgetApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author zhiwj
@@ -27,10 +30,17 @@ public class EvaluateManagerController {
 
     @Autowired
     private EvaluateManageApiService evaluateManageApiService;
+    @Autowired
+    private StoreWidgetApiService storeWidgetApiService;
+
 
     @RequestMapping("/list-evaluate")
     public RestResponse listEvaluate(EvaluateQO evaluateQO) {
         evaluateQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (evaluateQO.getStoreWidgetId() != null) {
+            ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateQO.getStoreWidgetId());
+            evaluateQO.setStoreIdList(serviceResponse.getResult());
+        }
         ServiceResponse<Page<EvaluateDTO>> serviceResponse = evaluateManageApiService.listEvaluateForManage(evaluateQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
@@ -74,6 +84,12 @@ public class EvaluateManagerController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/evaluate-quick-reply")
+    public RestResponse listEvaluateQuickReply(Integer quickReplyType) {
+        ServiceResponse<List<EvaluateQuickDTO>> serviceResponse = evaluateManageApiService.listEvaluateQuickReply(UserDetailUtils.getUserDetail().getEnterpriseId(), quickReplyType);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
     @RequestMapping("/del-reply")
     public RestResponse delReply(Integer evaluateReplyId) {
         ServiceResponse<Void> serviceResponse = evaluateManageApiService.delReply(evaluateReplyId);

gic-evaluate-web/src/main/resources/dubbo-gic-evaluate-web.xml

@@ -21,6 +21,8 @@
     <dubbo:reference interface="com.gic.evaluate.service.ProblemOutApiService" id="problemOutApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.evaluate.service.ProblemManageApiService" id="problemManageApiService" timeout="6000" />
 
+    <dubbo:reference interface="com.gic.store.service.StoreWidgetApiService" id="storeWidgetApiService" timeout="6000" />
+
     <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000" retries="0"/>
 </beans>
\ No newline at end of file