评价bug修改

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

@@ -83,6 +83,17 @@ public interface EvaluateOutApiService {
      */
     ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList);
 
+    /**
+     * 查询门店的评价数
+     * @Title: queryEvaluateCountByStoreId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.Long,java.lang.Integer>>
+     * @throws
+     */
+    ServiceResponse<Map<Integer, Integer>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList);
 
     /**
      * 用户隐藏追评

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

@@ -108,4 +108,7 @@ public interface TabEvaluateMapper {
     Set<Integer> getStoreHasTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
 
     Integer countEvaluateTrend(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("ids") List<Integer> storeIdList, @Param("quickReplyType") Integer quickReplyType);
+
+    @MapKey("storeId")
+    Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
 }
\ No newline at end of file

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

@@ -76,4 +76,6 @@ public interface EvaluateService {
     Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime , List<Integer> storeIdList, Integer quickReplyTypeEnumCode);
 
     boolean hasMaliciousStatusBeforeHours(Integer evaluateId, Integer badEvaluateTagType);
+
+    Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList);
 }

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

@@ -292,6 +292,11 @@ public class EvaluateServiceImpl implements EvaluateService {
         }
     }
 
+    @Override
+    public Map<Integer, Map<String, Object>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList) {
+        return this.tabEvaluateMapper.queryEvaluateCountByStoreId(enterpriseId, storeIdList);
+    }
+
     private List<String> getYear() {
         List<String> list = new ArrayList<>();
         int year = DateUtil.getYear(new Date());

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

@@ -305,7 +305,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
     @Override
     public ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList) {
-        logger.info("查询订单状态：{}", JSON.toJSONString(orderIdList));
+//        logger.info("查询订单状态：{}", JSON.toJSONString(orderIdList));
         Map<Long, Integer> resultMap = new HashMap<>();
         TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
 
@@ -353,7 +353,18 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         return EnterpriseServiceResponse.success(resultMap);
     }
 
-//    @Override
+    @Override
+    public ServiceResponse<Map<Integer, Integer>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList) {
+        Map<Integer, Integer> resultMap = new HashMap<>();
+        Map<Integer, Map<String, Object>> evaluateCountByStoreIdMap = this.evaluateService.queryEvaluateCountByStoreId(enterpriseId, storeIdList);
+        for (Integer storeId : storeIdList) {
+            Map<String, Object> map = evaluateCountByStoreIdMap.get(storeId);
+            resultMap.put(storeId, map != null ? Integer.valueOf(map.get("evaluateCount").toString()) : 0);
+        }
+        return EnterpriseServiceResponse.success(resultMap);
+    }
+
+    //    @Override
 //    public ServiceResponse<Void> updateShowStatus(Integer enterpriseId, Integer evaluateReplyId, Long memberId, Integer showStatus) {
 //        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
 //        if (Constants.OPEN.equals(evaluateOrderConfig.getReviewUserHidden())) {

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

@@ -80,7 +80,7 @@
       <if test="endTime != null and endTime != '' ">
         and evaluate_time &lt;= #{endTime}
       </if>
-      and ( 1=1
+      and ( 1=0
       <if test="badEvaluateStatus != null ">
         or bad_evaluate_status = #{badEvaluateStatus}
       </if>
@@ -96,7 +96,7 @@
       <if test="maliciousStatus != null ">
         or malicious_status = #{maliciousStatus}
       </if>
-      or ( 1=1
+      or ( 1=0
       <if test="goodsCompute != null and goodsCompute != '' and goodsScore != null ">
         and goods_score ${goodsCompute} #{goodsScore}
       </if>
@@ -969,4 +969,19 @@
       </foreach>
     </if>
   </select>
+  <select id="queryEvaluateCountByStoreId" resultType="map">
+    select
+    store_id storeId,
+    count(*) evaluateCount
+    from tab_evaluate
+    where enterprise_id = #{enterpriseId}
+    and status = 1
+    <if test="null != ids">
+      and store_id in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    group by store_id
+  </select>
 </mapper>
\ No newline at end of file