Parcourir la source

Merge commit 'refs/tags/jenkins-back-end-749^{}' into release

release_toaliyun_real
hupeng il y a 7 ans
Parent
révision
42041eb938
1 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. +8
    -6
      mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml

+ 8
- 6
mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml Voir le fichier

@@ -100,7 +100,9 @@
</select> </select>


<select id="sceneDataMapJoinCouponOrder" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> <select id="sceneDataMapJoinCouponOrder" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap">
select DATE_FORMAT(create_date,'%m/%d') AS xTime,COUNT(wx_coupon_order.id) as tempCount from wx_coupon_action_log
select DATE_FORMAT(create_date,'%m/%d') AS xTime,
COUNT(wx_coupon_order.id) as tempCount
from wx_coupon_action_log
left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id
where wx_coupon_action_log.tenant_id=#{tenantId} where wx_coupon_action_log.tenant_id=#{tenantId}
----- and wx_coupon_order.coupon_order_status = 1 ---- ----- and wx_coupon_order.coupon_order_status = 1 ----
@@ -113,10 +115,7 @@


<select id="sceneDataList" resultType="com.iformall.domain.vo.MarkingSceneDataVo" parameterType="hashmap"> <select id="sceneDataList" resultType="com.iformall.domain.vo.MarkingSceneDataVo" parameterType="hashmap">
select DATE_FORMAT(create_time,'%Y-%m-%d') as xTime, select DATE_FORMAT(create_time,'%Y-%m-%d') as xTime,
(select Count(*) from wx_coupon_action_log c
where DATE_FORMAT(create_time,'%Y-%m-%d')=xTime
and c.channel_type=#{channelType}
and tenant_id=#{tenantId} ) as sendCount
Count(*) as sendCount
from wx_coupon_action_log from wx_coupon_action_log
where tenant_id=#{tenantId} where tenant_id=#{tenantId}
and channel_type=#{channelType} and channel_type=#{channelType}
@@ -131,7 +130,10 @@
</select> </select>


<select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> <select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap">
select DATE_FORMAT(create_date,'%Y-%m-%d') AS xTime,COUNT(wx_coupon_order.id) as tempCount from wx_coupon_action_log left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id
select DATE_FORMAT(create_date,'%Y-%m-%d') AS xTime,
COUNT(wx_coupon_order.id) as tempCount
from wx_coupon_action_log
left join wx_coupon_order on wx_coupon_action_log.coupon_order_id=wx_coupon_order.id
where wx_coupon_action_log.tenant_id=#{tenantId} where wx_coupon_action_log.tenant_id=#{tenantId}
and wx_coupon_order.coupon_order_status = 1 and wx_coupon_order.coupon_order_status = 1
<if test=" null != startTime "> <if test=" null != startTime ">


Chargement…
Annuler
Enregistrer