Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopAutomaticReceiveQuartz.java

@@ -23,9 +23,6 @@
@Configuration
public class ShopAutomaticReceiveQuartz {

    @Value("${scheduling.enabled}")
    private boolean taskSwitch;

    @Autowired
    private ShopDeliveryInfoDao shopDeliveryInfoDao;

@@ -37,9 +34,9 @@

    @Scheduled(cron = "0/30 * * * * ?")
    public void executeExt() {
        if(taskSwitch) {


            LogUtil.info("#15天自动收货任务处理#");

            List<ShopDeliveryInfo> shopDeliveryInfos = shopDeliveryInfoDao.selectAutomaticReceive();
            int flag = 0;
@@ -55,7 +52,7 @@
                }
            }
            LogUtil.info("自动确认收货更新条数：" + flag);
        }

    }

}