update 后管页面查询引流抽成订单列表接口增加分页返回值

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderSplitRecordController.java

@@ -2,6 +2,7 @@ package com.jsowell.web.controller.pile;
 
 import com.google.common.collect.ImmutableMap;
 import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.pile.dto.QueryOrderSplitRecordDTO;
 import com.jsowell.pile.service.OrderSplitRecordService;
@@ -36,8 +37,8 @@ public class OrderSplitRecordController extends BaseController {
     public RestApiResponse<?> getStationCommissionList(@RequestBody QueryOrderSplitRecordDTO dto) {
         RestApiResponse<?> response = null;
         try {
-            List<OrderSplitRecordVO> stationCommissionList = orderSplitRecordService.getStationCommissionList(dto);
+            PageResponse pageResponse = orderSplitRecordService.getStationCommissionList(dto);
-            response = new RestApiResponse<>(ImmutableMap.of("stationCommissionList", stationCommissionList));
+            response = new RestApiResponse<>(pageResponse);
         }catch (Exception e) {
             logger.error("查询站点引流抽成订单列表 error", e);
             response = new RestApiResponse<>(e);

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

@@ -106,6 +106,6 @@ public interface OrderSplitRecordService {
      * @param dto
      * @return
      */
-    List<OrderSplitRecordVO> getStationCommissionList(QueryOrderSplitRecordDTO dto);
+    PageResponse getStationCommissionList(QueryOrderSplitRecordDTO dto);
 }
 

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

@@ -568,21 +568,30 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
      * @return
      */
     @Override
-    public List<OrderSplitRecordVO> getStationCommissionList(QueryOrderSplitRecordDTO dto) {
+    public PageResponse getStationCommissionList(QueryOrderSplitRecordDTO dto) {
         int pageNo = dto.getPageNum() == null ? 1 : dto.getPageNum();
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
         // 分页
         PageUtils.startPage(pageNo, pageSize);
         List<OrderSplitRecordVO> stationCommissionList = orderSplitRecordMapper.getStationCommissionList(dto);
         if (CollectionUtils.isEmpty(stationCommissionList)) {
-            return new ArrayList<>();
+            return null;
         }
-        for (OrderSplitRecordVO orderSplitRecordVO : stationCommissionList) {
+        PageInfo<OrderSplitRecordVO> pageInfo = new PageInfo<>(stationCommissionList);
+        for (OrderSplitRecordVO orderSplitRecordVO : pageInfo.getList()) {
             // 计算 抽成总金额 = 抽成电费 + 抽成服务费
             BigDecimal commissionAmount = orderSplitRecordVO.getElectricitySplitAmount().add(orderSplitRecordVO.getServiceSplitAmount());
             orderSplitRecordVO.setCommissionAmount(commissionAmount);
         }
-        return stationCommissionList;
+        // 组装分页返回参数
+        PageResponse pageResponse = PageResponse.builder()
+                .pageSize(pageSize)
+                .pageNum(pageNo)
+                .list(pageInfo.getList())
+                .pages(pageInfo.getPages())
+                .total(pageInfo.getTotal())
+                .build();
+        return pageResponse;
     }
 
     /**

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

@@ -195,6 +195,10 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
             if (StringUtils.isNotBlank(pileStationInfo.getMatchCars())) {
                 vo.setSelectMatchCars(Lists.newArrayList(pileStationInfo.getMatchCars().split(",")));
             }
+            // 支持服务费率
+            if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getServiceRate()))) {
+                vo.setServiceRate(pileStationInfo.getServiceRate());
+            }
 
             // 数据库保存的是GCJ02坐标，需要转换成天地图使用的WGS84坐标
             if (StringUtils.isNotBlank(pileStationInfo.getStationLat()) && StringUtils.isNotBlank(pileStationInfo.getStationLng())) {

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

@@ -288,4 +288,9 @@ public class PileStationVO {
      */
     private String parkingLockFlag;
 
+    /**
+     * 支持服务费率
+     */
+    private BigDecimal serviceRate;
+
 }