|
|
|
@@ -412,10 +412,10 @@ |
|
|
|
</if> |
|
|
|
left join wx_business bu on bu.id = m.business_id |
|
|
|
where 1=1 and m.is_del=0 |
|
|
|
<if test=" null != tenantId"> |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and m.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != parentTenantId"> |
|
|
|
<if test=" null != parentTenantId and '' != parentTenantId"> |
|
|
|
and m.`parent_tenant_id` = #{parentTenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != merchantName and ''!=merchantName "> |
|
|
|
@@ -474,9 +474,11 @@ |
|
|
|
<if test=" null != buildingId"> |
|
|
|
and mb.id = #{buildingId} |
|
|
|
</if> |
|
|
|
and m.tenant_id = #{tenantId} |
|
|
|
<if test=" null != parentTenantId"> |
|
|
|
and m.parent_tenant_id = #{parentTenantId} |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and m.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != parentTenantId and '' != parentTenantId"> |
|
|
|
and m.`parent_tenant_id` = #{parentTenantId} |
|
|
|
</if> |
|
|
|
and s.is_del = 0 |
|
|
|
and ms.is_del = 0 |
|
|
|
@@ -509,12 +511,12 @@ |
|
|
|
left join wx_merchant_b_user mbu on m.id=mbu.merchant_id where mbu.status=0) m |
|
|
|
on co.b_user_id=m.b_user_id |
|
|
|
WHERE co.coupon_order_status = 1 |
|
|
|
<if test="tenantId != null"> |
|
|
|
and co.tenant_id = #{tenantId} |
|
|
|
</if> |
|
|
|
<if test="parentTenantId != null"> |
|
|
|
and co.parent_tenant_id = #{parentTenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and co.`tenant_id` = #{tenantId} |
|
|
|
</if> |
|
|
|
<if test=" null != parentTenantId and '' != parentTenantId"> |
|
|
|
and co.`parent_tenant_id` = #{parentTenantId} |
|
|
|
</if> |
|
|
|
<if test="starttime != null"> |
|
|
|
and co.create_date >= #{starttime} |
|
|
|
</if> |
|
|
|
|