| @@ -245,7 +245,7 @@ | |||||
| select <include refid="allCUserColumns" /> | select <include refid="allCUserColumns" /> | ||||
| from wx_coupon_channel cc, | from wx_coupon_channel cc, | ||||
| wx_coupon c,wx_merchant m | wx_coupon c,wx_merchant m | ||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id | |||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 | |||||
| left join wx_shop s on ms.shop_id = s.id | left join wx_shop s on ms.shop_id = s.id | ||||
| left join wx_mall_building mb on s.building = mb.id | left join wx_mall_building mb on s.building = mb.id | ||||
| left join wx_mall_floor mf on s.floor = mf.id | left join wx_mall_floor mf on s.floor = mf.id | ||||
| @@ -277,7 +277,7 @@ | |||||
| select <include refid="allCUserColumns2" /> | select <include refid="allCUserColumns2" /> | ||||
| from | from | ||||
| wx_coupon c,wx_merchant m | wx_coupon c,wx_merchant m | ||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id | |||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 | |||||
| left join wx_shop s on ms.shop_id = s.id | left join wx_shop s on ms.shop_id = s.id | ||||
| left join wx_mall_building mb on s.building = mb.id | left join wx_mall_building mb on s.building = mb.id | ||||
| left join wx_mall_floor mf on s.floor = mf.id | left join wx_mall_floor mf on s.floor = mf.id | ||||
| @@ -353,7 +353,7 @@ | |||||
| <select id="selectDetailOfUser" parameterType="map" resultMap="CVoResultMap"> | <select id="selectDetailOfUser" parameterType="map" resultMap="CVoResultMap"> | ||||
| select <include refid="allCUserCouponOrderDetailColumns" /> | select <include refid="allCUserCouponOrderDetailColumns" /> | ||||
| from wx_coupon_order c,wx_coupon co,wx_merchant m | from wx_coupon_order c,wx_coupon co,wx_merchant m | ||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id | |||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 | |||||
| left join wx_shop s on ms.shop_id = s.id | left join wx_shop s on ms.shop_id = s.id | ||||
| left join wx_mall_building mb on s.building = mb.id | left join wx_mall_building mb on s.building = mb.id | ||||
| left join wx_mall_floor mf on s.floor = mf.id | left join wx_mall_floor mf on s.floor = mf.id | ||||
| @@ -205,7 +205,7 @@ | |||||
| select <include refid="allCUserOrderDetailColumns" /> | select <include refid="allCUserOrderDetailColumns" /> | ||||
| from (wx_order o,wx_coupon co,wx_merchant m) | from (wx_order o,wx_coupon co,wx_merchant m) | ||||
| left join wx_coupon_order c on o.id = c.order_id | left join wx_coupon_order c on o.id = c.order_id | ||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id | |||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 | |||||
| left join wx_shop s on ms.shop_id = s.id | left join wx_shop s on ms.shop_id = s.id | ||||
| left join wx_mall_building mb on s.building = mb.id | left join wx_mall_building mb on s.building = mb.id | ||||
| left join wx_mall_floor mf on s.floor = mf.id | left join wx_mall_floor mf on s.floor = mf.id | ||||