| @@ -1,8 +1,6 @@ | |||||
| package com.iformall.mapper; | package com.iformall.mapper; | ||||
| import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxCUserTags; | import com.iformall.domain.po.WxCUserTags; | ||||
| @@ -95,10 +95,9 @@ | |||||
| from wx_c_user_tags | from wx_c_user_tags | ||||
| where tenant_id = #{tenantId} | where tenant_id = #{tenantId} | ||||
| <if test=" null != tagIds"> | <if test=" null != tagIds"> | ||||
| and JSON_CONTAINS(cut.tags,#{tagIds}) | |||||
| and JSON_CONTAINS(tags,#{tagIds}) | |||||
| </if> | </if> | ||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||
| @@ -702,13 +702,7 @@ | |||||
| <result column="source_type" jdbcType="INTEGER" property="sourceType"/> | <result column="source_type" jdbcType="INTEGER" property="sourceType"/> | ||||
| <result column="gift_list" jdbcType="VARCHAR" property="giftList"></result> | <result column="gift_list" jdbcType="VARCHAR" property="giftList"></result> | ||||
| <collection column="{productId=id,tenantId=tenant_id}" property="merchantVoList" | |||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | |||||
| javaType="java.util.List" | |||||
| select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantBaseList"> | |||||
| </collection> | |||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="WxCouponCVoMapL" type="com.iformall.domain.vo.WxCouponCVo"> | <resultMap id="WxCouponCVoMapL" type="com.iformall.domain.vo.WxCouponCVo"> | ||||
| @@ -84,7 +84,7 @@ | |||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="findMerchantIdListByProduct" parameterType="java.util.Map" resultMap="BaseResultMap"> | |||||
| <select id="findMerchantIdListByProduct" parameterType="java.util.Map" resultType="Long"> | |||||
| select distinct cm.merchant_id | select distinct cm.merchant_id | ||||
| from wx_coupon_merchant cm | from wx_coupon_merchant cm | ||||
| where cm.status = 0 | where cm.status = 0 | ||||