| @@ -12,7 +12,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`coupon_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status` | |||||
| `id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -29,7 +29,7 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != merchantId "> | <if test=" null != merchantId "> | ||||
| and `merchant_id` = #{merchantId} | |||||
| and `merchant_id` = #{merchantId} | |||||
| </if> | </if> | ||||
| @@ -58,7 +58,7 @@ | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCouponMerchant" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCouponMerchant" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns" /> from wx_user_channel | |||||
| select <include refid="allColumns" /> from wx_coupon_merchant | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||