保存接口

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

@@ -61,6 +61,12 @@ public interface TabEvaluateMapper {
 
     Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO);
 
+    void updateShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") List<Integer> evaluateId, @Param("showStatus") Integer showStatus);
+
+    void updateTopHotStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("topHotStatus") Integer topHotStatus);
+
+    void updateMaliciousStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("maliciousStatus") Integer maliciousStatus);
+
     Map<String, Long> getTotalChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     Map<String, Long> getGoodsCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime);

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

@@ -55,10 +55,4 @@ public interface TabEvaluateReplyMapper {
     int updateByPrimaryKey(TabEvaluateReply record);
 
     List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId);
-
-    void updateShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") List<Integer> evaluateId, @Param("showStatus") Integer showStatus);
-
-    void updateTopHotStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("topHotStatus") Integer topHotStatus);
-
-    void updateMaliciousStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("maliciousStatus") Integer maliciousStatus);
 }
\ No newline at end of file

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

@@ -15,15 +15,9 @@ import java.util.List;
 public interface EvaluateReplyService {
     List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId);
 
-    void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
-
-    void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus);
-
-    void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
-
     void saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
 
-    void saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
+    int saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
 
     void delReply(Integer evaluateReplyId);
 }

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

@@ -23,6 +23,12 @@ public interface EvaluateService {
 
     void saveEvaluate(EvaluateDTO evaluateDTO);
 
+    void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
+
+    void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus);
+
+    void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
+
     Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime);
 
     Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime);
@@ -42,4 +48,6 @@ public interface EvaluateService {
     List<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
 
     TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber);
+
+    void updateEvaluate(EvaluateDTO evaluateDTO);
 }

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

@@ -31,21 +31,6 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     }
 
     @Override
-    public void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
-        tabEvaluateReplyMapper.updateShowStatus(enterpriseId, evaluateId, showStatus);
-    }
-
-    @Override
-    public void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus) {
-        tabEvaluateReplyMapper.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
-    }
-
-    @Override
-    public void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus) {
-        tabEvaluateReplyMapper.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
-    }
-
-    @Override
     public void saveUserReplyEvaluate(UserReplyDTO userReplyDTO) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEnterpriseId(userReplyDTO.getEnterpriseId());
@@ -61,7 +46,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     }
 
     @Override
-    public void saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO) {
+    public int saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEnterpriseId(memberReplyDTO.getEnterpriseId());
         tabEvaluateReply.setEvaluateId(memberReplyDTO.getEvaluateId());
@@ -72,7 +57,7 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
         tabEvaluateReply.setMemberName(memberReplyDTO.getMemberName());
         tabEvaluateReply.setStatus(Constants.NORMAL_STATUS);
         tabEvaluateReply.setCreateTime(new Date());
-        tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
+        return tabEvaluateReplyMapper.insertSelective(tabEvaluateReply);
     }
 
     @Override

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

@@ -64,6 +64,21 @@ public class EvaluateServiceImpl implements EvaluateService {
     }
 
     @Override
+    public void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
+        tabEvaluateMapper.updateShowStatus(enterpriseId, evaluateId, showStatus);
+    }
+
+    @Override
+    public void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus) {
+        tabEvaluateMapper.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
+    }
+
+    @Override
+    public void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus) {
+        tabEvaluateMapper.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
+    }
+
+    @Override
     public Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime) {
         return tabEvaluateMapper.getTotalChart(enterpriseId, startTime, endTime);
     }
@@ -114,4 +129,10 @@ public class EvaluateServiceImpl implements EvaluateService {
     public TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber) {
         return tabEvaluateMapper.getEvaluateByOrderNumber(enterpriseId, orderNumber);
     }
+
+    @Override
+    public void updateEvaluate(EvaluateDTO evaluateDTO) {
+        TabEvaluate evaluate = EntityUtil.changeEntityByJSON(TabEvaluate.class, evaluateDTO);
+        tabEvaluateMapper.updateByPrimaryKeySelective(evaluate);
+    }
 }

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

@@ -16,6 +16,7 @@ import com.gic.evaluate.service.EvaluateReplyService;
 import com.gic.evaluate.service.EvaluateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  *
@@ -57,8 +58,16 @@ public class EvaluateHanbanApiServiceImpl implements EvaluateHaobanApiService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> saveReply(MemberReplyDTO memberReplyDTO) {
-        evaluateReplyService.saveMemberReplyEvaluate(memberReplyDTO);
+        // 保存追评
+        int line = evaluateReplyService.saveMemberReplyEvaluate(memberReplyDTO);
+        if (line > 0) {
+            EvaluateDTO evaluateDTO = new EvaluateDTO();
+            evaluateDTO.setEvaluateId(memberReplyDTO.getEvaluateId());
+            evaluateDTO.setReplyStatus(Constants.OPEN);
+            evaluateService.updateEvaluate(evaluateDTO);
+        }
         return EnterpriseServiceResponse.success();
     }
 

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

@@ -6,6 +6,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 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.EvaluateReplyDTO;
 import com.gic.evaluate.dto.UserReplyDTO;
@@ -17,6 +18,7 @@ import com.gic.evaluate.service.EvaluateReplyService;
 import com.gic.evaluate.service.EvaluateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
 import java.util.List;
@@ -57,26 +59,35 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
 
     @Override
     public ServiceResponse<Void> updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
-        this.evaluateReplyService.updateShowStatus(enterpriseId, evaluateId, showStatus);
+        this.evaluateService.updateShowStatus(enterpriseId, evaluateId, showStatus);
         return EnterpriseServiceResponse.success();
     }
 
     @Override
     public ServiceResponse<Void> updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus) {
-        this.evaluateReplyService.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
+        this.evaluateService.updateTopHotStatus(enterpriseId, evaluateId, topHotStatus);
         return EnterpriseServiceResponse.success();
     }
 
     @Override
     public ServiceResponse<Void> updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus) {
-        this.evaluateReplyService.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
-        this.evaluateReplyService.updateShowStatus(enterpriseId, Collections.singletonList(evaluateId), maliciousStatus);
+        this.evaluateService.updateMaliciousStatus(enterpriseId, evaluateId, maliciousStatus);
+        if (Constants.OPEN.equals(maliciousStatus)) {
+            this.evaluateService.updateShowStatus(enterpriseId, Collections.singletonList(evaluateId), Constants.CLOSE);
+        } else if (Constants.CLOSE.equals(maliciousStatus)) {
+            this.evaluateService.updateShowStatus(enterpriseId, Collections.singletonList(evaluateId), Constants.OPEN);
+        }
         return EnterpriseServiceResponse.success();
     }
 
     @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);
         return EnterpriseServiceResponse.success();
     }
 

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

@@ -16,6 +16,9 @@
     <dubbo:protocol name="dubbo" port="20350"/>
     <!--门店域-->
     <dubbo:service interface="com.gic.evaluate.service.EvaluateConfigApiService" ref="evaluateConfigApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.evaluate.service.EvaluateHaobanApiService" ref="evaluateHaobanApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.evaluate.service.EvaluateOverviewApiService" ref="evaluateOverviewApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.evaluate.service.EvaluateManageApiService" ref="evaluateManageApiService" timeout="6000" />
 <!--    <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />-->
 
 </beans>

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

@@ -511,6 +511,21 @@
         </if>
     </if>
   </select>
+  <update id="updateShowStatus">
+    update tab_evaluate set show_status = #{showStatus} where enterprise_id = #{enterpriseId}
+    <if test="null != evaluateId and evaluateId.size > 0">
+      and evaluate_id in
+      <foreach collection="evaluateId" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+  </update>
+  <update id="updateTopHotStatus">
+    update tab_evaluate set top_hot_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
+  </update>
+  <update id="updateMaliciousStatus">
+    update tab_evaluate set malicious_status = #{maliciousStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
+  </update>
   <select id="getTotalChart" resultType="map">
     SELECT
 	count(*) totalCount,

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

@@ -191,21 +191,6 @@
     from tab_evaluate_reply
     where enterprise_id = #{enterpriseId}
     and evaluate_id = #{evaluateId}
+    and status = 1
   </select>
-  <update id="updateShowStatus">
-    update tab_evaluate_reply set show_status = #{showStatus} where enterprise_id = #{enterpriseId}
-    <if test="null != ids and evaluateId.size > 0">
-      and evaluate_id in
-      <foreach collection="evaluateId" index="index" item="item" open="(" separator="," close=")">
-        #{item}
-      </foreach>
-    </if>
-  </update>
-  <update id="updateTopHotStatus">
-    update tab_evaluate_reply set top_hot_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
-  </update>
-  <update id="updateMaliciousStatus">
-    update tab_evaluate_reply set malicious_status = #{maliciousStatus} where enterprise_id = #{enterpriseId} and evaluate_id = #{evaluateId}
-  </update>
-
 </mapper>
\ No newline at end of file

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

+package com.gic.evaluate.web.controller;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+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.UserReplyDTO;
+import com.gic.evaluate.qo.EvaluateQO;
+import com.gic.evaluate.service.EvaluateManageApiService;
+import com.gic.evaluate.web.vo.UserReplyVO;
+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;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2019-12-30 18:33
+ */
+@RestController
+public class EvaluateManagerController {
+
+    @Autowired
+    private EvaluateManageApiService evaluateManageApiService;
+
+    @RequestMapping("/list-evaluate")
+    public RestResponse listEvaluate(EvaluateQO evaluateQO) {
+        evaluateQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        ServiceResponse<Page<EvaluateDTO>> serviceResponse = evaluateManageApiService.listEvaluateForManage(evaluateQO);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/get-evaluate")
+    public RestResponse getEvaluate(Integer evaluateId) {
+        ServiceResponse<EvaluateDTO> serviceResponse = evaluateManageApiService.getEvaluate(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/update-show-status")
+    public RestResponse updateShowStatus(Integer[] evaluateIdList, Integer showStatus) {
+        ServiceResponse<Void> serviceResponse = evaluateManageApiService.updateShowStatus(UserDetailUtils.getUserDetail().getEnterpriseId(), Arrays.asList(evaluateIdList), showStatus);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/update-top-hot-status")
+    public RestResponse updateTopHotStatus(Integer evaluateId, Integer topHotStatus) {
+        ServiceResponse<Void> serviceResponse = evaluateManageApiService.updateTopHotStatus(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateId, topHotStatus);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/update-malicious-status")
+    public RestResponse updateMaliciousStatus(Integer evaluateId, Integer maliciousStatus) {
+        ServiceResponse<Void> serviceResponse = evaluateManageApiService.updateMaliciousStatus(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateId, maliciousStatus);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/reply-evaluate")
+    public RestResponse replyEvaluate(UserReplyVO userReplyVO) {
+        userReplyVO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        userReplyVO.setUserId(UserDetailUtils.getUserDetail().getUserId());
+        userReplyVO.setUserName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
+        ServiceResponse<Void> serviceResponse = evaluateManageApiService.replyEvaluate(EntityUtil.changeEntityByJSON(UserReplyDTO.class, userReplyVO));
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/del-reply")
+    public RestResponse delReply(Integer evaluateReplyId) {
+        ServiceResponse<Void> serviceResponse = evaluateManageApiService.delReply(evaluateReplyId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+}

gic-evaluate-web/src/main/java/com/gic/evaluate/web/vo/UserReplyVO.java

+package com.gic.evaluate.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * 管理员回复
+ * @Description:
+ * @author zhiwj
+ * @date 2019-12-26 18:32
+ */
+public class UserReplyVO implements Serializable {
+    private static final long serialVersionUID = -7855916448409509250L;
+    /**
+     *
+     */
+    private Integer evaluateReplyId;
+
+    /**
+     * 商户id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 评论id
+     */
+    private Integer evaluateId;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     *
+     */
+    private Integer userId;
+
+    /**
+     *
+     */
+    private String userName;
+
+    public Integer getEvaluateReplyId() {
+        return evaluateReplyId;
+    }
+
+    public void setEvaluateReplyId(Integer evaluateReplyId) {
+        this.evaluateReplyId = evaluateReplyId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

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

@@ -15,6 +15,9 @@
     <dubbo:application name="gic-evaluate-web"/>
 
     <dubbo:reference interface="com.gic.evaluate.service.EvaluateConfigApiService" id="evaluateConfigApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.evaluate.service.EvaluateHaobanApiService" id="evaluateHaobanApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.evaluate.service.EvaluateOverviewApiService" id="evaluateOverviewApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.evaluate.service.EvaluateManageApiService" id="evaluateManageApiService" timeout="6000" retries="0"/>
     <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" />
+    <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000" retries="0"/>
 </beans>
\ No newline at end of file