From c08fd5bf9ea186ec09ef5b3c828c8db29dd50808 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 25 Jul 2024 13:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/peanut/modules/job/task/CourseTask.java  | 4 ++--
 src/main/java/com/peanut/modules/job/task/ExpressTask.java | 7 +++++++
 .../com/peanut/modules/job/task/UserCourseBuyTask.java     | 2 +-
 src/main/java/com/peanut/modules/job/task/UserVipTask.java | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/peanut/modules/job/task/CourseTask.java b/src/main/java/com/peanut/modules/job/task/CourseTask.java
index 80b1fbcb..c9dedb6b 100644
--- a/src/main/java/com/peanut/modules/job/task/CourseTask.java
+++ b/src/main/java/com/peanut/modules/job/task/CourseTask.java
@@ -39,7 +39,7 @@ public class CourseTask implements ITask{
                                     userCourseBuyEntity.getId(),
                                     messagePostProcessor(DateUtils.addYears(userCourseBuyEntity.getCreateTime(),1).getTime()-new Date().getTime())
                             );
-                            System.out.println("未开始学习，超过一年自动开始，加入队列");
+                            System.out.println(new Date()+"未开始学习，超过一年自动开始，加入队列");
                         }
                     }else {
                         //结束时间，过期删除
@@ -50,7 +50,7 @@ public class CourseTask implements ITask{
                                     userCourseBuyEntity.getId(),
                                     messagePostProcessor(userCourseBuyEntity.getEndTime().getTime()-new Date().getTime())
                             );
-                            System.out.println("过期删除，加入队列");
+                            System.out.println(new Date()+"过期删除，加入队列");
                         }
                     }
                 }
diff --git a/src/main/java/com/peanut/modules/job/task/ExpressTask.java b/src/main/java/com/peanut/modules/job/task/ExpressTask.java
index c1fad9a2..1fc1311f 100644
--- a/src/main/java/com/peanut/modules/job/task/ExpressTask.java
+++ b/src/main/java/com/peanut/modules/job/task/ExpressTask.java
@@ -7,8 +7,11 @@ import com.peanut.modules.book.service.BuyOrderProductService;
 import com.peanut.modules.book.service.BuyOrderService;
 import com.peanut.modules.book.service.ExpressOrderService;
 import com.peanut.modules.common.service.ShopProductRecordService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -26,6 +29,7 @@ public class ExpressTask implements ITask{
 
     @Override
     public void run(String params) {
+        System.out.println(new Date());
         System.out.println("------expressTask定时任务正在执行------");
         System.out.println("------查询快递修改状态定时任务正在执行------");
         System.out.println("------expressTask定时任务正在执行------");
@@ -44,6 +48,9 @@ public class ExpressTask implements ITask{
                 if (plist.size() > 0){
                     boolean flag = true;
                     for (Map<String,Object> m : plist){
+                        if (m.get("express_order_sn")==null||m.get("express_order_sn")==null||m.get("consignee_mobile")==null){
+                            continue;
+                        }
                         String expressOrderSn = m.get("express_order_sn").toString();
                         String consigneeMobile = m.get("consignee_mobile").toString();
                         String expressCompanyCode = m.get("express_company_code").toString();
diff --git a/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java b/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java
index d2957b01..87c99759 100644
--- a/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java
+++ b/src/main/java/com/peanut/modules/job/task/UserCourseBuyTask.java
@@ -66,7 +66,7 @@ public class UserCourseBuyTask implements ITask{
             classResultSet.close();
             yljkconn.close();
             fzdsconn.close();
-            System.out.println("userCourseBuy同步完成");
+            System.out.println(new Date()+"userCourseBuy同步完成");
         }catch (Exception e) {
             System.out.println("---------");
             System.out.println("Error: " + e.getMessage());
diff --git a/src/main/java/com/peanut/modules/job/task/UserVipTask.java b/src/main/java/com/peanut/modules/job/task/UserVipTask.java
index af840480..3c63e253 100644
--- a/src/main/java/com/peanut/modules/job/task/UserVipTask.java
+++ b/src/main/java/com/peanut/modules/job/task/UserVipTask.java
@@ -71,7 +71,7 @@ public class UserVipTask implements ITask{
                             userVip.getId(),
                             messagePostProcessor(userVip.getEndTime().getTime()-new Date().getTime())
                     );
-                    System.out.println("-------------------------会员还剩2天，加入队列");
+                    System.out.println(new Date()+"-"+userVip.getUserId()+"-会员还剩2天，加入队列");
                 }
             }
         }