From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 三月 2025 11:17:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 78 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 73 insertions(+), 5 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java index e47864a..0345b41 100644 --- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java +++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java @@ -1,14 +1,23 @@ package com.doumee.task; +import com.alibaba.fastjson.JSONObject; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.exception.BusinessException; import com.doumee.core.utils.DateUtil; +import com.doumee.core.utils.HttpsUtil; +import com.doumee.core.wx.WxPayProperties; import com.doumee.dao.business.model.Goodsorder; +import com.doumee.dao.system.model.SystemDictData; import com.doumee.service.business.GoodsorderService; +import com.doumee.service.business.MemberRidesService; +import com.doumee.service.business.SitesService; import com.doumee.service.business.WxBillService; +import com.doumee.service.system.SystemDictDataService; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.util.ThreadContext; +import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; @@ -17,6 +26,7 @@ import java.util.Date; import java.util.List; +import java.util.Objects; /** * 瀹氭椂浠诲姟 @@ -29,21 +39,28 @@ @Slf4j public class ScheduleTool { - - @Autowired private SystemDictDataBiz systemDictDataBiz; + + @Autowired + private SystemDictDataService systemDictDataService; @Autowired private WxBillService wxBillService; @Autowired private GoodsorderService goodsorderService; + + @Autowired + private MemberRidesService memberRidesService; + + @Autowired + private SitesService sitesService; + /** * @throws Exception */ - @Scheduled(cron = "0 0 11 * * ? ") - public void syncStudent() throws Exception { + public void getWxBill() throws Exception { //鍓嶄竴澶╃殑鏁告摎 Date ydate = DateUtil.addDaysToDate(new Date(), -1); wxBillService.getWxBill(ydate); @@ -53,11 +70,62 @@ * 娓│ * @throws Exception */ - @Scheduled(cron = "0 0/1 * * * ? ") + @Scheduled(cron = "0 0 21 * * ? ") public void getYesterdayBill() throws Exception { log.info("=====================寮�濮嬫瘡澶╄嚜鍔ㄧ粨绠�======================="); goodsorderService.autoCloseOrder(); log.info("=====================缁撴潫姣忓ぉ鑷姩缁撶畻======================="); } + + /** + * 瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐� + * 30 绉掑埛鏂颁竴娆� + * @throws Exception + */ + @Scheduled(cron = "0/30 * * * * ? ") + public void autoRefreshLockStatus() throws Exception { + log.info("=====================寮�濮嬪畾鏃跺埛鏂伴獞琛屼腑鐨勬暟鍏呭�兼湭寮�閿佸け璐�======================="); + memberRidesService.autoRefreshLockStatus(); + log.info("=====================缁撴潫瀹氭椂鍒锋柊楠戣涓殑鏁板厖鍊兼湭寮�閿佸け璐�======================="); + } + + + /** + * 绔欑偣杞﹁締婊℃灦鐜囬璀� + * @throws Exception + */ + @Scheduled(fixedDelay = 1000L * 60L * 10L) + public void siteReserves() throws Exception { + log.info("=====================寮�濮� 绔欑偣杞﹁締婊℃灦鐜囬璀�======================="); + sitesService.siteReservesNotice();; + log.info("=====================缁撴潫 绔欑偣杞﹁締婊℃灦鐜囬璀�======================="); + } + + + @Autowired + private WxPayProperties wxPayProperties; + + /** + * 鏇存柊寰俊 ACCESS_TOKEN + */ + @Scheduled(fixedDelay = 1000L * 60L * 90L) + public void updAccessToken(){ + DefaultWebSecurityManager manager = new DefaultWebSecurityManager(); + ThreadContext.bind(manager); + String appId = wxPayProperties.getAppId(); + String appSecret = wxPayProperties.getAppSecret(); + //鐢熸垚寰俊token + String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret="+appSecret; + String response = HttpsUtil.doGet(url,null); + JSONObject json = JSONObject.parseObject(response); + SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN); + if(!Objects.isNull(systemDictData)){ + systemDictData.setCode(json.getString("access_token")); + systemDictData.setUpdateTime(new Date()); + systemDictDataService.updateById(systemDictData); + } + } + + } -- Gitblit v1.9.3