From 3b054d0694de1a04c111f7adef089f264143cc8c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 11:52:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
index cb8e5ac..2d82659 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/ChargeOrderService.java
@@ -1,13 +1,23 @@
package com.ruoyi.order.service;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.model.Order;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
public interface ChargeOrderService extends IService<ChargeOrder> {
- void importExpress(String url);
+ R<JSONObject> importExpress(MultipartFile file);
PageInfo<ChargeOrder> getUserPointPageList(GetImportOrderDTO getImportOrderDTO);
+
+ List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);
+
}
--
Gitblit v1.7.1