feat: ERP升级

1、订单超期事件

feat: ERP升级
1、订单超期事件
谢茂盛
1 parent 23e0e78b
Showing 2 changed files with 144 additions and 10 deletions
src/main/java/com/order/erp/domain/vo/order/OrderEventJobVO.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 订单基础信息表(OrderBaseInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderEventJobVO implements Serializable {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单基础信息
+     */
+    private OrderBaseInfoVO baseInfo;
+
+    /**
+     * 利润分析信息
+     */
+    private OrderProfitAnalysisVO profitAnalysisInfo;
+
+    /**
+     * 项目完成报告信息
+     */
+    private OrderCompletionReportVO reportInfo;
+
+    /**
+     * 跟单信息
+     */
+    private OrderTrackStageVO trackStageInfo;
+
+    /**
+     * 质检信息
+     */
+    private OrderInspectionStageVO inspectionStageInfo;
+
+}
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.order.erp.common.constant.Constant;
-import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.utils.EmailSendUtils;
 import com.order.erp.common.utils.StringUtils;
 import com.order.erp.common.utils.TransactionHelper;
@@ -12,8 +11,12 @@ import com.order.erp.domain.EmailTemplateEnum;
 import com.order.erp.domain.OrderEventEnum;
 import com.order.erp.domain.OrderStatusEnum;
 import com.order.erp.domain.dto.BaseDO;
-import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderInspectionStageDO;
+import com.order.erp.domain.dto.order.OrderTrackStageDO;
+import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
 import com.order.erp.domain.email.OrderProductEmailVO;
+import com.order.erp.domain.vo.order.OrderEventJobVO;
 import com.order.erp.domain.vo.order.ReceiveEmailConfigItemVO;
 import com.order.erp.service.order.*;
 import freemarker.template.TemplateException;
@@ -28,10 +31,7 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
  
@@ -91,11 +91,11 @@ public class OrderOverTimeEventJob {
         System.out.println("1111111111111111111111111");
         //只有跟单信息不为空时,才会有时间和状态。
         if (CollectionUtils.isNotEmpty(orderTrackStageList)) {
-            System.out.println("orderId"+baseInfoDOMap);
-            System.out.println("order Base Info"+inspectionStageDOMap);
+            System.out.println("orderId" + baseInfoDOMap);
+            System.out.println("order Base Info" + inspectionStageDOMap);
             orderTrackStageList.stream().forEach(x -> {
-                System.out.println("orderId"+x.getOrderId());
-                System.out.println("order Base Info"+baseInfoDOMap.get(x.getOrderId()));
+                        System.out.println("orderId" + x.getOrderId());
+                        System.out.println("order Base Info" + baseInfoDOMap.get(x.getOrderId()));
                         if (StringUtils.isBlank(baseInfoDOMap.get(x.getOrderId()).getOrderHodTime())) {
 //                            return ServerResult.fail("HODTime不能为空");
                         }
@@ -349,4 +349,86 @@ public class OrderOverTimeEventJob {
         }
     }*/
  
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void checkOverTimeExecuteV2() {
+        List<OrderEventJobVO> jobVOList = transfer2OrderEventList(null, null, null);
+
+        Map<String, List<OrderEventJobVO>> map = handlerOrderEvent(jobVOList);
+
+        for (Map.Entry<String, List<OrderEventJobVO>> entry : map.entrySet()) {
+
+            sendEmail4OrderEvent(OrderEventEnum.getEvent(entry.getKey()), entry.getValue());
+        }
+    }
+
+    /**
+     * @param eventEnum
+     * @param eventJobVOS
+     */
+    private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) {
+        // todo
+    }
+
+    /**
+     * @param orderBaseInfoList
+     * @param orderInspectionStageList
+     * @param orderTrackStageList
+     * @return
+     */
+    private List<OrderEventJobVO> transfer2OrderEventList(List<OrderBaseInfoDO> orderBaseInfoList, List<OrderInspectionStageDO> orderInspectionStageList, List<OrderTrackStageDO> orderTrackStageList) {
+
+        // todo
+        return null;
+    }
+
+    /**
+     * @param orderEventJobVOList
+     * @return
+     */
+    private Map<String, List<OrderEventJobVO>> handlerOrderEvent(List<OrderEventJobVO> orderEventJobVOList) {
+        Map<String, List<OrderEventJobVO>> map = new HashMap<>();
+        for (OrderEventJobVO eventJobVO : orderEventJobVOList) {
+            Map<String, OrderEventJobVO> eventJobVOMap = groupByOrderEvent(eventJobVO);
+            if (CollectionUtils.isNotEmpty(eventJobVOMap)) {
+                for (Map.Entry<String, OrderEventJobVO> entry : eventJobVOMap.entrySet()) {
+                    String key = entry.getKey();
+                    if (map.containsKey(key)) {
+                        List<OrderEventJobVO> list = map.get(key);
+                        list.add(entry.getValue());
+                        map.put(key, list);
+                    } else {
+                        List<OrderEventJobVO> list = new ArrayList<>();
+                        list.add(entry.getValue());
+                        map.put(key, list);
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
+    /**
+     * @param eventJobVO
+     * @return
+     */
+    private Map<String, OrderEventJobVO> groupByOrderEvent(OrderEventJobVO eventJobVO) {
+        Map<String, OrderEventJobVO> map = new HashMap<>();
+        if (filterConfirmSampleOrderEvent(eventJobVO)) {
+            map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+        }
+        // todo 其他订单超期事件判断
+        return map;
+    }
+
+    /**
+     * @param eventJobVO
+     * @return
+     */
+    private Boolean filterConfirmSampleOrderEvent(OrderEventJobVO eventJobVO) {
+
+        // todo 判断是否未能在规定的期限内完成以下货号的确认样确认
+
+        return true;
+    }
+
 }