From 9088209cdd7e3158d2a04caae05e6726ba3b3ad6 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 12 十二月 2023 18:26:17 +0800
Subject: [PATCH] Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkBike into devPartner
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 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 6941ae7..4724ede 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,14 +1,20 @@
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 com.wechat.pay.java.service.refund.model.RefundNotification;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -93,7 +99,7 @@
* @return PageData<Goodsorder>
*/
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
-
+ PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap);
/**
* 鏉′欢缁熻
*
@@ -139,8 +145,47 @@
* @param id
* @return
*/
- void closerGoodsorder(String id);
+ void closeGoodsorder(Goodsorder order,int type );
+ void closeGoodsorderDone(RefundNotification param);
+ 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