Browse Source

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 years ago
parent
commit
d2c677d3dd
2 changed files with 4 additions and 6 deletions
  1. +0
    -2
      mallinkAdmin/pom.xml
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java

+ 0
- 2
mallinkAdmin/pom.xml View File

@@ -61,7 +61,6 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<!--
<layout>ZIP</layout>
<excludeGroupIds>
antlr,
@@ -185,7 +184,6 @@
xmlpull,
xpp3
</excludeGroupIds>
-->
</configuration>
</plugin>
</plugins>


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java View File

@@ -197,10 +197,10 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {

// 购买发券被核销数
HashMap<String, Object> params4 = new HashMap<>();
params3.put("tenantId", tenantId);
params3.put("startTime", addDay(-30));
params3.put("endTime", addDay(1));
params3.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券
params4.put("tenantId", tenantId);
params4.put("startTime", addDay(-30));
params4.put("endTime", addDay(1));
params4.put("channelType", EnumCouponSendSendType.C_ORDER.getCode());//买券
List<MarkingSceneDataReportVo> list4 = wxCouponActionLogMapper.sceneDataMapJoinCouponOrder(params4);
Map<String, Integer> OrderCountMap = list4.stream().collect(Collectors.toMap(MarkingSceneDataReportVo::getXTime, p -> p.getTempCount()));



Loading…
Cancel
Save