接受订单信息

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/OrderReplyEnum.java

@@ -13,7 +13,7 @@ public enum OrderReplyEnum {
     REPLIED(1),
     // 有新的追评
     HAS_NEW(2),
-    // 评价逾期
+    // 评价逾期 并且没评价过
     EVALUATE_OVERDUE(3),
     // 不支持追评
     REPLY_NOT_SUPPORT(4),
@@ -21,6 +21,8 @@ public enum OrderReplyEnum {
     REPLY_OVERDUE(5),
     // 追评超过最大数量
     REPLY_OVER_MAX_TIMES(6),
+    // 评价逾期 并且评价过
+    EVALUATE_HAS_OVERDUE(7),
     ;
 
     private Integer code;

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

@@ -72,7 +72,7 @@ public interface EvaluateOutApiService {
     ServiceResponse<EvaluateDTO> listEvaluateByOrderId(EvaluateOutQO evaluateOutQO);
 
     /**
-     * 查询订单号对应的回复状态 key是订单号， value是状态（-1:未评价  0管理员没有回复过  1管理员回复了   2有新的追评管理员没回复  3逾期不可评价    4不支持追评    6超过最大追评次数 ）
+     * 查询订单号对应的回复状态 key是订单号， value是状态（-1:未评价  0管理员没有回复过  1管理员回复了   2有新的追评管理员没回复  3逾期并且没有评价过    4不支持追评    6超过最大追评次数  7逾期并且评价过）
      * @Title: queryRelayStatusByOrderId
      * @Description:
      * @author zhiwj

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

@@ -5,7 +5,9 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
+import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.evaluate.constant.Constants;
 import com.gic.evaluate.dto.EvaluateMsgLogDTO;
 import com.gic.evaluate.entity.TabEvaluateMsgLog;
@@ -16,7 +18,6 @@ import com.gic.evaluate.service.EvaluateOrderConfigService;
 import com.gic.marketing.process.api.dto.notice.MQNoticeSendDTO;
 import com.gic.marketing.process.api.service.notice.NoticeRouterApiService;
 import com.gic.marketing.process.api.utils.NoticeConstant;
-import com.gic.member.api.dto.McuBaseInfoDTO;
 import com.gic.member.api.service.CuDetailService;
 import com.gic.mq.sdk.GicMQClient;
 import org.apache.logging.log4j.LogManager;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -45,6 +47,8 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
     private CuDetailService cuDetailService;
     @Autowired
     private NoticeRouterApiService noticeRouterApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     @Override
     public ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO) {
@@ -84,8 +88,10 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
 
     @Override
     public ServiceResponse<Void> timerSendMemberMessage() {
-        // todo 查询到所有的企业id
-        List<Integer> enterpriseIds = Arrays.asList(1129);
+        // 查询到所有的企业id
+        List<EnterpriseDTO> enterpriseList = enterpriseApiService.listEnterpriseByName(null).getResult();
+        List<Integer> enterpriseIds = Optional.ofNullable(enterpriseList).orElse(Collections.emptyList()).stream().map(EnterpriseDTO::getEnterpriseId).collect(Collectors.toList());
+        //        List<Integer> enterpriseIds = enterpriseList
         for (Integer enterpriseId : enterpriseIds) {
             GicMQClient client = GICMQClientUtil.getClientInstance();
             try {
@@ -139,8 +145,8 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
         notice.setNoticeCode(NoticeConstant.NOTICE_ORDER_EVALUATE);
 
         // 会员ecuId
-        McuBaseInfoDTO mcuDTO = cuDetailService.getMcuPopoutInfo(log.getMcuId(), log.getEnterpriseId()).getResult();
-        //            notice.setEcuId(mcuDTO.get);
+        Long ecuId = cuDetailService.getEcuIdByMcuId(log.getMcuId(), log.getEnterpriseId()).getResult();
+        notice.setEcuId(ecuId);
 
         Map<String, String> valueMap = new HashMap<>();
         //订单编号

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

@@ -313,7 +313,11 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
                 // 判断是否超过评价时间
                 if (overLimitTime(evaluateOrderConfig, orderListDetailDTO.getOrderDTO().getReceiptsTime())) {
                     // 超过评价时间
-                    resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_OVERDUE.getCode());
+                    if (evaluate == null) {
+                        resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_OVERDUE.getCode());
+                    } else {
+                        resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_HAS_OVERDUE.getCode());
+                    }
                 } else {
                     // 没有超过评价时间
                     if (evaluate != null) {

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

@@ -25,6 +25,7 @@
     <dubbo:reference interface="com.gic.member.api.service.CuDetailService" id="cuDetailService" timeout="6000" />
     <dubbo:reference interface="com.gic.marketing.process.api.service.notice.NoticeRouterApiService" id="noticeRouterApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.store.service.StoreApiService" id="storeApiService" timeout="6000" />
+    <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" />