From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java |  100 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
index c1d75ad..400f7eb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
@@ -2,14 +2,22 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
+import com.ruoyi.order.controller.management.dto.MgtOrderQuery;
+import com.ruoyi.order.controller.management.vo.MgtOrderVO;
+import com.ruoyi.order.vo.HomeGoodsSkuDTO1;
+import com.ruoyi.order.vo.WdOrderVO;
 import com.ruoyi.system.api.domain.Order;
 import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO;
 import com.ruoyi.system.api.domain.dto.MemberOrderDTO;
 import com.ruoyi.system.api.domain.dto.MemberOrderListDTO;
 import com.ruoyi.system.api.domain.dto.OrderDTO;
 import com.ruoyi.system.api.domain.vo.MemberOrderListVO;
+import com.ruoyi.system.api.domain.vo.MemberOrderNumVO;
 import com.ruoyi.system.api.domain.vo.MemberTiOrderVO;
+import com.ruoyi.system.api.domain.vo.MgtPromotionWishRecommendVO;
 import com.ruoyi.system.api.domain.vo.OrderVO;
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +32,7 @@
  */
 public interface IOrderService extends IService<Order> {
 
-    void saveOrderOne(OrderDTO OrderDTO);
+    Long saveOrderOne(OrderDTO OrderDTO);
 
     /**
      * 获取某个商品的已购会员数
@@ -51,18 +59,32 @@
     List<Order> getOrderByGroupPurchaseId(Long id);
 
     Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);
+
+    Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO);
+
+    Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO);
     List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);
+
+    List<OrderVO>  getOrderByGroupPurchaseMemberList1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
 
     MemberTiOrderVO saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);
 
     MemberTiOrderVO updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);
+
+    void updMemberOrderbz(@RequestBody MemberOrderDTO memberOrderDTO);
 
     PageDTO<MemberOrderListVO> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO);
 
     OrderVO MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
     void CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
 
+    void delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
     void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+    MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+    PageDTO<WdOrderVO> CtjlGoodsGroupPurchase(@RequestBody HomeGoodsSkuDTO1 homeGoodsSkuDTO1);
 
     /**
      * 根据优惠券id集合查询订单列表
@@ -71,4 +93,80 @@
      * @return List<Order>
      */
     List<Order> getOrderByCouponIds(Collection<Long> couponIds);
+
+    /**
+     * 商城订单分页列表
+     *
+     * @param query 商城订单查询对象
+     * @return PageDTO<MgtMallOrderVO>
+     */
+    PageDTO<MgtOrderVO> getOrderPage(MgtOrderQuery query);
+
+    /**
+     * 获取商城订单详情
+     *
+     * @param id 订单id
+     * @return MgtMallOrderVO
+     */
+    MgtOrderVO getOrderDetail(Long id);
+
+    /**
+     * 确认发货
+     *
+     * @param dto 确认发货请求对象
+     */
+    void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto);
+
+    /**
+     * 已收货
+     *
+     * @param id 订单id
+     */
+    void receivedGoods(Long id);
+
+    /**
+     * 退款
+     *
+     * @param id 订单id
+     */
+    void refund(Long id);
+
+    /**
+     * 退款退货
+     *
+     * @param id 订单id
+     */
+    void refundReturn(Long id);
+
+    /**
+     * 拍卖订单退保证金
+     *
+     * @param id 订单id
+     */
+    void refundBond(Long id);
+
+    /**
+     * 查询统计订单列表
+     *
+     * @param startTime 开始时间
+     * @param endTime   结束时间
+     * @return List<Order>
+     */
+    List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime);
+
+    List<Order> getOrderListByMubres(List<String> mubres);
+
+    void updateOrderStatusByMubres(List<String> formedGroupMubres);
+
+    void updateOrderStatusByMubres1(String formedGroupMubres);
+
+    List<Order> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres);
+
+    /**
+     * 根据skuId获取心愿求购详情数据
+     *
+     * @param id
+     * @return
+     */
+    MgtPromotionWishRecommendVO getWishDataBySkuId(Long id);
 }

--
Gitblit v1.7.1