| @@ -175,8 +175,8 @@ | |||||
| <select id="sumByMerchantId" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="HashMap"> | <select id="sumByMerchantId" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="HashMap"> | ||||
| select merchant_id, | select merchant_id, | ||||
| IFNULL(SUM(ms.`subsidy`), 0) as sum_subsidy, | |||||
| IFNULL(SUM(ms.`real_subsidy`), 0) as sum_real_subsidy | |||||
| IFNULL(SUM(`subsidy`), 0) as sum_subsidy, | |||||
| IFNULL(SUM(`real_subsidy`), 0) as sum_real_subsidy | |||||
| from wx_merchant_subsidy | from wx_merchant_subsidy | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| group by merchant_id | group by merchant_id | ||||
| @@ -184,9 +184,9 @@ | |||||
| <select id="sum" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="HashMap"> | <select id="sum" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultType="HashMap"> | ||||
| select | select | ||||
| IFNULL(SUM(ms.`subsidy`), 0) as sum_subsidy, | |||||
| IFNULL(SUM(ms.`real_subsidy`), 0) as sum_real_subsidy | |||||
| from wx_merchant_subsidy | |||||
| IFNULL(SUM(`subsidy`), 0) as sum_subsidy, | |||||
| IFNULL(SUM(`real_subsidy`), 0) as sum_real_subsidy | |||||
| from wx_merchant_subsidy | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||