From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 11 十月 2023 17:03:58 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 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 ad8077e..fe11644 100644 --- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java +++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java @@ -2,11 +2,19 @@ import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.constants.Constants; +import com.doumee.core.utils.DateUtil; +import com.doumee.dao.business.model.Goodsorder; +import com.doumee.service.business.GoodsorderService; import com.doumee.service.business.WxBillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.Date; +import java.util.List; /** * 瀹氭椂浠诲姟 @@ -22,23 +30,39 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired private WxBillService wxBillService; + @Autowired + private GoodsorderService goodsorderService; /** * @throws Exception */ @Scheduled(cron = "0 0 11 * * ? ") public void syncStudent() throws Exception { - wxBillService.getWxBill(); + //鍓嶄竴澶╃殑鏁告摎 + Date ydate = DateUtil.addDaysToDate(new Date(), -1); + wxBillService.getWxBill(ydate); } /** + * 娓│ * @throws Exception */ - @Scheduled(fixedDelay = 1000*60) +// @Scheduled(fixedDelay = 1000*60) public void getYesterdayBill() throws Exception { - wxBillService.getWxBill(); + + Goodsorder goodsorder = new Goodsorder(); + goodsorder.setIsdeleted(Constants.ZERO); + goodsorder.setStatus(Constants.goodsorderStatus.pay); + List<Goodsorder> list = goodsorderService.findList(goodsorder); + if (!CollectionUtils.isEmpty(list)){ + list.forEach(s->{ + goodsorderService.closerGoodsorder(s.getId()); + }); + + } } } -- Gitblit v1.9.3