From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 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 0fd4958..7468652 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
@@ -1,11 +1,19 @@
package com.doumee.service.business;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.core.model.PageData;
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.request.GoodsorderCanBanlanceDTO;
+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.math.BigDecimal;
import java.util.List;
/**
@@ -90,7 +98,7 @@
* @return PageData<Goodsorder>
*/
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
-
+ PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap);
/**
* 鏉′欢缁熻
*
@@ -98,4 +106,84 @@
* @return long
*/
long count(Goodsorder goodsorder);
+
+
+ /**
+ * 棣栭〉鏁版嵁
+ * @param memberId
+ * @return
+ */
+ HomeResponse getHome(String memberId);
+
+ /**
+ * 鎶奸噾鏀粯涓氬姟
+ * @param memberId
+ * @return
+ */
+ Object createGoodsOrderPay(String memberId);
+
+
+ /**
+ * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * @param preOrderId
+ * @return
+ */
+ String payNotify(String preOrderId,String paymentNo);
+
+
+ /**
+ * 鏌ヨ璁㈠崟璇︽儏
+ * @param id
+ * @return
+ */
+ GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+
+
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @param id
+ * @return
+ */
+ void closeGoodsorder(Goodsorder order,int type );
+ void forceCloseGoodsorder(String orderId);
+
+ /**
+ * 閫�娆�
+ * @param orderId
+ */
+ void backGoodsorder(String orderId, BigDecimal money ,String reason);
+
+ /**
+ * 鑾峰彇鍙��娆句俊鎭�
+ * @param orderId
+ */
+ GoodsorderCanBanlanceDTO getGoodsorderCanBanlanceDTO(String orderId);
+
+
+ /**
+ * 楠戣璁板綍璇︽儏
+ * @param id
+ * @return
+ */
+ RidesDetailResponse getRidesDetailResponse(String id);
+
+ GoodsorderTotalDataVO getTotalData(Goodsorder pageWrap);
+
+ /**
+ * 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
+ */
+ Boolean checkBusiness();
+
+ /**
+ * 楠岃瘉鏄惁澶勪簬鍋滄杩愯惀鏃堕棿
+ */
+ Boolean checkTemporaryStop();
+
+ Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);
+
+ List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);
+
+ void goodsOrderSettlement(String memberId);
+
+ void autoCloseOrder();
}
--
Gitblit v1.9.3