Merge pull request '江体小程序和zlb接口开发' (#1) from feat/script_v1 into master

Reviewed-on: https://gitea.xiangtech.xyz/XiangZ/script/pulls/1

src/main/java/com/xiang/common/enums/ScheduleEnums.java

@@ -38,6 +38,9 @@ public enum ScheduleEnums {
     JNTYZX_VENUE_TODAY_SUBSCRIBE_TASK(4, "jt-miniApp", "jntyzxVenueTodaySubscribeTask"),
     JNTYZX_VENUE_TOMORROW_PULL_TASK(4, "jt-miniApp", "jntyzxVenueTodayPullTask"),
     JNTYZX_USER_INFO_CONFIG(4, "jt-miniApp", "jntyzxUserInfoConfigTask"),
+    JNTYZX_VENUE_INFO_TODAY_RESULT_TASK(4, "jt-miniApp", "jtVenueInfoTodayResultTask"),
+    JNTYZX_VENUE_INFO_TOMORROW_RESULT_TASK(4, "jt-miniApp", "jtVenueInfoTomorrowResultTask"),
+
     ;
 
     private final Integer moduleCode;

src/main/java/com/xiang/common/manage/jntyzx/zlb/IZlbOrderInfoManage.java

@@ -0,0 +1,11 @@
+package com.xiang.common.manage.jntyzx.zlb;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-05-09 15:11
+ */
+public interface IZlbOrderInfoManage extends IService<ZlbPayOrder> {
+}

src/main/java/com/xiang/common/manage/jntyzx/zlb/ZlbOrderInfoManageImpl.java

@@ -0,0 +1,15 @@
+package com.xiang.common.manage.jntyzx.zlb;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xiang.common.mapper.ZlbOrderInfoMapper;
+import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: xiang
+ * @Date: 2026-05-09 15:11
+ */
+@Service
+public class ZlbOrderInfoManageImpl extends ServiceImpl<ZlbOrderInfoMapper, ZlbPayOrder> implements IZlbOrderInfoManage {
+}

src/main/java/com/xiang/common/utils/HttpService.java

@@ -73,7 +73,7 @@ public class HttpService {
         CloseableHttpResponse response = null;
         String result = "";
         try {
-            log.info("HTTP请求，请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
+            log.debug("HTTP请求，请求地址===>{}, 请求头===>{}, 请求参数===>{}", url, JSON.toJSONString(header), jsonParams);
             HttpPost httpPost = new HttpPost(url);
             httpPost.addHeader("Content-Type", "application/json");
             // 创建请求内容
@@ -88,7 +88,7 @@ public class HttpService {
             }
             response = httpClient.execute(httpPost);
             result = EntityUtils.toString(response.getEntity(), "utf-8");
-            log.info("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
+            log.debug("【POST请求】 请求地址===>{}, 响应结果==={}", url, result);
         } catch (Exception e) {
             log.error("doPost异常", e);
         } finally {
@@ -117,10 +117,10 @@ public class HttpService {
                     httpGet.setHeader(entry.getKey(), entry.getValue());
                 }
             }
-            log.info("doGet请求：请求头:{},请求地址：{}", header, url + request);
+            log.debug("doGet请求：请求头:{},请求地址：{}", header, url + request);
             response = httpClient.execute(httpGet);
             result = EntityUtils.toString(response.getEntity(), "utf-8");
-            log.info("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
+            log.debug("【GET请求】, 请求地址===>{}, 响应结果===>{}", url + request, result);
         } catch (Exception e) {
             log.error("doGet异常：", e);
         } finally {

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxMiniappScheduleConfig.java

@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 定时任务配置器
+ *
  * @Author: xiang
  * @Date: 2026-05-09 08:56
  */
@@ -20,35 +22,69 @@ public class JntyzxMiniappScheduleConfig {
     private final JtVenueSubscribeTask jtVenueSubscribeTask;
     private final JtVenueTomorrowPullTask jtVenueTomorrowPullTask;
     private final JntyzxUserInfoConfigTask jntyzxUserInfoConfigTask;
+    private final JtVenueInfoTodayResultTask jtVenueInfoTodayResultTask;
+    private final JtVenueInfoTomorrowResultTask jtVenueInfoTomorrowResultTask;
 
-
+    /**
+     * token刷新
+     */
     @Scheduled(cron = "0 20,50 * * * ?")
     @GetMapping("/jtTokenRefreshTask")
     public void jtTokenRefreshTask() {
         jtTokenRefreshTask.run();
     }
 
-//    @Scheduled(cron = "0 0/1 10-18 * * ?")
+    /**
+     * 每分钟场地信息更新
+     */
+    @Scheduled(cron = "0 0/1 10-18 * * ?")
     @GetMapping("/jtVenuePullTask")
     public void jtVenuePullTask() {
         jtVenuePullTask.run();
     }
 
+    /**
+     * 拉取第二天场地信息
+     */
     @Scheduled(cron = "0 30 8 * * ?")
     @GetMapping("/jtVenueTomorrowPullTask")
     public void jtVenueTomorrowPullTask() {
         jtVenueTomorrowPullTask.run();
     }
 
+    /**
+     * 配置下单用户场地数据
+     */
     @Scheduled(cron = "0 40 8 * * ?")
     @GetMapping("/jtUserInfoConfig")
     public void jtUserInfoConfig() {
         jntyzxUserInfoConfigTask.run();
     }
 
-    @Scheduled(cron = "5 0 9 * * ?")
+    /**
+     * 下单定时任务
+     */
+    @Scheduled(cron = "0 0 9 * * ?")
     @GetMapping("/jtVenueSubscribeTask")
     public void jtVenueSubscribeTask() {
         jtVenueSubscribeTask.run();
     }
+
+    /**
+     * 当天场地订阅结果
+     */
+    @Scheduled(cron = "0 0 17 * * ?")
+    @GetMapping("/jtVenueInfoTodayResultTask")
+    public void jtVenueInfoTodayResultTask() {
+        jtVenueInfoTodayResultTask.run();
+    }
+
+    /**
+     * 第二天场地订阅结果
+     */
+    @Scheduled(cron = "0 10 9 * * ?")
+    @GetMapping("/jtVenueInfoTomorrowResultTask")
+    public void jtVenueInfoTomorrowResultTask() {
+        jtVenueInfoTomorrowResultTask.run();
+    }
 }

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JntyzxUserInfoConfigTask.java

@@ -26,6 +26,8 @@ import java.util.Comparator;
 import java.util.List;
 
 /**
+ * 用户场地配置任务 每日8:40运行
+ *
  * @Author: xiang
  * @Date: 2026-05-09 09:58
  */
@@ -90,6 +92,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate {
             return taskResult;
         }
         venueInfoDOS = venueInfoDOS.stream()
+                .filter(item -> !item.getPlaceName().contains("小馆"))
                 .sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName())))
                 .toList();
 
@@ -101,6 +104,7 @@ public class JntyzxUserInfoConfigTask extends BaseScheduleTaskTemplate {
 
         List<UserInfoDO> list = Lists.newArrayList();
         int i = 0;
+        userInfoService.delAll();
         for (UserTokenInfoDO user : users) {
             VenueInfoDO venueInfoDO = venueInfoDOS.get(i);
             UserInfoDO userInfoDO = new UserInfoDO();

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtTokenRefreshTask.java

@@ -11,6 +11,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
+ * 用户token刷新定时任务 每半个小时运行一次 在每个小时的20和50分
+ *
  * @Author: xiang
  * @Date: 2026-01-15 17:29
  */

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueInfoTodayResultTask.java

@@ -0,0 +1,94 @@
+package com.xiang.service.module.jntyzx.miniapp.schedule;
+
+import com.google.common.collect.Maps;
+import com.xiang.common.enums.ScheduleEnums;
+import com.xiang.common.factory.JntyzxDingTalkFactory;
+import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
+import com.xiang.common.pojo.jntyzx.miniapp.resp.query.SitePositionList;
+import com.xiang.common.pojo.schedule.TaskResult;
+import com.xiang.common.service.IScheduleOpeningConfigService;
+import com.xiang.common.service.IScheduleRunLogService;
+import com.xiang.common.utils.DateUtils;
+import com.xiang.service.module.jntyzx.miniapp.service.IVenueService;
+import com.xiang.service.module.jntyzx.miniapp.utils.VenueInfoUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 17:00查询当天的场地预定结果
+ *
+ * @Author: xiang
+ * @Date: 2026-05-09 14:17
+ */
+@Component
+@Slf4j
+public class JtVenueInfoTodayResultTask extends BaseScheduleTaskTemplate {
+
+    private final IVenueService venueService;
+    private final JntyzxDingTalkFactory jntyzxDingTalkFactory;
+
+    public JtVenueInfoTodayResultTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
+                                      IScheduleRunLogService scheduleRunLogService,
+                                      IVenueService venueService,
+                                      JntyzxDingTalkFactory jntyzxDingTalkFactory) {
+        super(scheduleOpeningConfigService, scheduleRunLogService);
+        this.venueService = venueService;
+        this.jntyzxDingTalkFactory = jntyzxDingTalkFactory;
+    }
+
+    @Override
+    protected String getTaskName() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TODAY_RESULT_TASK.getTaskName();
+    }
+
+    @Override
+    protected Integer getModule() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TODAY_RESULT_TASK.getModuleCode();
+    }
+
+    @Override
+    protected String getModuleName() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TODAY_RESULT_TASK.getModule();
+    }
+
+    @Override
+    protected TaskResult doExecute(Object validatedParams) throws Exception {
+
+        TaskResult taskResult = new TaskResult();
+        taskResult.setSuccess(false);
+        List<SitePositionList> sitePositionLists = venueService.queryVenueService();
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            taskResult.setSummary("场地信息为空");
+            return taskResult;
+        }
+        List<SitePositionList> positionListList6_8 = sitePositionLists.stream().filter(VenueInfoUtils::get628VenueInfo).toList();
+        sendMsg(positionListList6_8, "18:00-20:00");
+        List<SitePositionList> positionListList8_10 = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        sendMsg(positionListList8_10, "20:00-22:00");
+        taskResult.setSuccess(true);
+        taskResult.setSummary("场地信息查询定时任务成功");
+        return taskResult;
+    }
+
+    private void sendMsg(List<SitePositionList> positionListList, String time) {
+        if (CollectionUtils.isNotEmpty(positionListList)) {
+            Map<String, SitePositionList> map = Maps.newLinkedHashMap();
+            for (SitePositionList sitePositionList : positionListList) {
+                if (map.containsKey(sitePositionList.getPlaceName())) {
+                    continue;
+                }
+                map.put(sitePositionList.getPlaceName(), sitePositionList);
+            }
+            StringBuilder sb = new StringBuilder(DateUtils.getDateFromDate(LocalDate.now()) + "==>"+ time +"场地信息如下:\n");
+            map.forEach((placeName, sitePositionList) -> {
+                sb.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
+            });
+            jntyzxDingTalkFactory.sendMsg(sb.toString());
+        }
+    }
+}

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueInfoTomorrowResultTask.java

@@ -0,0 +1,94 @@
+package com.xiang.service.module.jntyzx.miniapp.schedule;
+
+import com.google.common.collect.Maps;
+import com.xiang.common.enums.ScheduleEnums;
+import com.xiang.common.factory.JntyzxDingTalkFactory;
+import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
+import com.xiang.common.pojo.jntyzx.miniapp.resp.query.SitePositionList;
+import com.xiang.common.pojo.schedule.TaskResult;
+import com.xiang.common.service.IScheduleOpeningConfigService;
+import com.xiang.common.service.IScheduleRunLogService;
+import com.xiang.common.utils.DateUtils;
+import com.xiang.service.module.jntyzx.miniapp.service.IVenueService;
+import com.xiang.service.module.jntyzx.miniapp.utils.VenueInfoUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 9:10分查询第二天的场地预定结果
+ *
+ * @Author: xiang
+ * @Date: 2026-05-09 14:17
+ */
+@Component
+@Slf4j
+public class JtVenueInfoTomorrowResultTask extends BaseScheduleTaskTemplate {
+
+    private final IVenueService venueService;
+    private final JntyzxDingTalkFactory jntyzxDingTalkFactory;
+
+    public JtVenueInfoTomorrowResultTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
+                                         IScheduleRunLogService scheduleRunLogService,
+                                         IVenueService venueService,
+                                         JntyzxDingTalkFactory jntyzxDingTalkFactory) {
+        super(scheduleOpeningConfigService, scheduleRunLogService);
+        this.venueService = venueService;
+        this.jntyzxDingTalkFactory = jntyzxDingTalkFactory;
+    }
+
+    @Override
+    protected String getTaskName() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TOMORROW_RESULT_TASK.getTaskName();
+    }
+
+    @Override
+    protected Integer getModule() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TOMORROW_RESULT_TASK.getModuleCode();
+    }
+
+    @Override
+    protected String getModuleName() {
+        return ScheduleEnums.JNTYZX_VENUE_INFO_TOMORROW_RESULT_TASK.getModule();
+    }
+
+    @Override
+    protected TaskResult doExecute(Object validatedParams) throws Exception {
+
+        TaskResult taskResult = new TaskResult();
+        taskResult.setSuccess(false);
+        List<SitePositionList> sitePositionLists = venueService.queryTomorrowVenue();
+        if (CollectionUtils.isEmpty(sitePositionLists)) {
+            taskResult.setSummary("场地信息为空");
+            return taskResult;
+        }
+        List<SitePositionList> positionListList6_8 = sitePositionLists.stream().filter(VenueInfoUtils::get628VenueInfo).toList();
+        sendMsg(positionListList6_8, "18:00-20:00");
+        List<SitePositionList> positionListList8_10 = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        sendMsg(positionListList8_10, "20:00-22:00");
+        taskResult.setSuccess(true);
+        taskResult.setSummary("场地信息查询定时任务成功");
+        return taskResult;
+    }
+
+    private void sendMsg(List<SitePositionList> positionListList, String time) {
+        if (CollectionUtils.isNotEmpty(positionListList)) {
+            Map<String, SitePositionList> map = Maps.newLinkedHashMap();
+            for (SitePositionList sitePositionList : positionListList) {
+                if (map.containsKey(sitePositionList.getPlaceName())) {
+                    continue;
+                }
+                map.put(sitePositionList.getPlaceName(), sitePositionList);
+            }
+            StringBuilder sb = new StringBuilder(DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + "==>"+ time +"场地信息如下:\n");
+            map.forEach((placeName, sitePositionList) -> {
+                sb.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
+            });
+            jntyzxDingTalkFactory.sendMsg(sb.toString());
+        }
+    }
+}

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenuePullTask.java

@@ -54,15 +54,18 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate {
         this.msgSendUtils = msgSendUtils;
     }
 
-    private List<SitePositionList> handleMsgSendList(List<SitePositionList> sitePositionLists, int dayOfWeek) {
+    private List<SitePositionList> handleMsgSendList(List<SitePositionList> sitePositionLists, Integer type) {
-        // 过滤出来8-10的未订购的场地信息
+        if (type == 1) {
             sitePositionLists = sitePositionLists.stream()
-                .filter(VenueInfoUtils::get8210VenueInfo)
-                .filter(item -> StringUtils.equals(item.getContacts(), "0")).toList();
-        // 周六周日过滤小馆，不查询当天小馆信息
-        if (dayOfWeek == 6 || dayOfWeek == 7) {
-            return sitePositionLists.stream()
                     .filter(item -> !item.getPlaceName().contains("小馆"))
+                    .filter(VenueInfoUtils::get628VenueInfo)
+                    .filter(item -> StringUtils.equals(item.getContacts(), "0"))
+                    .toList();
+        } else {
+            sitePositionLists = sitePositionLists.stream()
+                    .filter(item -> !item.getPlaceName().contains("小馆"))
+                    .filter(VenueInfoUtils::get8210VenueInfo)
+                    .filter(item -> StringUtils.equals(item.getContacts(), "0"))
                     .toList();
         }
         Map<String, SitePositionList> mapByName = Maps.newLinkedHashMap();
@@ -91,7 +94,6 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate {
 
     @Override
     protected TaskResult doExecute(Object validatedParams) throws Exception {
-
         TaskResult taskResult = new TaskResult();
         taskResult.setSuccess(false);
         log.info("【Venue】江体小程序场地数据拉取定时任务启动!!!time:{}", System.currentTimeMillis());
@@ -104,7 +106,6 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate {
         }
         String token;
         LocalDateTime now = LocalDateTime.now();
-        int dayOfWeek = now.getDayOfWeek().getValue();
 
         for (UserTokenInfoDO userTokenInfoDO : availableUser) {
             if (Objects.isNull(userTokenInfoDO)) {
@@ -120,21 +121,23 @@ public class JtVenuePullTask extends BaseScheduleTaskTemplate {
             }
             venueService.saveOrUpdateTodayVenueInfo(sitePositionLists);
 
-            sitePositionLists = handleMsgSendList(sitePositionLists, dayOfWeek);
+            StringBuffer msg = new StringBuffer();
-            if (CollectionUtils.isEmpty(sitePositionLists)) {
+
-                taskResult.setSuccess(true);
+            List<SitePositionList> sitePositionLists6_8 = handleMsgSendList(sitePositionLists, 1);
-                taskResult.setSummary("当前无场地信息！");
+            if (CollectionUtils.isNotEmpty(sitePositionLists6_8)) {
-                return taskResult;
+                msg.append("查询到18:00-20:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n");
+                sitePositionLists6_8.forEach(item -> msg.append(item.getPlaceName()).append("\n"));
+            }
+            List<SitePositionList> sitePositionLists8_10 = handleMsgSendList(sitePositionLists, 2);
+            if (CollectionUtils.isNotEmpty(sitePositionLists8_10)) {
+                msg.append("查询到20:00-22:00空闲场地信息=====>\n时间:").append(DateUtils.getDateFromDate(LocalDate.now())).append("\n");
+                sitePositionLists8_10.forEach(item -> msg.append(item.getPlaceName()).append("\n"));
             }
 
-            StringBuffer msg = new StringBuffer(
+            if (StringUtils.isNotBlank(msg)) {
-                    "查询到20:00-22:00空闲场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now()) + "\n");
-            sitePositionLists.forEach(item -> {
-                msg.append(item.getPlaceName()).append("\n");
-            });
-
                 String key = RedisKeyConstant.JNTYZX_VENUE_MSG_SEND_KEY + RedisKeyConstant.getDate();
                 msgSendUtils.sendMsgRestrict1Hours(key, msg.toString());
+            }
             taskResult.setSuccess(true);
             taskResult.setSummary("查询场地信息成功！时间:" + now);
             return taskResult;

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueSubscribeTask.java

@@ -32,6 +32,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+/**
+ * 场地订阅定时任务 每日9:00:00
+ */
 @Slf4j
 @Component
 @RestController

src/main/java/com/xiang/service/module/jntyzx/miniapp/schedule/JtVenueTomorrowPullTask.java

@@ -26,6 +26,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+/**
+ * 场地信息获取定时任务 每日8:30拉取第二天的场地信息
+ */
 @Slf4j
 @Component
 public class JtVenueTomorrowPullTask extends BaseScheduleTaskTemplate {
@@ -96,11 +99,25 @@ public class JtVenueTomorrowPullTask extends BaseScheduleTaskTemplate {
             return taskResult;
         }
         venueService.saveTomorrowVenueInfo(sitePositionLists);
-        sitePositionLists = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        List<SitePositionList> sitePositionLists6_8 = sitePositionLists.stream().filter(VenueInfoUtils::get628VenueInfo).toList();
-        if (CollectionUtils.isEmpty(sitePositionLists)) {
+        if (CollectionUtils.isEmpty(sitePositionLists6_8)) {
             taskResult.setSummary("当前无可用场地信息");
             return taskResult;
         }
+        buildMsg(sitePositionLists6_8, "18:00-20:00");
+        List<SitePositionList> sitePositionLists8_10 = sitePositionLists.stream().filter(VenueInfoUtils::get8210VenueInfo).toList();
+        if (CollectionUtils.isEmpty(sitePositionLists8_10)) {
+            taskResult.setSummary("当前无可用场地信息");
+            return taskResult;
+        }
+        buildMsg(sitePositionLists8_10, "20:00-22:00");
+
+        taskResult.setSuccess(Boolean.TRUE);
+        taskResult.setSummary("场地信息获取成功！");
+        return taskResult;
+    }
+
+    private void buildMsg(List<SitePositionList> sitePositionLists, String time) {
         Map<String, SitePositionList> map = Maps.newLinkedHashMap();
         for (SitePositionList sitePositionList : sitePositionLists) {
             if (map.containsKey(sitePositionList.getPlaceName())) {
@@ -108,14 +125,10 @@ public class JtVenueTomorrowPullTask extends BaseScheduleTaskTemplate {
             }
             map.put(sitePositionList.getPlaceName(), sitePositionList);
         }
-        StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + " 20:00-22:00\n");
+        StringBuffer msg = new StringBuffer("查询江体场地信息=====>\n时间:" + DateUtils.getDateFromDate(LocalDate.now().plusDays(1)) + "  " + time + "\n");
         map.forEach((placeName, sitePositionList) -> {
             msg.append(placeName).append("订购人：").append(sitePositionList.getContacts()).append("\n");
         });
         jtDingTalkFactory.sendMsg(msg.toString());
-
-        taskResult.setSuccess(Boolean.TRUE);
-        taskResult.setSummary("场地信息获取成功！");
-        return taskResult;
     }
 }

src/main/java/com/xiang/service/module/jntyzx/miniapp/service/impl/VenueServiceImpl.java

@@ -10,6 +10,7 @@ import com.xiang.service.module.jntyzx.miniapp.service.IJntyzxHttpService;
 import com.xiang.service.module.jntyzx.miniapp.service.IUserTokenInfoService;
 import com.xiang.service.module.jntyzx.miniapp.service.IVenueService;
 import com.xiang.service.module.jntyzx.miniapp.utils.VenueInfoUtils;
+import com.xiang.service.module.jntyzx.miniapp.utils.WeekendUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -37,11 +38,11 @@ public class VenueServiceImpl implements IVenueService {
 
     @Override
     public List<SitePositionList> queryVenueService() {
-        String token = userTokenInfoService.getToken("Xiang");
+        String token = userTokenInfoService.getToken("xiang");
         if (StringUtils.isBlank(token)) {
             return Lists.newArrayList();
         }
-        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailable("1", token);
+        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailable(WeekendUtils.isWeekend(), token);
         if (CollectionUtils.isEmpty(sitePositionLists)) {
             return Lists.newArrayList();
         }
@@ -51,11 +52,11 @@ public class VenueServiceImpl implements IVenueService {
 
     @Override
     public List<SitePositionList> queryTomorrowVenue() {
-        String token = userTokenInfoService.getToken("Xiang");
+        String token = userTokenInfoService.getToken("xiang");
         if (StringUtils.isBlank(token)) {
             return Lists.newArrayList();
         }
-        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow("1", token);
+        List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow(WeekendUtils.isWeekend(), token);
         if (CollectionUtils.isEmpty(sitePositionLists)) {
             return Lists.newArrayList();
         }

src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/MsgSendUtils.java

@@ -30,7 +30,7 @@ public class MsgSendUtils {
         String cache = (String) redisService.get(redisKey);
         if (StringUtils.isNotBlank(cache)) {
             int sendNum = Integer.parseInt(cache);
-            if (sendNum >= 0 && sendNum <= 5) {
+            if (sendNum >= 0 && sendNum < 5) {
                 jtDingTalkFactory.sendMsg(msgContent);
                 redisService.set(key, String.valueOf(++sendNum), 1, TimeUnit.HOURS);
             }

src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java

@@ -27,6 +27,9 @@ public class VenueInfoUtils {
     public static boolean get628VenueInfo(VenueInfoDO venueInfoDO) {
         return StringUtils.equals(venueInfoDO.getSjName(), "18:00-19:00") || StringUtils.equals(venueInfoDO.getSjName(), "19:00-20:00");
     }
+    public static boolean get628VenueInfo(SitePositionList sitePositionList) {
+        return StringUtils.equals(sitePositionList.getSjName(), "18:00-19:00") || StringUtils.equals(sitePositionList.getSjName(), "19:00-20:00");
+    }
     public static boolean get8210VenueInfo(VenueInfoDO venueInfoDO) {
         return StringUtils.equals(venueInfoDO.getSjName(), "20:00-21:00") || StringUtils.equals(venueInfoDO.getSjName(), "21:00-22:00");
     }
@@ -53,6 +56,25 @@ public class VenueInfoUtils {
         return 5;
     }
 
+    public static int sortVenueInfo4Zlb(String placeName) {
+        if (placeName.contains("10号")) {
+            return 0;
+        }
+        if (placeName.contains("9号")) {
+            return 1;
+        }
+        if (placeName.contains("2号")) {
+            return 2;
+        }
+        if (placeName.contains("8号")) {
+            return 3;
+        }
+        if (placeName.contains("7号")) {
+            return 4;
+        }
+        return 5;
+    }
+
     public static List<VenueInfoDO> filterVenueList(String siteTimeName, List<VenueInfoDO> venueInfoDOS) {
         if (StringUtils.equals(siteTimeName, "18:00")) {
             return venueInfoDOS.stream().filter(VenueInfoUtils::get628VenueInfo).collect(Collectors.toList());

src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbOrderTask.java

@@ -8,6 +8,8 @@ import com.xiang.common.enums.ScheduleEnums;
 import com.xiang.common.exception.BusinessException;
 import com.xiang.common.factory.JntyzxDingTalkFactory;
 import com.xiang.common.factory.schedule.BaseScheduleTaskTemplate;
+import com.xiang.common.manage.jntyzx.zlb.IZlbOrderInfoManage;
+import com.xiang.common.pojo.jntyzx.zlb.ZlbPayOrder;
 import com.xiang.common.pojo.jntyzx.zlb.ZlbTokenInfo;
 import com.xiang.common.pojo.jntyzx.zlb.ZlbUserInfo;
 import com.xiang.common.pojo.schedule.TaskResult;
@@ -24,6 +26,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.Date;
 import java.util.Map;
@@ -40,6 +43,7 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
     private final ZlbTokenInfoService zlbTokenInfoService;
     private final JntyzxDingTalkFactory jntyzxDingTalkFactory;
     private final RedisTemplate redisTemplate;
+    private final IZlbOrderInfoManage zlbOrderInfoManage;
 
     public ZlbOrderTask(IScheduleOpeningConfigService scheduleOpeningConfigService,
                         IScheduleRunLogService scheduleRunLogService,
@@ -47,13 +51,15 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
                         ZlbService zlbService,
                         ZlbTokenInfoService zlbTokenInfoService,
                         JntyzxDingTalkFactory jntyzxDingTalkFactory,
-                        RedisTemplate redisTemplate) {
+                        RedisTemplate redisTemplate,
+                        IZlbOrderInfoManage zlbOrderInfoManage) {
         super(scheduleOpeningConfigService, scheduleRunLogService);
         this.zlbUserInfoService = zlbUserInfoService;
         this.zlbService = zlbService;
         this.zlbTokenInfoService = zlbTokenInfoService;
         this.jntyzxDingTalkFactory = jntyzxDingTalkFactory;
         this.redisTemplate = redisTemplate;
+        this.zlbOrderInfoManage = zlbOrderInfoManage;
     }
 
     @Override
@@ -98,11 +104,15 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
         String tokenId = zlbTokenInfo.getTokenId();
         String secretKey = zlbService.getKey(tokenId, client);
         String siteOrderDetailsStr = zlbService.buildSiteOrder(zlbUserInfo, secretKey, day);
+        if (StringUtils.isEmpty(siteOrderDetailsStr)) {
+            log.info("构建订单参数异常:{}", siteOrderDetailsStr);
+            throw new BusinessException("构建订单参数异常");
+        }
         Map<String, String> headers = zlbService.getHeaders(zlbTokenInfo.getTokenId());
         String newOrderJson = zlbService.buildNewOrder(siteOrderDetailsStr, client);
         if (StringUtils.isBlank(newOrderJson)) {
             log.info("构建订单参数异常:{}", siteOrderDetailsStr);
-            throw new BusinessException("");
+            throw new BusinessException("构建订单参数异常");
         }
         ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
         //计算9点到现在的时间差
@@ -138,18 +148,26 @@ public class ZlbOrderTask extends BaseScheduleTaskTemplate {
         log.info("订单接口返回结果==> \n {}", response);
         JSONObject jsonObject = JSONObject.parseObject(response);
         if (jsonObject.getInteger("code") == 200) {
-            jntyzxDingTalkFactory.sendMsg(name + "zlb订单接口下单返回成功请2分钟内付款√√√√√√场地号:" + placeName + "时间:" + siteTimeName);
+            jntyzxDingTalkFactory.sendMsg(name + ":zlb订单接口下单返回成功请2分钟内付款√√√√√√场地号:" + placeName + "时间:" + siteTimeName);
             JSONObject data = jsonObject.getJSONObject("data");
             String orderId = data.getString("orderId");
             log.info("{}订单{}创建成功", name, orderId);
             String redisKey = ZlbUrlConstants.REDIS_PREFIX + "_" + orderId + "_" + name;
             redisTemplate.opsForValue().set(redisKey, name);
             redisTemplate.expire(redisKey, 120, TimeUnit.SECONDS);
+            ZlbPayOrder zlbPayOrder = new ZlbPayOrder();
+            zlbPayOrder.setName(name);
+            zlbPayOrder.setDay(DateUtils.getDateFromDate(LocalDate.now().plusDays(1)));
+            zlbPayOrder.setVenues("江体");
+            zlbPayOrder.setPlaceName(placeName);
+            zlbPayOrder.setTime(siteTimeName);
+            zlbPayOrder.setIsPay(0);
+            zlbOrderInfoManage.save(zlbPayOrder);
             return true;
         }
         if (jsonObject.getInteger("code") == 500) {
             if (jsonObject.getString("message").contains("已被售出")) {
-                jntyzxDingTalkFactory.sendMsg(name + "zlb订单接口下单返回失败❌❌❌场地号:" + placeName + "已被售出");
+                jntyzxDingTalkFactory.sendMsg(name + ":zlb订单接口下单返回失败❌❌❌场地号:" + placeName + "已被售出");
                 return true;
             }
         }

src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbTaskConfig.java

@@ -18,41 +18,57 @@ public class ZlbTaskConfig {
     private final ZlbOrderTask zlbOrderTask;
     private final ZlbUserConfigTask zlbUserConfigTask;
 
+    /**
+     * token续期
+     */
     @Scheduled(cron = "0 0/30 * * * ?")
     @GetMapping("/zlbLoginTask")
     public void zlbLoginTask() {
         zlbLoginTask.run();
     }
 
+    /**
+     * token校验
+     */
     @Scheduled(cron = "0 0 8 * * *")
     @GetMapping("/zlbTokenRefresh")
     public void zlbTokenRefresh() {
         zlbTokenRefreshTask.run();
     }
 
+    /**
+     * 场地信息拉取 拉取后天的场地信息
+     */
     @GetMapping("/zlbSiteTask")
     @Scheduled(cron = "30 30 16 * * ?")
     public void zlbSiteTask() {
         zlbSiteTask.run();
     }
 
+    /**
+     * 当天场地订阅信息--数据库数据
+     */
     @GetMapping("/zlbSiteDayTask")
     @Scheduled(cron = "0 00 17 * * ?")
     public void zlbSiteDayTask() {
         zlbSiteDayTask.run();
     }
 
+    /**
+     * 下单
+     */
     @GetMapping("/zlbOrderCreateTask")
     @Scheduled(cron = "2 0 9 * * ?")
     public void zlbOrderCreateTask() {
         zlbOrderTask.run();
     }
 
+    /**
+     * 下单用户场地配置信息
+     */
     @Scheduled(cron = "30 35 16 * * ?")
     @GetMapping("/zlbUserConfig")
     public void zlbUserConfig() {
         zlbUserConfigTask.run();
     }
-
-
 }

src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java

@@ -145,6 +145,6 @@ public class ZlbUserConfigTask extends BaseScheduleTaskTemplate {
         if (CollectionUtils.isEmpty(siteInfoList)) {
             return Lists.newArrayList();
         }
-        return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName()))).collect(Collectors.toList());
+        return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo4Zlb(item.getPlaceName()))).collect(Collectors.toList());
     }
 }

src/main/resources/logback-spring.xml

@@ -2,7 +2,7 @@
 <configuration scan="true">
 
     <!-- 应用名称：和统一配置中的项目代码保持一致（小写） -->
-    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="X_APP" />
+    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="APP" />
     <contextName>${APP_NAME}</contextName>
 
     <!--日志文件保留天数 -->
@@ -65,6 +65,23 @@
         </filter>
     </appender>
 
+    <appender name="APP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/warn-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
     <!-- 按照每天生成日志文件：主项目日志 -->
     <appender name="APP_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -90,12 +107,12 @@
     <root level="INFO">
         <appender-ref ref="APP_DEBUG"/>
         <appender-ref ref="APP_INFO"/>
+        <appender-ref ref="APP_WARN"/>
         <appender-ref ref="APP_ERROR"/>
         <appender-ref ref="CONSOLE"/>
     </root>
 
-    <!-- mybatis 日志级别 -->
+    <logger name="com.xiang" level="DEBUG"/>
-    <logger name="com.xiang" level="INFO"/>
     <!-- Spring 框架 -->
     <logger name="org.springframework" level="INFO"/>