|
|
|
@@ -10,7 +10,6 @@ |
|
|
|
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> |
|
|
|
<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" /> |
|
|
|
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> |
|
|
|
<result column="confirm_time" jdbcType="TIMESTAMP" property="confirmTime" /> |
|
|
|
<result column="total_money" jdbcType="DECIMAL" property="totalMoney" /> |
|
|
|
<result column="actual_money" jdbcType="DECIMAL" property="actualMoney" /> |
|
|
|
<result column="card_sale_money" jdbcType="DECIMAL" property="cardSaleMoney" /> |
|
|
|
@@ -50,15 +49,16 @@ |
|
|
|
<result column="account_number" jdbcType="VARCHAR" property="accountNumber" /> |
|
|
|
<result column="create_by" jdbcType="BIGINT" property="createBy" /> |
|
|
|
<result column="update_by" jdbcType="BIGINT" property="updateBy" /> |
|
|
|
<result column="is_del" jdbcType="INTEGER" property="isDel" /> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
`id`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`,`merchant_id`,`begin_time`,`end_time`,`confirm_time`,`total_money`, |
|
|
|
`id`,`tenant_id`,`parent_tenant_id`,`create_date`,`update_date`,`merchant_id`,`begin_time`,`end_time`,`total_money`, |
|
|
|
`actual_money`,`card_sale_money`,`card_rate`,`card_money`,`zfb_sale_money`,`zfb_rate`,`zfb_money`,`union_sale_money`,`union_rate`, |
|
|
|
`union_money`,`wx_sale_money`,`wx_rate`,`wx_money`,`erase_zero_sale_money`,`erase_zero_rate`,`erase_zero_money`,`cash_sale_money`, |
|
|
|
`cash_rate`,`cash_money`,`rent_money`,`rent_contract_money`,`employee_manage_money`,`sales_slip_money`,`salary`,`earnest_money`, |
|
|
|
`other_money`,`last_remaining`,`points_rate`,`points_money`,`merchant_name`,`merchant_code`,`merchant_person`,`merchant_phone`, |
|
|
|
`account_name`,`account_bank`,`account_number`,`create_by`,`update_by` |
|
|
|
`account_name`,`account_bank`,`account_number`,`create_by`,`update_by`,`is_del` |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -95,6 +95,10 @@ |
|
|
|
and `create_by` = #{createBy} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != isDel"> |
|
|
|
and `is_del` >= #{isDel} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != ids "> |
|
|
|
and id in |
|
|
|
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> |
|
|
|
|