add 新增首页查询抽成金额接口

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -431,4 +431,10 @@ public interface OrderBasicInfoMapper {
             @Param("endTime") String endTime
     );
 
+    /**
+     * 查询平台抽成收入
+     * @param dto
+     * @return
+     */
+    List<IndexPlatformProfitVO> getPlatformProfit(IndexQueryDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java

@@ -631,4 +631,11 @@ public interface OrderBasicInfoService{
      * @return
      */
     List<BusinessOrderDetailInfoVO> getOrderDetailByStationIdsForMonth(List<String> stationIds , String startTime , String endTime);
+
+    /**
+     * 获取平台抽成金额
+     * @param dto
+     * @return
+     */
+    List<IndexPlatformProfitVO> getPlatformProfit(IndexQueryDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -5939,5 +5939,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
     public List<BusinessOrderDetailInfoVO> getOrderDetailByStationIdsForMonth(List<String> stationIds , String startTime , String endTime) {
         return orderBasicInfoMapper.getOrderDetailByStationIdsForMonth(stationIds, startTime, endTime);
     }
+
+    /**
+     * 查询平台抽成金额
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<IndexPlatformProfitVO> getPlatformProfit(IndexQueryDTO dto) {
+        return orderBasicInfoMapper.getPlatformProfit(dto);
+    }
 }
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java

@@ -61,7 +61,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
     @DubboReference
     private JcppService jcppService;
 
-    // 引入线程池
+    // 引入线程池s
     private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
 
     // 需要记录报文的数据帧类型

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/IndexPlatformProfitVO.java

@@ -0,0 +1,55 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.Data;
+
+/**
+ * 平台抽成信息VO
+ */
+@Data
+public class IndexPlatformProfitVO {
+
+    /**
+     * 充电次数
+     */
+    private String chargeTimes;
+
+    /**
+     * 交易日期
+     */
+    private String tradeDate;
+
+    /**
+     * adapay会员ID
+     */
+    private String adapayMemberId;
+
+    /**
+     * 电量金额
+     */
+    private String electricityAmount;
+
+    /**
+     * 服务费金额
+     */
+    private String serviceAmount;
+
+    /**
+     * 结算金额
+     */
+    private String settleAmount;
+
+    /**
+     * 电费抽成金额
+     */
+    private String electricitySplitAmount;
+
+    /**
+     * 服务费抽成金额
+     */
+    private String serviceSplitAmount;
+
+    /**
+     * 总抽成金额
+     */
+    private String totalSplitAmount;
+}

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -3451,4 +3451,27 @@
         AND DATE_ADD(#{endTime,jdbcType=VARCHAR}, INTERVAL 1 DAY)
         ORDER BY t1.create_time DESC
     </select>
+
+    <select id="getPlatformProfit" resultType="com.jsowell.pile.vo.web.IndexPlatformProfitVO">
+        select
+            count(DISTINCT(`order_code` ) ) as chargeTimes,
+            trade_date as tradeDate,
+            -- station_name as '站点名称',
+            adapay_member_id as adapayMemberId,
+            sum(`electricity_amount` ) as electricityAmount,
+            sum(`service_amount` ) as serviceAmount,
+            sum(`settle_amount` ) as settleAmount,
+            sum(electricity_split_amount) as electricitySplitAmount,
+            sum(service_split_amount) as serviceSplitAmount,
+            sum(electricity_split_amount + service_split_amount) as totalSplitAmount
+        from
+            `order_split_record`
+        WHERE
+            `trade_date` BETWEEN #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+          and `adapay_member_id` = '0'
+          and `electricity_split_ratio` = '2'
+          and `del_flag` = '0'
+        group by
+            `trade_date`
+    </select>
 </mapper>