haotian/wenlvApp
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改--在作品结束展示前一天,该资源位就可购买--资源位状态为闲置

Browse Source
This commit is contained in:
haotian 2025-04-21 14:46:15 +08:00
parent 00ced7df1a
commit 2cbc012c77
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
View File

@ -754,8 +754,7 @@ public class SysSourceController extends BaseController {
return error("头像文件上传失败");
}
//----------------------------------------------新版文件上传end-----------------------------------------------
System.out.println("sourceImagePath: "+sourceImagePath);
// System.out.println("sourceImagePath: "+sourceImagePath);
List<Double> sourceIdList = GsonUtils.fromJson(sourceStrList, List.class);

29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/daily/dailySysServer.java
View File

@ -215,7 +215,7 @@ public class dailySysServer {
// 这里应该每天12点后更新一次,
@Scheduled(cron = "0 5 12 * * ?")
@Transactional
@GetMapping("/dailySource")
// @GetMapping("/dailySource")
public void updateDailySource(){
LocalDate now = LocalDate.now();
@ -309,14 +309,12 @@ public class dailySysServer {
else if(sysSource.getSourceStatus().equals("2") &&
endTime.equals(now)){
SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(sysSource.getScenic(), sysSource.getPart());
// System.out.println("订单结束, 默认资源位价格数据: "+ sysSource.getSourceId());
sysSource.setPrice(sysScenicDefault.getPrice());
sysSource.setSourceStatus("0");
sysSource.setWorkAddress(sysScenicDefault.getWorkAddress());
sysSource.setWorkId(0L);
// 修改订单状态为2 已结束
Long orderId = sysSource.getOrderId();
if(orderId != null){
@ -327,8 +325,6 @@ public class dailySysServer {
}
}
}
// 审核未通过--结束时间已经过去了---退款
@ -361,12 +357,8 @@ public class dailySysServer {
}
// 更新资源位信息
sysSourceService.updateSysSource(sysSource);
// 24小时临期,结束资源位展示消息, 资源位结束时间-1 = now, 展示中才发到期提醒
// 这时资源位应该恢复成闲置状态.
if(endTime.minusDays(1).equals(now) && sysSource.getSourceStatus().equals("2")){
// 发送系统消息
//发送消息通知
@ -383,16 +375,25 @@ public class dailySysServer {
// 24小时临期消息
sysUserNotification.setType("7");
sysUserNotification.setStatus("0");
// 插入数据
userNotificationService.insertSysUserNotification(sysUserNotification);
}
}
// 修改资源位状态为闲置
SysScenicDefault sysScenicDefault = sysScenicDefaultService.getScenicDefaultByScenicAndPart(sysSource.getScenic(), sysSource.getPart());
sysSource.setPrice(sysScenicDefault.getPrice());
sysSource.setSourceStatus("0");
sysSource.setWorkAddress(sysScenicDefault.getWorkAddress());
sysSource.setWorkId(0L);
}
// 更新资源位信息
sysSourceService.updateSysSource(sysSource);
}
}