Kaynağa Gözat

[云端测试 version:.426.552:营销统计-筛选问题]

release_toaliyun_real
gongbiao 7 yıl önce
ebeveyn
işleme
23c9abfe0f
2 değiştirilmiş dosya ile 10 ekleme ve 6 silme
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  2. +8
    -4
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java Dosyayı Görüntüle

@@ -566,7 +566,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
if (markingCouponDataReportDto.getStartTime() != null) if (markingCouponDataReportDto.getStartTime() != null)
params1.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); params1.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null) if (markingCouponDataReportDto.getEndTime() != null)
params1.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params1.put("endTime", markingCouponDataReportDto.getEndTime());
PageHelper.startPage(pageIndex, pageSize); PageHelper.startPage(pageIndex, pageSize);
List<TouchUsersReportVo> wxUserVisitList = wxUserVisitMapper.touchUsersReportList(params1); List<TouchUsersReportVo> wxUserVisitList = wxUserVisitMapper.touchUsersReportList(params1);


@@ -580,7 +580,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
if (markingCouponDataReportDto.getStartTime() != null) if (markingCouponDataReportDto.getStartTime() != null)
params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); params2.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0));
if (markingCouponDataReportDto.getEndTime() != null) if (markingCouponDataReportDto.getEndTime() != null)
params2.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1));
params2.put("endTime", markingCouponDataReportDto.getEndTime());
List<TouchUsersReportVo> couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2); List<TouchUsersReportVo> couponDatalist = wxCouponOrderMapper.touchUsersReportList(params2);


Map<String,TouchUsersReportVo> visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getxTime, p -> p)); Map<String,TouchUsersReportVo> visitMap = couponDatalist.stream().collect(Collectors.toMap(TouchUsersReportVo::getxTime, p -> p));


+ 8
- 4
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Dosyayı Görüntüle

@@ -378,8 +378,8 @@
<if test=" null != couponOrderStatus "> <if test=" null != couponOrderStatus ">
and co.coupon_order_status = #{couponOrderStatus} and co.coupon_order_status = #{couponOrderStatus}
</if> </if>
<if test=" null != merchantName ">
<if test=" null != merchantName and merchantName!=''">
and (case when com.mc=1 then and (case when com.mc=1 then
(select m.name from wx_merchant m, wx_coupon_merchant cm (select m.name from wx_merchant m, wx_coupon_merchant cm
where m.id = cm.merchant_id and cm.product_id=co.coupon_id) else '[多商户通用]' end) where m.id = cm.merchant_id and cm.product_id=co.coupon_id) else '[多商户通用]' end)
@@ -393,9 +393,13 @@
<if test="endDate != null"> <if test="endDate != null">
AND co.create_date &lt; #{endDate,jdbcType=TIMESTAMP} AND co.create_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if> </if>

<if test=" null != id ">
and co.id = #{id}
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if> <if test=" null != sortColumns"> order by ${sortColumns} </if>

</select> </select>






Yükleniyor…
İptal
Kaydet