| @@ -294,11 +294,6 @@ | |||||
| <resultMap id="BVoResultMap" type="com.iformall.domain.vo.WxCouponOrderBVo"> | <resultMap id="BVoResultMap" type="com.iformall.domain.vo.WxCouponOrderBVo"> | ||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> | <result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> | ||||
| @@ -359,6 +354,7 @@ | |||||
| and tcm.status = 0) as mc | and tcm.status = 0) as mc | ||||
| from wx_coupon_order tco) com | from wx_coupon_order tco) com | ||||
| where com.tcoid = co.id | where com.tcoid = co.id | ||||
| and co.coupon_type < 7 | |||||
| and c.id = co.coupon_id | and c.id = co.coupon_id | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and co.tenant_id = #{tenantId} | and co.tenant_id = #{tenantId} | ||||
| @@ -397,7 +393,6 @@ | |||||
| left join wx_merchant_b_user bu on co.b_user_id = bu.id | left join wx_merchant_b_user bu on co.b_user_id = bu.id | ||||
| left join wx_merchant m on m.id = bu.merchant_id | left join wx_merchant m on m.id = bu.merchant_id | ||||
| where co.id = #{id} | where co.id = #{id} | ||||
| and co.coupon_type < 7 | |||||
| and c.id = co.coupon_id | and c.id = co.coupon_id | ||||
| and cu.id = co.c_user_id | and cu.id = co.c_user_id | ||||
| </select> | </select> | ||||