1.针对A01客户的过期时间单独设置,并且无论填没填都会发送邮件

2.针对修改数量后,价格没有发送变化。

1.针对A01客户的过期时间单独设置,并且无论填没填都会发送邮件
2.针对修改数量后,价格没有发送变化。
chenhang4442024
1 parent 92856c5f
Showing 4 changed files with 51 additions and 17 deletions
src/main/java/com/order/erp/domain/EmailTemplateEnum.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -15,7 +15,7 @@ public enum EmailTemplateEnum {
     CONFIRM_SAMPLE_TEMPLATE("确认样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的确认样确认，请尽快完成", 1L),
-    OTHER_SAMPLE_TEMPLATE("其他要求样品发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的其他要求样品的发送，请尽快完成", 2L),
+    OTHER_SAMPLE_TEMPLATE("EXTRA,SHOWROOM,ONLINE sample发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的EXTRA,SHOWROOM,ONLINE sample的发送，请尽快完成", 2L),
     BIG_SAMPLE_TEMPLATE("大货样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的大货样确认，请尽快完成", 3L),
@@ -77,7 +77,6 @@ public class OrderOverTimeEventJob {
      */
      @Scheduled(cron = "0 0 5 * * ?")
-
     //存储的日期都必须为yyyy-MM-dd HH:mm:ss。
     public void checkOverTimeExecuteV2() {
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList();
@@ -421,9 +420,28 @@ public class OrderOverTimeEventJob {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
             LocalDate today = LocalDate.now();
             LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            //对于A01的订单,最晚订舱日期要为12天或者6天,海运为12天,空运为6天,其他的订单为10天。  对于A01来说,不管你填写没有,也要提醒,即使你填写了,也要提醒。
+        if(eventJobVO.getBaseInfo().getCustomerCode().contains("A01")){
+            //海运
+            if("SEA".equals(eventJobVO.getBaseInfo().getOutboundType())){
+               if(Constant.FOURTEEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                   return true;
+               }
+            }
+            else if("AIR".equals(eventJobVO.getBaseInfo().getOutboundType())){
+                if(Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                    return true;
+                }
+            }else{
+                if(Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                    return true;
+                }
+            }
+        }else{
             if ( Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getLatestBkTime())) {
                 return true;
             }
+        }
         return false;
     }
@@ -117,7 +117,7 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
     long countRecentYear();
-    ServerResult checkChargeOrderCount(List<Long> orderIds);
+    ServerResult checkChargeOrderCount(OrderBaseInfoVO baseInfoVO);
     List<OrderBaseInfoDO>  getEventList();
@@ -59,6 +59,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -128,7 +129,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private OrderOpinionLogService orderOpinionLogService;
-
+    @Resource
+    private RedisUtils redisUtils;
     @Resource
     private EasyPdfUtils pdfUtils;
@@ -1728,7 +1730,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         StringBuilder stringBuilder = new StringBuilder(productionComment);
                         stringBuilder.append("\n").append(date + ":" + resultText);
                         orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                     }
                     trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
@@ -1752,7 +1755,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         StringBuilder stringBuilder = new StringBuilder(productionComment);
                         stringBuilder.append("\n").append(date + ": " + resultText);
                         orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                     }
                     trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
@@ -1775,7 +1779,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         StringBuilder stringBuilder = new StringBuilder(productionComment);
                         stringBuilder.append("\n").append(date + ": " + resultText);
                         orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                     }
                     trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
                 }
@@ -1795,7 +1800,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         StringBuilder stringBuilder = new StringBuilder(productionComment);
                         stringBuilder.append("\n").append(date + ": " + resultText);
                         orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                     }
                     trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
@@ -1841,7 +1847,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     StringBuilder stringBuilder = new StringBuilder(productionComment);
                     stringBuilder.append("\n").append(date+": "+resultText);
                     orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                 }
                 if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getShippmentSampleConfirmResult())) {
                     String resultText = updateVO.getTrackStageInfo().getShippmentSampleConfirmResult().contains("ok")
@@ -1854,7 +1861,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     StringBuilder stringBuilder = new StringBuilder(productionComment);
                     stringBuilder.append("\n").append(date+": "+resultText);
                     orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                 }
                 if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getAitexTestFinishResult())){
                     String resultText =updateVO.getTrackStageInfo().getAitexTestFinishResult().contains("ok")
@@ -1867,7 +1875,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     StringBuilder stringBuilder = new StringBuilder(productionComment);
                     stringBuilder.append("\n").append(date+": "+resultText);
                     orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                 }
                 if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getSgsTestFinishResult())){
                     String resultText = updateVO.getTrackStageInfo().getSgsTestFinishResult().contains("ok")
@@ -1880,7 +1889,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     StringBuilder stringBuilder = new StringBuilder(productionComment);
                     stringBuilder.append("\n").append(date+": "+resultText);
                     orderBaseInfoDo.setProductionComment(stringBuilder.toString());
-                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
                 }
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
@@ -1970,7 +1980,13 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
-
+//这个方法的作用就是:她们反应对于内部编号相同的订单,就不需要发送四个测试结果的产品意见信息,不然创建一个订单就发送四个测试结果,太麻烦了,所以这里根据项目号和测试结果进行区分。
+    public void setEmailSendUtilsRedis(OrderBaseInfoDO orderBaseInfoDo,String resultText,String productionComment){
+        if(!redisUtils.hasKey(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText)){
+            sendProductionCommentEmail(orderBaseInfoDo,productionComment);
+            redisUtils.set(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText, "1", 90, TimeUnit.DAYS);
+        }
+    }
     /**
      * @param orderId
      * @param userId
@@ -2053,7 +2069,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (Objects.nonNull(baseInfoVO.getOrderCount())) {
             baseInfoDO.setOrderCount(baseInfoVO.getOrderCount());
-            checkChargeOrderCount(Arrays.asList(baseInfoVO.getId()));
+            checkChargeOrderCount(baseInfoVO);
         }
         if (StringUtils.isNotBlank(baseInfoVO.getOrderComposition())) {
             baseInfoDO.setOrderComposition(baseInfoVO.getOrderComposition());
@@ -2254,10 +2270,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
-    public ServerResult checkChargeOrderCount(List<Long> ids) {
+    public ServerResult checkChargeOrderCount(OrderBaseInfoVO baseInfoVO) {
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(CollectionUtils.isNotEmpty(ids), OrderBaseInfoDO::getId, ids)
+                .in(CollectionUtils.isNotEmpty(Arrays.asList(baseInfoVO.getId())), OrderBaseInfoDO::getId, Arrays.asList(baseInfoVO.getId()))
                 .ne(OrderBaseInfoDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
         List<OrderBaseInfoDO> ordersDOS = list(queryWrapper);
@@ -2277,7 +2293,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 for (OrderInfoResultVO resultVO : orderInfoResultVOS) {
                     if (profitAnalysisDOMap.containsKey(resultVO.getId())) {
                         OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(resultVO.getId());
-                        Integer orderCount = resultVO.getOrderCount();
+                        Integer orderCount = baseInfoVO.getOrderCount();
                         BigDecimal customerTotalPrice = new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()).setScale(Constant.TWO, RoundingMode.HALF_UP);
                         BigDecimal customerPrice = new BigDecimal(profitAnalysisDO.getCustomerPrice()).setScale(Constant.TWO, RoundingMode.HALF_UP);