|
@@ -142,15 +142,15 @@ public class schedulTask
|
|
|
if(new Date().compareTo(dateSdf.parse(tCommodityManage.getPeriodEnd())) <= 0){
|
|
if(new Date().compareTo(dateSdf.parse(tCommodityManage.getPeriodEnd())) <= 0){
|
|
|
// 判断提前截至日期
|
|
// 判断提前截至日期
|
|
|
Calendar calendar = Calendar.getInstance();
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.add(Calendar.DATE, -tCommodityManage.getAdvancePeriod());// num为增加的天数,可以改变的
|
|
|
|
|
|
|
+ calendar.add(Calendar.DATE, tCommodityManage.getAdvancePeriod());// num为增加的天数,可以改变的
|
|
|
Date d = calendar.getTime();
|
|
Date d = calendar.getTime();
|
|
|
- if(new Date().compareTo(d)>= 0){
|
|
|
|
|
|
|
+ if(new Date().compareTo(d)< 0){
|
|
|
order.setCommodityId(tCommodityManage.getId());
|
|
order.setCommodityId(tCommodityManage.getId());
|
|
|
order.setStatus("1");// 查询已支付的订单
|
|
order.setStatus("1");// 查询已支付的订单
|
|
|
order.setDepartureDate(dateSdf.format(d));
|
|
order.setDepartureDate(dateSdf.format(d));
|
|
|
List<TOrderManage> orderManageList = orderManageService.selectTOrderManageList4H5(order);
|
|
List<TOrderManage> orderManageList = orderManageService.selectTOrderManageList4H5(order);
|
|
|
// 判断出行人数是否达标
|
|
// 判断出行人数是否达标
|
|
|
- if(orderManageList.size() < tCommodityManage.getAdvancePeriod()){
|
|
|
|
|
|
|
+ if(orderManageList.size() < tCommodityManage.getTargetPeopleNum()){
|
|
|
// 自动退款
|
|
// 自动退款
|
|
|
for (TOrderManage orderManage : orderManageList) {
|
|
for (TOrderManage orderManage : orderManageList) {
|
|
|
//
|
|
//
|
|
@@ -214,7 +214,7 @@ public class schedulTask
|
|
|
*/
|
|
*/
|
|
|
@Transactional
|
|
@Transactional
|
|
|
@SuppressWarnings("all")
|
|
@SuppressWarnings("all")
|
|
|
- @Scheduled(cron = "0 8 * * * ?")
|
|
|
|
|
|
|
+ @Scheduled(cron = "0 0 8 * * ?")
|
|
|
public void lineSendMsgScheduleTask() throws Exception{
|
|
public void lineSendMsgScheduleTask() throws Exception{
|
|
|
//
|
|
//
|
|
|
LocalDate tomorrow = LocalDate.now().plusDays(1);
|
|
LocalDate tomorrow = LocalDate.now().plusDays(1);
|