Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

xiaoyong931011

2021-05-25 3db83ef4add286feabba2d5db4eabfa27d5fc5f1

 src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java

@@ -32,6 +32,7 @@
        log.info("产品生效任务");
        QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("state",YdOrderEntity.ORDER_STATE_READY);
        objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
        List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
        Date date = new Date();
        if(CollUtil.isNotEmpty(ydOrderEntities)){
@@ -51,7 +52,8 @@
    @Scheduled(cron = "0 0/1 * * * ?")
    public void orderEnd() {
        QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_WORK);
        objectQueryWrapper.eq("state",YdOrderEntity.ORDER_STATE_WORK);
        objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
        List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
        Date date = new Date();
        if(CollUtil.isNotEmpty(ydOrderEntities)){