Merge branch 'master' into develop

src/main/java/au/com/royalpay/payment/manage/task/CleanNoticeTaskManager.java

@@ -1,24 +0,0 @@
-package au.com.royalpay.payment.manage.task;
-
-import au.com.royalpay.payment.manage.management.clearing.core.CleanService;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * Created by yishuqian on 06/06/2017.
- */
-@Component
-@ConditionalOnProperty(value = "app.run-tasks",havingValue = "true")
-public class CleanNoticeTaskManager {
-
-    @Resource
-    private CleanService cleanService;
-
-    @Scheduled(cron = "0 0 15 * * ?")
-    public void sendCleanNotice(){
-        cleanService.getTodaySettlementLogs();
-    }
-}

src/main/java/au/com/royalpay/payment/manage/task/RedPackTaskManager.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  * Created by yishuqian on 01/02/2017.
  */
 @Component
-@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "false")
 public class RedPackTaskManager {
     private Logger logger = LoggerFactory.getLogger(getClass());