Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -60,16 +60,18 @@ public class IndexStatisticsController {
      * 奖励金额top10
      */
     @GetMapping("/rewardMoneyTopTen")
-    public void rewardMoneyTopTen(){
-
+    public R rewardMoneyTopTen(@RequestBody AnalysisPreviewQueryDTO param){
+        List<RewardMoneyTopTenDTO> rewardMoneyTopTenDTOS = statisticsService1.rewardMoneyTopTen(param);
+        return R.ok().put("data", rewardMoneyTopTenDTOS);
     }
 
     /**
      * 答题红包金额趋势图
      */
     @GetMapping("/rewardMoneyTrend")
-    public void rewardMoneyTrend(){
-
+    public R rewardMoneyTrend(@RequestBody AnalysisPreviewQueryDTO param){
+        List<RewardMoneyTrendDTO> rewardMoneyTrendDTOS = statisticsService1.rewardMoneyTrendDTO(param);
+        return R.ok().put("data", rewardMoneyTrendDTOS);
     }
 
     /**

fs-service-system/src/main/java/com/fs/statis/dto/RewardMoneyTopTenDTO.java

@@ -0,0 +1,13 @@
+package com.fs.statis.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class RewardMoneyTopTenDTO implements Serializable {
+    private Long companyId;
+    private String companyName;
+    private BigDecimal rewardMoney;
+}

fs-service-system/src/main/java/com/fs/statis/dto/RewardMoneyTrendDTO.java

@@ -0,0 +1,11 @@
+package com.fs.statis.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class RewardMoneyTrendDTO implements Serializable {
+    private BigDecimal rewardMoney;
+}

fs-service-system/src/main/java/com/fs/statis/mapper/ConsumptionBalanceMapper.java

@@ -104,4 +104,8 @@ public interface ConsumptionBalanceMapper {
      * @return TOP10
      */
     List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param);
+
+    List<RewardMoneyTopTenDTO> rewardMoneyTopTen(AnalysisPreviewQueryDTO param);
+
+    List<RewardMoneyTrendDTO> rewardMoneyTrendDTO(AnalysisPreviewQueryDTO param);
 }

fs-service-system/src/main/java/com/fs/statis/service/IStatisticsService.java

@@ -55,4 +55,9 @@ public interface IStatisticsService {
      * @return
      */
     List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param);
+
+    List<RewardMoneyTopTenDTO> rewardMoneyTopTen(AnalysisPreviewQueryDTO param);
+
+    List<RewardMoneyTrendDTO> rewardMoneyTrendDTO(AnalysisPreviewQueryDTO param);
+
 }

fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -178,4 +178,16 @@ public class StatisticsServiceImpl implements IStatisticsService {
         }
         return courseStatsDTOS;
     }
+
+    @Override
+    public List<RewardMoneyTopTenDTO> rewardMoneyTopTen(AnalysisPreviewQueryDTO param) {
+        List<RewardMoneyTopTenDTO> rewardMoneyTopTenDTOS = consumptionBalanceMapper.rewardMoneyTopTen(param);
+        return rewardMoneyTopTenDTOS;
+    }
+
+    @Override
+    public List<RewardMoneyTrendDTO> rewardMoneyTrendDTO(AnalysisPreviewQueryDTO param) {
+        List<RewardMoneyTrendDTO> rewardMoneyTrendDTOS = consumptionBalanceMapper.rewardMoneyTrendDTO(param);
+        return rewardMoneyTrendDTOS;
+    }
 }

fs-service-system/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -156,5 +156,11 @@
         ${sort}
         LIMIT 10
     </select>
+    <select id="rewardMoneyTopTen" resultType="com.fs.statis.dto.RewardMoneyTopTenDTO">
+
+    </select>
+    <select id="rewardMoneyTrendDTO" resultType="com.fs.statis.dto.RewardMoneyTrendDTO">
+
+    </select>
 
 </mapper>