添加评价人数

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

@@ -15,10 +15,7 @@ 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.TabEvaluateImg;
-import com.gic.evaluate.entity.TabEvaluateQuick;
-import com.gic.evaluate.entity.TabEvaluateReply;
+import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.service.*;
@@ -52,6 +49,9 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     private EnterpriseApiService enterpriseApiService;
     @Autowired
     private StoreApiService storeApiService;
+    @Autowired
+    private EvaluateOrderConfigService evaluateOrderConfigService;
+
 
     @Override
     public ServiceResponse<Page<EvaluateDTO>> listEvaluateForManage(EvaluateQO evaluateQO) {
@@ -205,7 +205,10 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         List<EnterpriseDTO> enterpriseList = enterpriseApiService.listEnterpriseByName(null).getResult();
         List<Integer> enterpriseIds = Optional.ofNullable(enterpriseList).orElse(Collections.emptyList()).stream().map(EnterpriseDTO::getEnterpriseId).collect(Collectors.toList());
         EvaluateQO evaluateQO = new EvaluateQO();
+        evaluateQO.setMaliciousStatus(Constants.CLOSE);
+        evaluateQO.setShowStatus(Constants.OPEN);
         for (Integer enterpriseId : enterpriseIds) {
+            TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
             StoreScoreQO storeScoreQO = new StoreScoreQO();
             storeScoreQO.setEnterpriseId(enterpriseId);
             storeScoreQO.setCurrentPage(1);
@@ -214,28 +217,30 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
             for (Map<String, Object> stringObjectMap : list) {
                 Object goodsScore = stringObjectMap.get("goodsScore");
                 Object storeScore = stringObjectMap.get("storeScore");
-                Object serviceScore = stringObjectMap.get("serviceScore").toString();
+                Object serviceScore = stringObjectMap.get("serviceScore");
 
                 int count = 0;
                 double sum = 0;
-                if (goodsScore != null) {
+                if (Constants.OPEN.equals(evaluateOrderConfig.getGoods()) && goodsScore != null) {
                     count++;
                     sum += Double.valueOf(goodsScore.toString());
                 }
-                if (storeScore != null) {
+                if (Constants.OPEN.equals(evaluateOrderConfig.getStore()) && storeScore != null) {
                     count++;
                     sum += Double.valueOf(storeScore.toString());
                 }
-                if (serviceScore != null) {
+                if (Constants.OPEN.equals(evaluateOrderConfig.getService()) && serviceScore != null) {
                     count++;
                     sum += Double.valueOf(serviceScore.toString());
                 }
-                Object storeId = stringObjectMap.get("storeId");
-                if (storeId != null) {
-                    Integer storeIdInt = Integer.valueOf(storeId.toString());
-                    evaluateQO.setStoreIdList(Collections.singletonList(storeIdInt));
-                    Integer evaluateCount = this.evaluateService.countEvaluate(evaluateQO);
-                    storeApiService.updateScore(enterpriseId, storeIdInt, sum / count, evaluateCount);
+                if (count > 0) {
+                    Object storeId = stringObjectMap.get("storeId");
+                    if (storeId != null) {
+                        Integer storeIdInt = Integer.valueOf(storeId.toString());
+                        evaluateQO.setStoreIdList(Collections.singletonList(storeIdInt));
+                        Integer evaluateCount = this.evaluateService.countEvaluate(evaluateQO);
+                        storeApiService.updateScore(enterpriseId, storeIdInt, sum / count, evaluateCount);
+                    }
                 }
             }
         }