ebike-feign/src/main/java/com/ebike/feign/model/vo/FeignEbikeOrderStatisticsVo.java

@@ -1,14 +1,15 @@
 package com.ebike.feign.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author yanglei
@@ -20,11 +21,24 @@ import java.util.List;
 @AllArgsConstructor
 public class FeignEbikeOrderStatisticsVo implements Serializable {
 
-    private List<Long> operatorId;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
-    private List<LocalDate> times;
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
 
-    private List<Integer> orderCounts;
+    /**
+     * 订单数量
+     */
+    private Integer orderCount;
 
-    private List<BigDecimal> orderAmounts;
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime createTime;
 }

ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeStatisticsController.java

@@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 用户订单统计 控制层
- *
  * @author yanglei
  * @since 2026-01-16  15:15
  */
@@ -35,8 +33,8 @@ public class EbikeStatisticsController {
      */
     @PostMapping("/getOrderStatistics")
     public JsonResult<?> getOrderStatistics(@RequestBody @Validated FeignEbikeOrderStatisticsDto dto) {
-        long staffId = StpUtil.getLoginIdAsLong();
+        Long staffId = StpUtil.getLoginIdAsLong();
-        CommonStaffInfo staffInfo = StpUtil.getSession().getModel(String.valueOf(staffId), CommonStaffInfo.class);
+        CommonStaffInfo staffInfo = StpUtil.getSession().getModel(staffId.toString(), CommonStaffInfo.class);
         dto.setOperatorId(staffInfo.getOperatorId());
         JsonResult<?> jsonResult = userFeignClient.getOrderStatistics(dto);
         if (jsonResult.getCode() != Code.SUCCESS) {

ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java

@@ -168,7 +168,7 @@ public class EbikeOrderController {
      */
     @PostMapping("/api/getOrderStatistics")
     public JsonResult<?> getOrderStatistics(@RequestBody @Validated FeignEbikeOrderStatisticsDto dto) {
-        FeignEbikeOrderStatisticsVo result = ebikeOrderService.getOrderStatistics(dto);
+        List<FeignEbikeOrderStatisticsVo> result = ebikeOrderService.getOrderStatistics(dto);
         return JsonResult.success(result);
     }
 }

ebike-user/src/main/java/com/cdzy/user/mapper/EbikeOrderMapper.java

@@ -1,8 +1,8 @@
 package com.cdzy.user.mapper;
 
 import com.cdzy.user.model.entity.EbikeOrder;
-import com.cdzy.user.model.vo.EbikeOrderStatisticsVo;
 import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo;
+import com.ebike.feign.model.vo.FeignEbikeOrderStatisticsVo;
 import com.mybatisflex.core.BaseMapper;
 
 import java.time.LocalDateTime;
@@ -33,5 +33,5 @@ public interface EbikeOrderMapper extends BaseMapper<EbikeOrder> {
      * @param endTime    结束时间
      * @return 订单数据及订单金额
      */
-    List<EbikeOrderStatisticsVo> getOrderStatistics(Long operatorId, LocalDateTime startTime, LocalDateTime endTime);
+    List<FeignEbikeOrderStatisticsVo> getOrderStatistics(Long operatorId, LocalDateTime startTime, LocalDateTime endTime);
 }

ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeOrderStatisticsVo.java

@@ -1,38 +0,0 @@
-package com.cdzy.user.model.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * @author yanglei
- * @since 2026-01-16  15:43
- */
-@Data
-public class EbikeOrderStatisticsVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 运营商id
-     */
-    private Long operatorId;
-
-    /**
-     * 订单数量
-     */
-    private Integer orderCount;
-
-    /**
-     * 订单金额
-     */
-    private BigDecimal orderAmount;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
-}

ebike-user/src/main/java/com/cdzy/user/service/EbikeOrderService.java

@@ -123,5 +123,5 @@ public interface EbikeOrderService extends IService<EbikeOrder> {
      * @param dto 订单请求参数
      * @return 订单数据及订单金额
      */
-    FeignEbikeOrderStatisticsVo getOrderStatistics(FeignEbikeOrderStatisticsDto dto);
+    List<FeignEbikeOrderStatisticsVo> getOrderStatistics(FeignEbikeOrderStatisticsDto dto);
 }

ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java

@@ -20,7 +20,6 @@ import com.cdzy.user.model.entity.EbikeOrderDetail;
 import com.cdzy.user.model.entity.EbikePayment;
 import com.cdzy.user.model.vo.EbikeBikeInfoVo;
 import com.cdzy.user.model.vo.EbikeOrderDetailVo;
-import com.cdzy.user.model.vo.EbikeOrderStatisticsVo;
 import com.cdzy.user.model.vo.EbikePaymentCostDetailVo;
 import com.cdzy.user.model.vo.EbikeRevenueStatisticsVo;
 import com.cdzy.user.model.vo.EbikeUserAllOrdersVo;
@@ -52,7 +51,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static com.cdzy.user.model.entity.table.EbikeOrderTableDef.EBIKE_ORDER;
 import static com.cdzy.user.model.entity.table.EbikeRefundTableDef.EBIKE_REFUND;
@@ -358,20 +356,14 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
     }
 
     @Override
-    public FeignEbikeOrderStatisticsVo getOrderStatistics(FeignEbikeOrderStatisticsDto dto) {
+    public List<FeignEbikeOrderStatisticsVo> getOrderStatistics(FeignEbikeOrderStatisticsDto dto) {
         TimeRangeEnum timeRange = TimeRangeEnum.fromCode(dto.getTimeRange());
         LocalDateTime[] range = timeRange.getRange();
-        List<EbikeOrderStatisticsVo> orderStatistics = this.mapper.getOrderStatistics(
+        return this.mapper.getOrderStatistics(
                 dto.getOperatorId(),
                 range[0],
                 range[1]
         );
-        return FeignEbikeOrderStatisticsVo.builder()
-                .operatorId(orderStatistics.stream().map(EbikeOrderStatisticsVo::getOperatorId).collect(Collectors.toList()))
-                .times(orderStatistics.stream().map(vo -> vo.getCreateTime().toLocalDate()).collect(Collectors.toList()))
-                .orderCounts(orderStatistics.stream().map(EbikeOrderStatisticsVo::getOrderCount).collect(Collectors.toList()))
-                .orderAmounts(orderStatistics.stream().map(EbikeOrderStatisticsVo::getOrderAmount).collect(Collectors.toList()))
-                .build();
     }
 
     /**

ebike-user/src/main/resources/mapper/EbikeOrderMapper.xml

@@ -56,7 +56,7 @@
     </select>
 
 
-    <select id="getOrderStatistics" resultType="com.cdzy.user.model.vo.EbikeOrderStatisticsVo">
+    <select id="getOrderStatistics" resultType="com.ebike.feign.model.vo.FeignEbikeOrderStatisticsVo">
         SELECT
         operator_id AS operatorId,
         create_time::date::timestamp AS createTime,