添加渠道资源对管理员的判断

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

@@ -18,7 +18,10 @@ public class StoreScoreQO extends PageQO {
     private Integer sortType;
     private Integer storeGroupId;
     private String search;
+    private String startTime;
+    private String endTime;
     private List<Integer> storeIdList;
+    private Integer storeId;
 
     public Integer getEnterpriseId() {
         return enterpriseId;
@@ -71,4 +74,28 @@ public class StoreScoreQO extends PageQO {
     public Integer getPageNum() {
         return this.getCurrentPage();
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
 }

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

@@ -154,4 +154,16 @@ public interface EvaluateManageApiService {
      * @throws 
      */
     ServiceResponse<Integer> computeStoreScoreEvaluate(String msg);
+
+    /**
+     * 重新计算某一个门店的分数
+     * @Title: computeStoreScoreEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     * @throws
+     */
+    ServiceResponse<Integer> computeStoreScoreEvaluate(Integer enterpriseId, Integer storeId);
 }

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

@@ -2,6 +2,7 @@ package com.gic.evaluate.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.dto.EnterpriseDTO;
@@ -146,6 +147,10 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         } else if (Constants.CLOSE.equals(maliciousStatus)) {
             this.evaluateService.updateShowStatus(enterpriseId, Collections.singletonList(evaluateId), Constants.OPEN);
         }
+        TabEvaluate evaluate = this.evaluateService.getEvaluate(enterpriseId, evaluateId);
+        if (evaluate != null && evaluate.getStoreId() != null) {
+            this.computeStoreScoreEvaluate(enterpriseId, evaluate.getStoreId());
+        }
         return EnterpriseServiceResponse.success();
     }
 
@@ -212,6 +217,7 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
             StoreScoreQO storeScoreQO = new StoreScoreQO();
             storeScoreQO.setEnterpriseId(enterpriseId);
             storeScoreQO.setCurrentPage(1);
+            storeScoreQO.setEndTime(DateUtil.dateToStr(DateUtil.getStartTimeOfDay(), DateUtil.FORMAT_DATETIME_19));
             storeScoreQO.setPageSize(Integer.MAX_VALUE);
             List<Map<String, Object>> list = this.evaluateService.listStoreScore(storeScoreQO);
             for (Map<String, Object> stringObjectMap : list) {
@@ -247,4 +253,48 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         return EnterpriseServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<Integer> computeStoreScoreEvaluate(Integer enterpriseId, Integer storeId) {
+        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
+        EvaluateQO evaluateQO = new EvaluateQO();
+        evaluateQO.setMaliciousStatus(Constants.CLOSE);
+        evaluateQO.setShowStatus(Constants.OPEN);
+
+        StoreScoreQO storeScoreQO = new StoreScoreQO();
+        storeScoreQO.setEnterpriseId(enterpriseId);
+        storeScoreQO.setStoreId(storeId);
+        storeScoreQO.setCurrentPage(1);
+        storeScoreQO.setEndTime(DateUtil.dateToStr(DateUtil.getStartTimeOfDay(), DateUtil.FORMAT_DATETIME_19));
+        storeScoreQO.setPageSize(Integer.MAX_VALUE);
+        List<Map<String, Object>> list = this.evaluateService.listStoreScore(storeScoreQO);
+        for (Map<String, Object> stringObjectMap : list) {
+            Object goodsScore = stringObjectMap.get("goodsScore");
+            Object storeScore = stringObjectMap.get("storeScore");
+            Object serviceScore = stringObjectMap.get("serviceScore");
+
+            int count = 0;
+            double sum = 0;
+            if (Constants.OPEN.equals(evaluateOrderConfig.getGoods()) && goodsScore != null) {
+                count++;
+                sum += Double.valueOf(goodsScore.toString());
+            }
+            if (Constants.OPEN.equals(evaluateOrderConfig.getStore()) && storeScore != null) {
+                count++;
+                sum += Double.valueOf(storeScore.toString());
+            }
+            if (Constants.OPEN.equals(evaluateOrderConfig.getService()) && serviceScore != null) {
+                count++;
+                sum += Double.valueOf(serviceScore.toString());
+            }
+            if (count > 0) {
+                if (storeId != null) {
+                    evaluateQO.setStoreIdList(Collections.singletonList(storeId));
+                    Integer evaluateCount = this.evaluateService.countEvaluate(evaluateQO);
+                    storeApiService.updateScore(enterpriseId, storeId, sum / count, evaluateCount);
+                }
+            }
+        }
+        return EnterpriseServiceResponse.success();
+    }
+
 }

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

@@ -759,9 +759,18 @@
     <if test="storeGroupId != null ">
         and store_group_id = #{storeGroupId}
     </if>
+    <if test="storeId != null ">
+      and store_id = #{storeId}
+    </if>
     <if test="search != null and search != '' ">
         and store_name like concat('%', #{search}, '%')
     </if>
+    <if test="startTime != null and startTime != '' ">
+        and evaluate_time &gt;= #{startTime}
+    </if>
+    <if test="endTime != null and endTime != '' ">
+        and evaluate_time &lt;= #{endTime}
+    </if>
     group by store_id, store_name, store_group_name
     <if test="sortColumn != null ">
         <if test="sortColumn == 1">