From 1e676b408c8c7e1ccca08b151619d89fdc2bc9bf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 14:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index c599567..4568275 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -5,8 +5,11 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
+import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
+import com.doumee.dao.business.web.response.RidesDetailResponse;
import java.util.List;
@@ -116,6 +119,7 @@
*/
Object createGoodsOrderPay(String memberId);
+
/**
* 鎶奸噾鏀粯鍥炶皟涓氬姟
* @param preOrderId
@@ -137,5 +141,17 @@
* @param id
* @return
*/
- Goodsorder closerGoodsorder(String id);
+ void closerGoodsorder(String id);
+
+
+ /**
+ * 楠戣璁板綍璇︽儏
+ * @param id
+ * @return
+ */
+ RidesDetailResponse getRidesDetailResponse(String id);
+
+ GoodsorderTotalDataVO getTotalData(Goodsorder pageWrap);
+
+ List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model);
}
--
Gitblit v1.9.3