接受订单信息

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

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluateMsgLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 public interface TabEvaluateMsgLogMapper {
     /**
@@ -52,4 +56,11 @@ public interface TabEvaluateMsgLogMapper {
     int updateByPrimaryKey(TabEvaluateMsgLog record);
 
     TabEvaluateMsgLog getByOrderId(Long orderId);
+
+    List<TabEvaluateMsgLog> listFirstMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
+
+    List<TabEvaluateMsgLog> listSecondMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
+
+    List<TabEvaluateMsgLog> listReviewMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
+
 }
\ No newline at end of file

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

@@ -2,6 +2,8 @@ package com.gic.evaluate.service;
 
 import com.gic.evaluate.entity.TabEvaluateMsgLog;
 
+import java.util.List;
+
 /**
  *
  * @Description:
@@ -12,4 +14,12 @@ public interface EvaluateMsgLogService {
     void save(TabEvaluateMsgLog evaluateMsgLog);
 
     TabEvaluateMsgLog getByOrderId(Long orderId);
+
+    List<TabEvaluateMsgLog> listFirstMsgLogs(Integer enterpriseId);
+
+    List<TabEvaluateMsgLog> listSecondMsgLogs(Integer enterpriseId);
+
+    List<TabEvaluateMsgLog> listReviewMsgLogs(Integer enterpriseId);
+
+    void update(TabEvaluateMsgLog log);
 }

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

 package com.gic.evaluate.service.impl;
 
+import com.gic.commons.util.DateUtil;
 import com.gic.evaluate.dao.mapper.TabEvaluateMsgLogMapper;
 import com.gic.evaluate.entity.TabEvaluateMsgLog;
 import com.gic.evaluate.service.EvaluateMsgLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  *
  * @Description:
@@ -18,7 +21,6 @@ public class EvaluateMsgLogServiceImpl implements EvaluateMsgLogService {
     @Autowired
     private TabEvaluateMsgLogMapper tabEvaluateMsgLogMapper;
 
-
     @Override
     public void save(TabEvaluateMsgLog evaluateMsgLog) {
         this.tabEvaluateMsgLogMapper.insertSelective(evaluateMsgLog);
@@ -28,4 +30,24 @@ public class EvaluateMsgLogServiceImpl implements EvaluateMsgLogService {
     public TabEvaluateMsgLog getByOrderId(Long orderId) {
         return this.tabEvaluateMsgLogMapper.getByOrderId(orderId);
     }
-}
+
+    @Override
+    public List<TabEvaluateMsgLog> listFirstMsgLogs(Integer enterpriseId) {
+        return tabEvaluateMsgLogMapper.listFirstMsgLogs(enterpriseId, DateUtil.getStartTimeOfDay(), DateUtil.getEndTimeOfDay());
+    }
+
+    @Override
+    public List<TabEvaluateMsgLog> listSecondMsgLogs(Integer enterpriseId) {
+        return tabEvaluateMsgLogMapper.listSecondMsgLogs(enterpriseId, DateUtil.getStartTimeOfDay(), DateUtil.getEndTimeOfDay());
+    }
+
+    @Override
+    public List<TabEvaluateMsgLog> listReviewMsgLogs(Integer enterpriseId) {
+        return tabEvaluateMsgLogMapper.listReviewMsgLogs(enterpriseId, DateUtil.getStartTimeOfDay(), DateUtil.getEndTimeOfDay());
+    }
+
+    @Override
+    public void update(TabEvaluateMsgLog log) {
+        tabEvaluateMsgLogMapper.updateByPrimaryKeySelective(log);
+    }
+}
\ No newline at end of file

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

@@ -89,7 +89,7 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
         for (Integer enterpriseId : enterpriseIds) {
             GicMQClient client = GICMQClientUtil.getClientInstance();
             try {
-                client.sendMessage("enterSendMemberMessage", enterpriseId.toString());
+                client.sendMessage("queueSendMemberMessage", enterpriseId.toString());
             } catch (Exception e) {
                 logger.info("发送队列错误", e);
             }
@@ -101,50 +101,62 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
     @Override
     public ServiceResponse<Void> queueSendMemberMessage(String message) {
         Integer enterpriseId = Integer.valueOf(message);
-//        List<TabEvaluateMsgLog> firstMsgLogs = this.evaluateMsgLogService.listFirstMsgLogs(enterpriseId);
-//        sendMsg(enterpriseId, firstMsgLogs);
-//        List<TabEvaluateMsgLog> secondMsgLogs = this.evaluateMsgLogService.listSecondMsgLogs(enterpriseId);
-//        sendMsg(enterpriseId, secondMsgLogs);
-//        List<TabEvaluateMsgLog> reviewMsgLogs = this.evaluateMsgLogService.listReviewMsgLogs(enterpriseId);
-//        sendMsg(enterpriseId, reviewMsgLogs);
-
-
-        return null;
-    }
-
-    private void sendMsg(Integer enterpriseId, List<TabEvaluateMsgLog> firstMsgLogs) {
+        List<TabEvaluateMsgLog> firstMsgLogs = this.evaluateMsgLogService.listFirstMsgLogs(enterpriseId);
         for (TabEvaluateMsgLog log : firstMsgLogs) {
+            sendMsg(enterpriseId, log);
+            log.setFirstRealSendTime(new Date());
+            log.setFirstStatus(2);
+            this.evaluateMsgLogService.update(log);
+        }
+        List<TabEvaluateMsgLog> secondMsgLogs = this.evaluateMsgLogService.listSecondMsgLogs(enterpriseId);
+        for (TabEvaluateMsgLog log : secondMsgLogs) {
+            sendMsg(enterpriseId, log);
+            log.setSecondSendTime(new Date());
+            log.setSecondStatus(2);
+            this.evaluateMsgLogService.update(log);
+        }
+        List<TabEvaluateMsgLog> reviewMsgLogs = this.evaluateMsgLogService.listReviewMsgLogs(enterpriseId);
+        for (TabEvaluateMsgLog log : reviewMsgLogs) {
+            sendMsg(enterpriseId, log);
+            log.setReviewSendTime(new Date());
+            log.setReviewStatus(2);
+            this.evaluateMsgLogService.update(log);
+        }
+        return EnterpriseServiceResponse.success();
+    }
 
-            // 发送信息
-            MQNoticeSendDTO notice = new MQNoticeSendDTO();
+    private void sendMsg(Integer enterpriseId, TabEvaluateMsgLog log) {
+        // 发送信息
+        MQNoticeSendDTO notice = new MQNoticeSendDTO();
 
-            // 企业ID
-            notice.setEnterpriseId(enterpriseId);
+        // 企业ID
+        notice.setEnterpriseId(enterpriseId);
 
-            // 会员卡域id
-            notice.setMemberAreaId(log.getMemberAreaId());
+        // 会员卡域id
+        notice.setMemberAreaId(log.getMemberAreaId());
 
-            // 事件code
-            notice.setNoticeCode(NoticeConstant.NOTICE_ORDER_EVALUATE);
+        // 事件code
+        notice.setNoticeCode(NoticeConstant.NOTICE_ORDER_EVALUATE);
 
-            // 会员ecuId
-            McuBaseInfoDTO mcuDTO = cuDetailService.getMcuPopoutInfo(log.getMcuId(), log.getEnterpriseId()).getResult();
-//            notice.setEcuId(mcuDTO.get);
+        // 会员ecuId
+        McuBaseInfoDTO mcuDTO = cuDetailService.getMcuPopoutInfo(log.getMcuId(), log.getEnterpriseId()).getResult();
+        //            notice.setEcuId(mcuDTO.get);
 
-            Map<String, String> valueMap = new HashMap<>();
-            //订单编号
-            valueMap.put(NoticeConstant.PARAMS_ORDER_NUMBER, log.getOrderNumber());
-            //商品详情
-            valueMap.put(NoticeConstant.PARAMS_GOODS_DETAIL, log.getGoodsInfo());
-            //订单金额
-            valueMap.put(NoticeConstant.PARAMS_ORDER_AMOUNT, log.getSaleAmount().toString());
-            //消费时间（时间）
-            valueMap.put(NoticeConstant.PARAMS_PAY_TIME, DateUtil.dateToStr(log.getReceiptsDate(), DateUtil.FORMAT_DATE_10));
+        Map<String, String> valueMap = new HashMap<>();
+        //订单编号
+        valueMap.put(NoticeConstant.PARAMS_ORDER_NUMBER, log.getOrderNumber());
+        //商品详情
+        valueMap.put(NoticeConstant.PARAMS_GOODS_DETAIL, log.getGoodsInfo());
+        //订单金额
+        valueMap.put(NoticeConstant.PARAMS_ORDER_AMOUNT, log.getSaleAmount().toString());
+        //消费时间（时间）
+        valueMap.put(NoticeConstant.PARAMS_PAY_TIME, DateUtil.dateToStr(log.getReceiptsDate(), DateUtil.FORMAT_DATE_10));
 
-            // 事件需要的事件级变量 ，具体变量参考附件
-            notice.setValueMap(valueMap);
+        // 事件需要的事件级变量 ，具体变量参考附件
+        notice.setValueMap(valueMap);
 
-            this.noticeRouterApiService.putNoticeSendRouter(notice);
-        }
+        this.noticeRouterApiService.putNoticeSendRouter(notice);
     }
+
+
 }

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

@@ -64,6 +64,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     private OrderApiService orderApiService;
     @Autowired
     private StoreApiService storeApiService;
+    @Autowired
+    private EvaluateMsgLogService evaluateMsgLogService;
 //    @Autowired
 //    private NoticeRouterApiService noticeRouterApiService;
 
@@ -72,7 +74,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         logger.info("保存订单评价:{}", JSON.toJSONString(evaluateDTO));
         TabEvaluate evaluate = evaluateService.getEvaluateByOrderId(evaluateDTO.getEnterpriseId(), evaluateDTO.getOrderId());
         if (evaluate != null) {
-            EnterpriseServiceResponse.failure(ErrorCode.DATA_EXISTS);
+            return EnterpriseServiceResponse.failure(ErrorCode.DATA_EXISTS);
         }
         TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(evaluateDTO.getEnterpriseId());
         OrderListDetailDTO orderListDetailDTO = orderApiService.getOrderDetail(evaluateDTO.getEnterpriseId(), evaluateDTO.getOrderId(), evaluateDTO.getMemberId()).getResult();
@@ -133,10 +135,21 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
         Integer evaluateId = evaluateService.saveEvaluate(evaluateDTO);
 
-        if (CollectionUtils.isNotEmpty(evaluateDTO.getImgList())) {
-            evaluateImgService.saveList(evaluateDTO.getEnterpriseId(), evaluateId, evaluateDTO.getImgList());
+        if (evaluateId != null) {
+            if (CollectionUtils.isNotEmpty(evaluateDTO.getImgList())) {
+                evaluateImgService.saveList(evaluateDTO.getEnterpriseId(), evaluateId, evaluateDTO.getImgList());
+            }
+            TabEvaluateMsgLog evaluateMsgLog = evaluateMsgLogService.getByOrderId(evaluateDTO.getOrderId());
+            if (evaluateMsgLog != null) {
+                evaluateMsgLog.setFirstStatus(0);
+                evaluateMsgLog.setReviewStatus(0);
+                evaluateMsgLog.setReviewStatus(0);
+                evaluateMsgLogService.update(evaluateMsgLog);
+            }
+
         }
 
+
         return EnterpriseServiceResponse.success();
     }
 
@@ -424,6 +437,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     }
 
     private boolean matchConfigValue(Integer computeType, Integer computeScore, Integer score) {
+        if (score == null) {
+            return true;
+        }
         switch (computeType) {
             case 1:
                 return score < computeScore;

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

@@ -282,9 +282,24 @@
     where evaluate_msg_log_id = #{evaluateMsgLogId,jdbcType=BIGINT}
   </update>
   <select id="getByOrderId" resultMap="BaseResultMap">
-      select
-      <include refid="Base_Column_List" />
-      from tab_evaluate_msg_log where order_id = #{orderId}
-      limit 1
-    </select>
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_msg_log where order_id = #{orderId}
+    limit 1
+  </select>
+  <select id="listFirstMsgLogs" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_msg_log where enterprise_id = #{enterpriseId} and first_send_time &gt;= #{startTimeOfDay} and first_send_time &lt;= #{endTimeOfDay} and status = 1
+  </select>
+  <select id="listSecondMsgLogs" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_msg_log where enterprise_id = #{enterpriseId} and second_send_time &gt;= #{startTimeOfDay} and second_send_time &lt;= #{endTimeOfDay} and status = 1
+  </select>
+  <select id="listReviewMsgLogs" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate_msg_log where enterprise_id = #{enterpriseId} and review_send_time &gt;= #{startTimeOfDay} and review_send_time &lt;= #{endTimeOfDay} and status = 1
+  </select>
 </mapper>
\ No newline at end of file