From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java |  123 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 122 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..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
@@ -1,11 +1,29 @@
 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.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;
 
 /**
@@ -90,7 +108,7 @@
      * @return PageData<Goodsorder>
      */
     PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap);
-
+    PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap);
     /**
      * 鏉′欢缁熻
      *
@@ -98,4 +116,107 @@
      * @return long
      */
     long count(Goodsorder goodsorder);
+
+
+    /**
+     * 棣栭〉鏁版嵁
+     * @param memberId
+     * @return
+     */
+    HomeResponse getHome(String memberId);
+
+    /**
+     * 鎶奸噾鏀粯涓氬姟
+     * @param memberId
+     * @return
+     */
+    Object createGoodsOrderPay(String memberId);
+
+    /**
+     * 濂楅璐拱
+     * @param discountId
+     * @param memberId
+     * @return
+     */
+    Object createDiscountOrderPay(String discountId,String memberId);
+
+    /**
+     * 鏀粯鍥炶皟涓氬姟
+     * @param preOrderId
+     * @return
+     */
+    String payNotify(String preOrderId,String paymentNo);
+
+
+    /**
+     * 鏌ヨ璁㈠崟璇︽儏
+     * @param id
+     * @return
+     */
+    GoodsorderDetailDTO getGoodsorderDetailDTO(String id);
+
+    Integer getVoltageStatus(Bikes bikes);
+    /**
+     * 濂楅鍗¤鍗曡鎯�
+     * @param id
+     * @return
+     */
+    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);
+
+    /**
+     * 楠岃瘉鏄惁涓鸿惀涓氭椂闂�
+     */
+    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();
+
+    List<List<String>> getBikeIncomeReportVOList(Date startDate , Date endDate);
+
+    void excel(Date startDate , Date endDate, HttpServletResponse response);
 }

--
Gitblit v1.9.3