修改bug

gic-evaluate-service/pom.xml

@@ -135,6 +135,11 @@
             <artifactId>gic-marketing-process-api</artifactId>
             <version>${gic-marketing-process-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-data-api</artifactId>
+            <version>${gic-data-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -67,8 +67,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     @Autowired
     private StoreApiService storeApiService;
     @Autowired
-    private EvaluateMsgLogService evaluateMsgLogService;
-    @Autowired
     private EvaluateTagsService evaluateTagsService;
 //    @Autowired
 //    private NoticeRouterApiService noticeRouterApiService;

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

@@ -4,6 +4,8 @@ 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.PageHelperUtils;
+import com.gic.data.api.dto.StoreOrderEvaluateDTO;
+import com.gic.data.api.service.StoreEvaluateApiService;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.QuickReplyTypeEnum;
@@ -42,6 +44,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
     private EvaluateMsgLogService evaluateMsgLogService;
     @Autowired
     private EvaluateQuickService evaluateQuickService;
+    @Autowired
+    StoreEvaluateApiService storeEvaluateApiService;
 
     @Override
     public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
@@ -138,22 +142,18 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
                     }
             ).collect(Collectors.toList());
             // todo 这里要取数据组的数据
-            Map<Integer, Map<String, Object>> orderCountMap = evaluateMsgLogService.orderCountByStoreId(storeTrendQO.getEnterpriseId(), storeIdList);
+            Map<Integer, StoreOrderEvaluateDTO> orderCountMap = storeEvaluateApiService.getStoreOrderEvaluateByStoreId(storeTrendQO.getEnterpriseId(), storeIdList).getResult();
+//            Map<Integer, Map<String, Object>> orderCountMap = evaluateMsgLogService.orderCountByStoreId(storeTrendQO.getEnterpriseId(), storeIdList);
             for (Map<String, Object> e : trendList) {
                 // e.put("evaluateRate", 0);
                 Object storeId = e.get("storeId");
                 if (storeId != null) {
-                    Map<String, Object> map = orderCountMap.get(Integer.valueOf(storeId.toString()));
-                    if (map != null) {
-                        Long totalCount = (Long) e.get("totalCount");
-                        Long orderCount = (Long) map.get("orderCount");
-                        Long goodCount = (Long) e.get("goodCount");
+                    StoreOrderEvaluateDTO storeOrderEvaluateDTO = orderCountMap.get(Integer.valueOf(storeId.toString()));
+                    if (storeOrderEvaluateDTO != null) {
+//                        Long totalCount = (Long) e.get("totalCount");
+//                        Long goodCount = (Long) e.get("goodCount");
                         BigDecimal goodRate = (BigDecimal) e.get("goodRate");
-                        if (orderCount != null && orderCount != 0) {
-                            e.put("evaluateRate", (double)Math.round(totalCount.doubleValue() / orderCount.doubleValue()*10000)/100 + "%");
-                        } else {
-                            e.put("evaluateRate", 0);
-                        }
+                        e.put("evaluateRate", storeOrderEvaluateDTO.getEvaluateRate());
 
                         if (goodRate != null) {
                             e.put("goodRate", (double)Math.round(goodRate.doubleValue() * 10000) / 100 + "%");

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

@@ -28,6 +28,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000" />
     <!--<dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000" />-->
     <dubbo:reference interface="com.gic.order.api.service.OrderApiService" id="orderApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.data.api.service.StoreEvaluateApiService" id="storeEvaluateApiService" timeout="6000" />
 
 <!--    <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />-->