Просмотр исходного кода

[C端][修复]:修改详情页在没有shop情况下的问题

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
635c3a8999
2 измененных файлов: 14 добавлений и 20 удалений
  1. +6
    -9
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  2. +8
    -11
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 6
- 9
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -518,14 +518,15 @@
<select id="selectDetailForCUser" parameterType="com.simple.domain.po.WxCouponChannel" resultMap="CUserResultMap"> <select id="selectDetailForCUser" parameterType="com.simple.domain.po.WxCouponChannel" resultMap="CUserResultMap">
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_shop s,wx_merchant_shop ms,
wx_mall_building mb,
wx_mall_floor mf
wx_coupon c,wx_merchant m
left join wx_merchant_shop ms on ms.merchant_id = m.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_floor mf on s.floor = mf.id
where c.merchant_id = m.id where c.merchant_id = m.id
and cc.coupon_id = c.id
<if test=" null != couponId "> <if test=" null != couponId ">
and c.id = #{couponId} and c.id = #{couponId}
and cc.coupon_id = #{couponId}
</if> </if>
<if test=" null != tenantId "> <if test=" null != tenantId ">
and c.tenant_id = #{tenantId} and c.tenant_id = #{tenantId}
@@ -533,10 +534,6 @@
<if test=" null != targetAd "> <if test=" null != targetAd ">
and cc.target_ad = #{targetAd} and cc.target_ad = #{targetAd}
</if> </if>
and ms.merchant_id = m.id
and ms.shop_id = s.id
and s.building = mb.id
and s.floor = mf.id
</select> </select>


+ 8
- 11
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -347,11 +347,13 @@


<select id="selectDetailOfCUser" parameterType="map" resultMap="CVoResultMap"> <select id="selectDetailOfCUser" parameterType="map" resultMap="CVoResultMap">
select <include refid="allCUserCouponOrderDetailColumns" /> select <include refid="allCUserCouponOrderDetailColumns" />
from wx_coupon_order c,wx_coupon co,wx_merchant m,
wx_shop s,wx_merchant_shop ms,
wx_mall_building mb,
wx_mall_floor mf
where 1=1
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_shop s on ms.shop_id = s.id
left join wx_mall_building mb on s.building = mb.id
left join wx_mall_floor mf on s.floor = mf.id
where c.coupon_id = co.id
and co.merchant_id = m.id
<if test="cUserId != null"> <if test="cUserId != null">
and c.c_user_id = #{cUserId} and c.c_user_id = #{cUserId}
</if> </if>
@@ -364,12 +366,7 @@
<if test="couponOrderId != null"> <if test="couponOrderId != null">
and c.id = #{couponOrderId} and c.id = #{couponOrderId}
</if> </if>
and c.coupon_id = co.id
and co.merchant_id = m.id
and ms.merchant_id = m.id
and ms.shop_id = s.id
and s.building = mb.id
and s.floor = mf.id

</select> </select>






Загрузка…
Отмена
Сохранить