|
|
|
@@ -12,10 +12,11 @@ |
|
|
|
<result column="start_time" jdbcType="TIMESTAMP" property="startTime" /> |
|
|
|
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> |
|
|
|
<result column="limit_money" jdbcType="DECIMAL" property="limitMoney" /> |
|
|
|
<result column="all_merchant" jdbcType="INTEGER" property="allMerchant" /> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
`id`,`tenant_id`,`parent_tenant_id`,`status`,`name`,`create_date`,`update_date`,`start_time`,`end_time`,`limit_money` |
|
|
|
`id`,`tenant_id`,`parent_tenant_id`,`status`,`name`,`create_date`,`update_date`,`start_time`,`end_time`,`limit_money`,`all_merchant` |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -40,6 +41,10 @@ |
|
|
|
and `end_time` <= #{end} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != allMerchant"> |
|
|
|
and `all_merchant` = #{allMerchant} |
|
|
|
</if> |
|
|
|
|
|
|
|
<!-- 未过期 --> |
|
|
|
<if test=" 1 == validTime"> |
|
|
|
and end_time >= now() |
|
|
|
|