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

Merge tag 'refs/tags/jenkins-back-end-3172' into release

develop
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
d1ef33c008
1 измененных файлов: 5 добавлений и 5 удалений
  1. +5
    -5
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

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

@@ -494,23 +494,23 @@
</select>

<select id="userTradeDetailList" parameterType="com.iformall.domain.po.WxMerchant" resultType="com.iformall.domain.vo.WxMerchantTradeDetailVo">
select mb.`name` 'userName',mb.`phone`,co.title couponName,co.`sale_price` couponSale ,co.price couponPrice, co.price tradeAmt,o.create_date tradeDate
select cb.`name` 'userName',cb.`phone`,co.title couponName,co.`sale_price` couponSale ,co.price couponPrice,
co.price tradeAmt,o.create_date tradeDate
from wx_coupon_order o
left join wx_coupon co on(o.`coupon_id`=co.id)
left join wx_coupon_merchant cm on(cm.product_id=co.id)
inner join wx_merchant_b_user mb on(mb.id=o.b_user_id)
left join wx_c_user_basic_info cb on o.c_user_id=cb.id
where o.coupon_order_status=1
and o.tenant_id=#{tenantId}
<if test=" null != id ">
and cm.`merchant_id` = #{id}
and mb.merchant_id = #{id}
</if>

<if test=" null != userName ">
and mb.`name` like concat('%', #{userName},'%')
and cb.`name` like concat('%', #{userName},'%')
</if>
<if test=" null != phone ">
and mb.`phone` like concat('%', #{phone},'%')
and cb.`phone` like concat('%', #{phone},'%')
</if>
<if test=" null != couponName ">
and co.`title` like concat('%', #{couponName},'%')


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