接受订单信息

gic-evaluate-service/pom.xml

@@ -26,6 +26,7 @@
         <gic-evaluate-api>4.0-SNAPSHOT</gic-evaluate-api>
         <gic-member-api>4.0-SNAPSHOT</gic-member-api>
         <gic-order-api>4.0-SNAPSHOT</gic-order-api>
+        <gic-platform-enterprise-api>4.0-SNAPSHOT</gic-platform-enterprise-api>
     </properties>
 
     <dependencies>
@@ -111,6 +112,11 @@
         </dependency>
         <dependency>
             <groupId>com.gic</groupId>
+            <artifactId>gic-platform-enterprise-api</artifactId>
+            <version>${gic-platform-enterprise-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
             <artifactId>gic-member-api</artifactId>
             <version>${gic-member-api}</version>
         </dependency>

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 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.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.Constants;
 import com.gic.evaluate.dto.EvaluateMsgLogDTO;
@@ -12,12 +13,18 @@ import com.gic.evaluate.entity.TabEvaluateOrderConfig;
 import com.gic.evaluate.service.EvaluateMsgLogApiService;
 import com.gic.evaluate.service.EvaluateMsgLogService;
 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;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
+import java.util.*;
 
 /**
  *
@@ -29,12 +36,16 @@ import java.util.Date;
 public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
 
     private Logger logger = LogManager.getLogger(EvaluateMsgLogApiServiceImpl.class);
-    
+
     @Autowired
     private EvaluateMsgLogService evaluateMsgLogService;
     @Autowired
     private EvaluateOrderConfigService evaluateOrderConfigService;
-    
+    @Autowired
+    private CuDetailService cuDetailService;
+    @Autowired
+    private NoticeRouterApiService noticeRouterApiService;
+
     @Override
     public ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO) {
         logger.info("保存评价提醒日志信息：{}", JSON.toJSONString(evaluateMsgLogDTO));
@@ -73,11 +84,67 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
 
     @Override
     public ServiceResponse<Void> timerSendMemberMessage() {
-        return null;
+        // todo 查询到所有的企业id
+        List<Integer> enterpriseIds = Arrays.asList(1129);
+        for (Integer enterpriseId : enterpriseIds) {
+            GicMQClient client = GICMQClientUtil.getClientInstance();
+            try {
+                client.sendMessage("enterSendMemberMessage", enterpriseId.toString());
+            } catch (Exception e) {
+                logger.info("发送队列错误", e);
+            }
+            //            sendMessageToMQ("quartzEnterSendMemberMessage", message);
+        }
+        return EnterpriseServiceResponse.success();
     }
 
     @Override
-    public ServiceResponse<Void> queueSendMemberMessage(String enterpriseId) {
+    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) {
+        for (TabEvaluateMsgLog log : firstMsgLogs) {
+
+            // 发送信息
+            MQNoticeSendDTO notice = new MQNoticeSendDTO();
+
+            // 企业ID
+            notice.setEnterpriseId(enterpriseId);
+
+            // 会员卡域id
+            notice.setMemberAreaId(log.getMemberAreaId());
+
+            // 事件code
+            notice.setNoticeCode(NoticeConstant.NOTICE_ORDER_EVALUATE);
+
+            // 会员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));
+
+            // 事件需要的事件级变量 ，具体变量参考附件
+            notice.setValueMap(valueMap);
+
+            this.noticeRouterApiService.putNoticeSendRouter(notice);
+        }
+    }
 }

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

@@ -12,6 +12,7 @@ import com.gic.evaluate.constant.ReplyEnum;
 import com.gic.evaluate.dto.EvaluateDTO;
 import com.gic.evaluate.dto.EvaluateReplyDTO;
 import com.gic.evaluate.dto.MemberReplyDTO;
+import com.gic.evaluate.dto.OrderGoodsDTO;
 import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateOutQO;
 import com.gic.evaluate.qo.OrderStatusQO;
@@ -80,8 +81,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         if (overLimitTime(evaluateOrderConfig, orderListDetailDTO.getOrderDTO().getReceiptsTime())) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已超越评价期限，无法评价");
         }
-
-        evaluateDTO.setGoodsInfo(JSON.toJSONString(orderListDetailDTO.getOrderItemList()));
+        List<OrderGoodsDTO> dtoList = EntityUtil.changeEntityListByJSON(OrderGoodsDTO.class, orderListDetailDTO.getOrderItemList());
+        evaluateDTO.setGoodsInfo(JSON.toJSONString(dtoList));
         StoreDTO storeDTO = storeApiService.getStoreById(evaluateDTO.getEnterpriseId(), Integer.valueOf(orderListDetailDTO.getOrderDTO().getStoreIdOffline())).getResult();
         evaluateDTO.setStoreName(storeDTO.getStoreName());
         evaluateDTO.setStoreCode(storeDTO.getStoreCode());

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

@@ -23,7 +23,9 @@
     <dubbo:service interface="com.gic.evaluate.service.EvaluateMsgLogApiService" ref="evaluateMsgLogApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.member.api.service.MemberUserApiService" id="memberUserApiService" timeout="6000" />
     <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.order.api.service.OrderApiService" id="orderApiService" timeout="6000" />
 
 <!--    <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />-->

gic-evaluate-web/src/main/java/com/gic/evaluate/web/vo/UserReplyVO.java

@@ -23,7 +23,7 @@ public class UserReplyVO implements Serializable {
     /**
      * 评论id
      */
-    private Integer evaluateId;
+    private Integer[] evaluateIds;
 
     /**
      * 回复内容
@@ -56,12 +56,12 @@ public class UserReplyVO implements Serializable {
         this.enterpriseId = enterpriseId;
     }
 
-    public Integer getEvaluateId() {
-        return evaluateId;
+    public Integer[] getEvaluateIds() {
+        return evaluateIds;
     }
 
-    public void setEvaluateId(Integer evaluateId) {
-        this.evaluateId = evaluateId;
+    public void setEvaluateIds(Integer[] evaluateIds) {
+        this.evaluateIds = evaluateIds;
     }
 
     public String getReplyContent() {