Commit 1613180b by caiyt

把自动变7去掉,增加从机器系统过来7的状态处理

parent 625acc73
...@@ -5,9 +5,7 @@ import com.soss.system.domain.Order; ...@@ -5,9 +5,7 @@ import com.soss.system.domain.Order;
import com.soss.system.domain.OrderOperationLog; import com.soss.system.domain.OrderOperationLog;
import com.soss.system.mapper.OrderMapper; import com.soss.system.mapper.OrderMapper;
import com.soss.system.mapper.OrderOperationLogMapper; import com.soss.system.mapper.OrderOperationLogMapper;
import com.soss.system.service.impl.OrderServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -18,24 +16,24 @@ import java.util.List; ...@@ -18,24 +16,24 @@ import java.util.List;
public class OrderSchedule { public class OrderSchedule {
@Autowired @Autowired
private OrderMapper orderMapper; private OrderMapper orderMapper;
@Value("${timeout}") // @Value("${timeout}")
private Integer timeout; // private Integer timeout;
@Autowired @Autowired
private OrderOperationLogMapper operationLogMapper; private OrderOperationLogMapper operationLogMapper;
@Autowired // @Autowired
private OrderServiceImpl orderService; // private OrderServiceImpl orderService;
@Scheduled(fixedDelay = 60*1000) @Scheduled(fixedDelay = 60*1000)
private void process() { private void process() {
//orderMapper.updateTimeOut(OrderStatusConstant.productionCompleted,timeout); //orderMapper.updateTimeOut(OrderStatusConstant.productionCompleted,timeout);
List<Order> orders1 = orderMapper.selectOrderByTime(OrderStatusConstant.productionCompleted, timeout); /*List<Order> orders1 = orderMapper.selectOrderByTime(OrderStatusConstant.productionCompleted, timeout);
if(orders1!=null &&orders1.size()>0){ if(orders1!=null &&orders1.size()>0){
for (Order order : orders1) { for (Order order : orders1) {
order.setState(OrderStatusConstant.timeout); order.setState(OrderStatusConstant.timeout);
order.setUpdatedAt(new Date()); order.setUpdatedAt(new Date());
orderService.updateOrder(order); orderService.updateOrder(order);
} }
} }*/
//orderMapper.updateCancel(OrderStatusConstant.Unpaid,15); //orderMapper.updateCancel(OrderStatusConstant.Unpaid,15);
List<Order> orders = orderMapper.selectOrderByTime(OrderStatusConstant.Unpaid, 15*60); List<Order> orders = orderMapper.selectOrderByTime(OrderStatusConstant.Unpaid, 15*60);
if(orders!=null &&orders.size()>0){ if(orders!=null &&orders.size()>0){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment