From 7b46d1d38540333a59f7bba25af9d5aeabbc16bd Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 15 Jul 2025 15:39:26 +0800
Subject: [PATCH] 配送类型

---
 oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java |   84 ++++++++++++++++++++++++++++-------------
 1 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java b/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
index d40a98b..73db9e8 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java
@@ -2,58 +2,88 @@
 
 import com.oying.modules.sh.domain.Order;
 import com.oying.modules.sh.domain.dto.OrderQueryCriteria;
+
 import java.util.List;
 import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.sh.domain.request.GeneratorOrder;
+import com.oying.modules.sh.domain.request.StatusOrder;
+import com.oying.modules.sh.domain.request.SubmitOrder;
+import com.oying.modules.sh.domain.vo.OrderInfo;
+import com.oying.modules.sh.domain.vo.OrderResponse;
 import com.oying.utils.PageResult;
+import com.oying.utils.enums.OrderStatusEnum;
+import com.oying.utils.enums.PayStateEnum;
 
 /**
-* @description 服务接口
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @description 服务接口
+ * @date 2025-06-11
+ **/
 public interface OrderService extends IService<Order> {
 
     /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param page 分页参数
-    * @return PageResult
-    */
+     * 查询数据分页
+     *
+     * @param criteria 条件
+     * @param page     分页参数
+     * @return PageResult
+     */
     PageResult<Order> queryAll(OrderQueryCriteria criteria, Page<Object> page);
 
     /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<OrderDto>
-    */
+     * 查询所有数据不分页
+     *
+     * @param criteria 条件参数
+     * @return List<OrderDto>
+     */
     List<Order> queryAll(OrderQueryCriteria criteria);
 
+    OrderInfo generatorOrder(GeneratorOrder generator);
+
+    Order submitOrder(SubmitOrder submit, HttpServletRequest request);
+
+    OrderResponse getByOrderNum(String orderNum);
+
+    void operationLog(OrderResponse order, OrderStatusEnum stateEnum);
+
+    void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);
+
     /**
-    * 创建
-    * @param resources /
-    */
+     * 创建
+     *
+     * @param resources /
+     */
     void create(Order resources);
 
     /**
-    * 编辑
-    * @param resources /
-    */
+     * 编辑
+     *
+     * @param resources /
+     */
     void update(Order resources);
 
     /**
-    * 多选删除
-    * @param ids /
-    */
+     * 多选删除
+     *
+     * @param ids /
+     */
     void deleteAll(List<Long> ids);
 
     /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
+     * 导出数据
+     *
+     * @param all      待导出的数据
+     * @param response /
+     * @throws IOException /
+     */
     void download(List<Order> all, HttpServletResponse response) throws IOException;
+
+    void closeOrder(String orderNum);
+
+    void statusOrder(StatusOrder statusOrder);
 }

--
Gitblit v1.9.3