修改定时任务
This commit is contained in:
parent
f82a5aa959
commit
43d63b57c4
@ -342,8 +342,7 @@ public class dailySysServer {
|
||||
|
||||
}
|
||||
// 结束展示--修改默认背景和默认价格, 这个区域的默认价格可能发生变化.
|
||||
else if(sysSource.getSourceStatus().equals("2") &&
|
||||
endTime.equals(now)){
|
||||
else if(endTime.equals(now)){
|
||||
|
||||
SysSourceDefault sysSourceDefault = sysSourceDefaultService.getSourceDefaultBySourceId(sysSource.getSourceId());
|
||||
|
||||
@ -360,9 +359,11 @@ public class dailySysServer {
|
||||
|
||||
// 修改order_info 状态
|
||||
OrderInfo orderInfo = orderInfoService.getOrderInfoByOrderInfoIdAndWorkId(sysOrder.getOrderInfoId(), sysSource.getWorkId());
|
||||
orderInfo.setStatus("2");
|
||||
|
||||
orderInfoService.updateOrderInfo(orderInfo);
|
||||
if(orderInfo != null){
|
||||
orderInfo.setStatus("2");
|
||||
orderInfoService.updateOrderInfo(orderInfo);
|
||||
}
|
||||
|
||||
// 修改sys_order 状态和退款金额
|
||||
sysOrder.setStatus("2");
|
||||
@ -371,7 +372,6 @@ public class dailySysServer {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 审核未通过--结束时间已经过去了---退款
|
||||
else if(sysSource.getSourceStatus().equals("1") && endTime.isEqual(now)){
|
||||
//-----------------退款 还没写------------------------
|
||||
@ -401,6 +401,35 @@ public class dailySysServer {
|
||||
|
||||
|
||||
}
|
||||
// 展示结束的订单, 但还没有下架内容
|
||||
// else if(endTime.isBefore(now) && (sysSource.getSourceStatus().equals("2") || sysSource.getSourceStatus().equals("1"))){
|
||||
// SysSourceDefault sysSourceDefault = sysSourceDefaultService.getSourceDefaultBySourceId(sysSource.getSourceId());
|
||||
//
|
||||
// sysSource.setPrice(sysSourceDefault.getPrice());
|
||||
// sysSource.setSourceStatus("0");
|
||||
// sysSource.setWorkAddress(sysSourceDefault.getWorkAddress());
|
||||
// sysSource.setWorkId(0L);
|
||||
//
|
||||
// // 修改订单状态为2 已结束
|
||||
// Long orderId = sysSource.getOrderId();
|
||||
// if(orderId != null){
|
||||
// SysOrder sysOrder = sysOrderService.selectSysOrderByOrderId(orderId);
|
||||
// if(sysOrder!=null){
|
||||
//
|
||||
// // 修改order_info 状态
|
||||
// OrderInfo orderInfo = orderInfoService.getOrderInfoByOrderInfoIdAndWorkId(sysOrder.getOrderInfoId(), sysSource.getWorkId());
|
||||
//
|
||||
// if (orderInfo != null){
|
||||
// orderInfo.setStatus("2");
|
||||
// orderInfoService.updateOrderInfo(orderInfo);
|
||||
// }
|
||||
//
|
||||
// // 修改sys_order 状态和退款金额
|
||||
// sysOrder.setStatus("2");
|
||||
// sysOrderService.updateSysOrder(sysOrder);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// 24小时临期,结束资源位展示消息, 资源位结束时间-1 = now, 展示中才发到期提醒
|
||||
// 这时资源位应该恢复成闲置状态.
|
||||
|
||||
@ -7,14 +7,19 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
|
||||
# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 腾讯云
|
||||
|
||||
#火山云docker地址msysql
|
||||
# url: jdbc:mysql://172.17.0.3:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云
|
||||
|
||||
# 火山云地址mysql
|
||||
url: jdbc:mysql://14.103.162.172:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云
|
||||
# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||
username: root
|
||||
password: root
|
||||
# password: dnxxkj
|
||||
# password: root
|
||||
password: dnxxkj
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
||||
@ -9,20 +9,20 @@ ruoyi:
|
||||
# 实例演示开关
|
||||
demoEnabled: true
|
||||
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
|
||||
profile: D:/ruoyi/uploadPath
|
||||
#
|
||||
# # 保存身份证文件地址
|
||||
idCardPath: D:/ruoyi/IdCard
|
||||
domain: http://10.0.0.17:8081
|
||||
# profile: D:/ruoyi/uploadPath
|
||||
##
|
||||
## # 保存身份证文件地址
|
||||
# idCardPath: D:/ruoyi/IdCard
|
||||
# domain: http://10.0.0.17:8081
|
||||
|
||||
# 腾讯云
|
||||
# domain: http://82.156.153.112:8081
|
||||
|
||||
# 火山云, 域名解析
|
||||
# domain: https://www.lookthere.net
|
||||
#
|
||||
# idCardPath: /home/IdCard
|
||||
# profile: /home/uploadPath
|
||||
domain: https://www.lookthere.net
|
||||
|
||||
idCardPath: /home/IdCard
|
||||
profile: /home/uploadPath
|
||||
# 获取ip地址开关
|
||||
addressEnabled: false
|
||||
# 验证码类型 math 数组计算 char 字符验证
|
||||
|
||||
@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.OrderInfo;
|
||||
import com.ruoyi.system.domain.dto.OrderInfoDto;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
* 订单信息，若一个订单存在购买多个资源位，则添加多条数据Mapper接口
|
||||
@ -74,5 +75,5 @@ public interface OrderInfoMapper
|
||||
/***
|
||||
* 根据orderInfoId和work_id返回orderInfo
|
||||
*/
|
||||
public OrderInfo getOrderInfoByOrderInfoIdAndWorkId(String orderInfoId, Long workId);
|
||||
public OrderInfo getOrderInfoByOrderInfoIdAndWorkId(@Param("orderInfoId") String orderInfoId,@Param("workId") Long workId);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user