From 3388f19b318de38c4d52ff93764a01f572e5f272 Mon Sep 17 00:00:00 2001 From: yixian Date: Fri, 23 Mar 2018 15:02:45 +0800 Subject: [PATCH] manual settle --- .../payment/manage/mappers/payment/TaskManualSettleMapper.java | 2 +- src/main/resources/application.properties | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java index 735c80aea..100f1b060 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java @@ -20,7 +20,7 @@ public interface TaskManualSettleMapper { JSONObject findTodayTask(@Param("client_id") int clientId); @AutoSql(type = SqlType.SELECT) - @AdvanceSelect(addonWhereClause = "clearing_order is null") + @AdvanceSelect(addonWhereClause = "clearing_order is null or disable_flag=1") List listActiveTasks(@Param("client_id") int clientId); @AutoSql(type = SqlType.INSERT) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 48b29bfd1..672e6befb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -22,9 +22,6 @@ spring.redis.host=127.0.0.1 spring.redis.port=6379 spring.redis.database=1 -spring.velocity.date-tool-attribute=date -spring.velocity.number-tool-attribute=number - mybatis.autosql.default-dialect=mysql app.redis.prefix=payment