From a418ffcb12dc76fda8ee95e378a9e7bf6a1993c4 Mon Sep 17 00:00:00 2001
From: Lenovo <zhuacang@163.com>
Date: Thu, 11 Jul 2024 11:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/JobServiceImpl.java | 73 -------------------
 .../service/impl/MeituanServiceImpl.java      |  8 ++
 2 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/business/service/impl/JobServiceImpl.java

diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/JobServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/JobServiceImpl.java
deleted file mode 100644
index d505041..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/JobServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.ruoyi.business.service.impl;
-
-import com.ruoyi.business.domain.BusOrderInfo;
-import com.ruoyi.business.service.IAiService;
-import com.ruoyi.business.service.IBusOrderInfoService;
-import com.ruoyi.business.service.IMeituanService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Service
-@EnableScheduling
-public class JobServiceImpl {
-
-    private static final SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
-
-    @Autowired
-    private IMeituanService iMeituanService;
-
-    @Autowired
-    private IAiService aiService;
-
-    @Autowired
-    private IBusOrderInfoService orderInfoService;
-//    //初始延迟1秒，每隔2秒
-//    @Scheduled(fixedRateString = "2000",initialDelay = 1000)
-//    public void testFixedRate(){
-//        System.out.println("fixedRateString,当前时间：" +format.format(new Date()));
-//    }
-//
-//    //每次执行完延迟2秒
-//    @Scheduled(fixedDelayString= "2000")
-//    public void testFixedDelay(){
-//        System.out.println("fixedDelayString,当前时间：" +format.format(new Date()));
-//    }
-//
-//    //每隔3秒执行一次
-//    @Scheduled(cron="0/3 * * * * ?")
-//    public void testCron(){
-//        System.out.println("cron,当前时间：" +format.format(new Date()));
-//    }
-
-//    @Scheduled(fixedDelayString= "300000")//600000 5分钟
-//    public void testFixedDelay(){
-//        System.out.println("fixedDelayString,当前时间：" +format.format(new Date()));
-//        iMeituanService.orderInfoList();
-//    }
-//
-//
-//    @Scheduled(fixedDelayString= "300000")//600000 获取订单
-//    public void getAiList(){
-//        System.out.println("fixedDelayString,当前时间：" +format.format(new Date()));
-//        aiService.queryAiTask();
-//    }
-//
-//    @Scheduled(fixedDelayString= "60000")//600000
-//    public void setAi() throws ParseException {
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-//        BusOrderInfo orderInfo = new BusOrderInfo();
-//        List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoList(orderInfo); //
-//        for (BusOrderInfo busOrderInfo : list) {
-//            if (new Date().getTime() >= sdf.parse(busOrderInfo.getCompleteTime()).getTime()+60000){
-//                aiService.addAiTask(busOrderInfo.getPrivcyPhone(), busOrderInfo.getRecipientPhone());
-//            }
-//        }
-//    }
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
index be53e9a..9a10e94 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
@@ -341,6 +341,14 @@ public class MeituanServiceImpl implements IMeituanService {
                     orderInfo.setStoreCode(wmPoiId);
                     orderInfo.setDayseq(daySeq);
                     orderInfo.setOrderNo(wmOrderViewId);
+
+
+
+                    if(expectTime.contains("今日")){
+                        expectTime = expectTime.substring(3,expectTime.length());
+                    }
+
+
                     orderInfo.setCompleteTime("2024-"+expectTime);
                     orderInfo.setOrderStatus(statusDesc);
                     orderInfo.setCustomId(userId);