From 856f526f823f5dad88c28657d82f971ff66afb1e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 15 九月 2025 13:37:01 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 64 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 7 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 3120eae..a63ecaa 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,13 +5,25 @@
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.DiscountMember;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.BikeIncomeReportVO;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
+import com.doumee.dao.business.web.request.BackElecBikeRequest;
+import com.doumee.dao.business.web.request.GoodsorderBackDTO;
+import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
+import com.doumee.dao.business.web.response.GoodsorderDetailVO;
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 io.swagger.models.auth.In;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -120,9 +132,16 @@
*/
Object createGoodsOrderPay(String memberId);
+ /**
+ * 濂楅璐拱
+ * @param discountId
+ * @param memberId
+ * @return
+ */
+ Object createDiscountOrderPay(String discountId,String memberId);
/**
- * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * 鏀粯鍥炶皟涓氬姟
* @param preOrderId
* @return
*/
@@ -136,13 +155,32 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
-
+ Integer getVoltageStatus(Bikes bikes);
/**
- * 寮哄埗缁撶畻璁㈠崟
+ * 濂楅鍗¤鍗曡鎯�
* @param id
* @return
*/
- void closerGoodsorder(String id);
+ GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
+ /**
+ * 寮哄埗缁撶畻璁㈠崟
+ * @return
+ */
+ void closeGoodsorder(Goodsorder order,int type );
+ void dealCloseGoodsorderBiz(Goodsorder goodsorder, int type, List<MemberRides> memberRides) ;
+ void closeGoodsorderDone(RefundNotification param);
+ void forceCloseGoodsorder(String orderId);
+
+ /**
+ * 閫�娆�
+ */
+ void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
+ List<MemberRides> getMemberRidesForClose(String orderid );
+ /**
+ * 鑾峰彇鍙��娆句俊鎭�
+ * @param orderId
+ */
+ GoodsorderCanBanlanceDTO getGoodsorderCanBanlanceDTO(String orderId);
/**
@@ -157,16 +195,28 @@
/**
* 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
*/
- void checkBusiness();
+ Boolean checkBusiness();
/**
* 楠岃瘉鏄惁澶勪簬鍋滄杩愯惀鏃堕棿
*/
- void checkTemporaryStop();
+ Boolean checkTemporaryStop();
Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);
List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);
- void goodsOrderSettlement(String orderId);
+ void goodsOrderSettlement(String memberId);
+
+ void autoCloseOrder();
+
+ void autoCancelRefunOrder();
+
+ DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);
+
+ void autCancel();
+
+ List<List<String>> getBikeIncomeReportVOList(Date startDate , Date endDate);
+
+ void excel(Date startDate , Date endDate, HttpServletResponse response);
}
--
Gitblit v1.9.3