From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 75 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 insertions(+), 6 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 87d8377..9a570bf 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,16 +1,26 @@
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.DiscountMember;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.MemberRides;
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 java.math.BigDecimal;
import java.util.List;
/**
@@ -95,7 +105,7 @@
* @return PageData<Goodsorder>
*/
PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
-
+ PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap);
/**
* 鏉′欢缁熻
*
@@ -119,9 +129,16 @@
*/
Object createGoodsOrderPay(String memberId);
+ /**
+ * 濂楅璐拱
+ * @param discountId
+ * @param memberId
+ * @return
+ */
+ Object createDiscountOrderPay(String discountId,String memberId);
/**
- * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * 鏀粯鍥炶皟涓氬姟
* @param preOrderId
* @return
*/
@@ -135,18 +152,64 @@
*/
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);
+ /**
+ * 楠戣璁板綍璇︽儏
+ * @param id
+ * @return
+ */
RidesDetailResponse getRidesDetailResponse(String id);
GoodsorderTotalDataVO getTotalData(Goodsorder pageWrap);
- List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model);
+ /**
+ * 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
+ */
+ Boolean checkBusiness();
+
+ /**
+ * 楠岃瘉鏄惁澶勪簬鍋滄杩愯惀鏃堕棿
+ */
+ Boolean checkTemporaryStop();
+
+ Goodsorder findOneByWrapper(QueryWrapper<Goodsorder> wrapper);
+
+ List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);
+
+ void goodsOrderSettlement(String memberId);
+
+ void autoCloseOrder();
+
+ void autoCancelRefunOrder();
+
+ DiscountMember getUseDiscount(String memberId, Integer driveTime,Integer type);
+
+ void autCancel();
}
--
Gitblit v1.9.3