From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 452593d..c8fb0ca 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,8 +5,10 @@
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;
@@ -19,7 +21,9 @@
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;
/**
@@ -128,9 +132,16 @@
*/
Object createGoodsOrderPay(String memberId);
+ /**
+ * 濂楅璐拱
+ * @param discountId
+ * @param memberId
+ * @return
+ */
+ Object createDiscountOrderPay(String discountId,String memberId);
/**
- * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * 鏀粯鍥炶皟涓氬姟
* @param preOrderId
* @return
*/
@@ -144,6 +155,7 @@
*/
GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+ Integer getVoltageStatus(Bikes bikes);
/**
* 濂楅鍗¤鍗曡鎯�
* @param id
@@ -152,7 +164,6 @@
GoodsorderDetailVO getGoodsorderDetailForDisCount(String id);
/**
* 寮哄埗缁撶畻璁㈠崟
- * @param id
* @return
*/
void closeGoodsorder(Goodsorder order,int type );
@@ -161,10 +172,16 @@
void forceCloseGoodsorder(String orderId);
/**
- * 閫�娆�
- * @param orderId
+ * 閫�娆�(鐧诲綍浜轰粠 Shiro 涓婁笅鏂囧彇,platform 绔敤)
*/
void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO);
+
+ /**
+ * 閫�娆�(鐧诲綍浜虹敱璋冪敤鏂逛紶鍏�,web 绔� JWT 鍦烘櫙鐢�,creator=缁戝畾鐨勭鐞嗗憳ID)
+ * @param goodsorderBackDTO 閫�娆惧叆鍙�
+ * @param creator 鎿嶄綔浜篒D(閫�娆惧崟 + 濂楅鎿嶄綔鏃ュ織鐨� creator)
+ */
+ void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO, String creator);
List<MemberRides> getMemberRidesForClose(String orderid );
/**
* 鑾峰彇鍙��娆句俊鎭�
@@ -202,4 +219,11 @@
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