From 24f7f046f8854d63839ad52d0cff34ea45a0f449 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 12 十一月 2024 13:10:17 +0800
Subject: [PATCH] 优化

---
 src/main/java/com/mzl/flower/schedule/ScheduleService.java |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index 109e14c..c4ff1b0 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -1,5 +1,6 @@
 package com.mzl.flower.schedule;
 
+import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mzl.flower.constant.Constants;
 import com.mzl.flower.dto.response.member.MemberGrowthRecordVO;
@@ -11,21 +12,25 @@
 import com.mzl.flower.mapper.member.MemberGrowthRecordMapper;
 import com.mzl.flower.mapper.partner.PartnerMapper;
 import com.mzl.flower.mapper.payment.OrderMapper;
+import com.mzl.flower.service.BaseService;
 import com.mzl.flower.service.coupon.CouponRecordService;
 import com.mzl.flower.service.coupon.CouponTemplateService2;
 import com.mzl.flower.service.flower.FlowerCategoryService;
-import com.mzl.flower.service.flower.FlowerService;
 import com.mzl.flower.service.menber.impl.GrowthValueDealService;
 import com.mzl.flower.service.payment.*;
+import com.mzl.flower.thread.FlowerCategoryPriceThread;
+import com.mzl.flower.utils.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,9 +43,6 @@
 
     @Autowired
     private PartnerMapper partnerMapper;
-
-    @Autowired
-    private FlowerService flowerService;
 
     @Autowired
     private OrderMapper orderMapper;
@@ -75,23 +77,13 @@
     @Autowired
     private CouponTemplateService2 couponTemplateService2;
 
-    @Scheduled(cron = "1 0/30 * * * ?")
+    @Autowired
+    private FlowerCategoryPriceThread thread;
+
+    @Scheduled(cron = "1 1 0/2 * * ?")
     public void calculateAvePrice() {
         log.info("均价计算开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
-        List<FlowerCategory> cLs = categoryMapper.selectList(new QueryWrapper<FlowerCategory>()
-                .isNotNull("parent_id"));
-        if(cLs != null && cLs.size() > 0){
-            List<Partner> ls = partnerMapper.selectList(new QueryWrapper<Partner>().eq("status", "P"));
-            for(FlowerCategory c : cLs){
-                flowerService.calculateCategoryDaily(c.getId(), null);
-
-                if(ls != null && ls.size() > 0){
-                    for(Partner p : ls){
-                        flowerService.calculateCategoryDaily(c.getId(), p.getId());
-                    }
-                }
-            }
-        }
+        thread.run();
         log.info("均价计算结束:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
     }
 
@@ -264,6 +256,29 @@
         log.info("优惠券记录过期开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
     }
 
-
+    @Scheduled(cron = "0 15 17 * * ?")
+    @Profile("prod")
+    public void DealSendMessageInfoBySupplier() {
+        log.info("供应商下单供货提示开始:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+        // 获取当前日期
+        LocalDate currentDate = LocalDate.now();
+        // 设置开始时间为前一天的17点以后
+        LocalDateTime startDateTime = LocalDateTime.of(currentDate.minusDays(1), LocalTime.of(17, 0));
+        // 设置结束时间为当前日期的17点
+        LocalDateTime endDateTime = LocalDateTime.of(currentDate, LocalTime.of(17, 0));
+        System.out.println("开始时间: " + startDateTime);
+        System.out.println("结束时间: " + endDateTime);
+        List<String> sends = orderMapper.getWaitSendMessageInfoBySupplier("COLLECTION", startDateTime, endDateTime);
+        if(CollectionUtils.isNotEmpty(sends)) {
+            sends.forEach(s -> {
+                try {
+                    SmsUtil.sendSms(s, "SMS_474905508", null);
+                } catch (ClientException e) {
+                    log.error("发送短信失败,手机号:" + s, e);
+                }
+            });
+        }
+        log.info("供应商下单供货提示结束:" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+    }
 
 }

--
Gitblit v1.9.3