From cde49794973557adda93091606a9820e7fddb46f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 17:03:58 +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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 5dc8652..213dd1d 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import com.doumee.dao.business.web.response.RidesDetailResponse;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -96,7 +97,7 @@
* @return PageData<Goodsorder>
*/
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
-
+ PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap);
/**
* 鏉′欢缁熻
*
@@ -146,6 +147,13 @@
/**
+ * 閫�娆�
+ * @param orderId
+ */
+ void backGoodsorder(String orderId, BigDecimal money);
+
+
+ /**
* 楠戣璁板綍璇︽儏
* @param id
* @return
@@ -166,7 +174,7 @@
Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);
- List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model);
+ List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);
void goodsOrderSettlement(String orderId);
}
--
Gitblit v1.9.3