From 865c5d54ca63ed7a5bda4a92d27ea0b7c6e61b04 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 17 十二月 2025 18:02:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/jiashida
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java
index 7622560..bac1266 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBigGiftPackageOrderService.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.dto.BigGiftPlaceOrderDTO;
+import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.query.BigGiftPackageOrderQuery;
import com.ruoyi.system.query.ProfitPageListQuery;
import com.ruoyi.system.vo.ProfitPageListVo;
+import com.ruoyi.system.vo.PlaceOrderVO;
import javax.validation.Valid;
import java.util.List;
@@ -25,6 +27,25 @@
List<TBigGiftPackageOrder> export(BigGiftPackageOrderQuery query);
+ /**
+ * 大礼包下单
+ *
+ * @param dto 下单请求参数
+ * @param appUserId 用户ID
+ * @param openid 用户微信openid
+ * @return 下单结果（包含订单信息和支付参数）
+ */
+ PlaceOrderVO placeOrder(BigGiftPlaceOrderDTO dto, Integer appUserId, String openid);
+
+ /**
+ * 大礼包尾款支付
+ *
+ * @param orderId 订单ID
+ * @param appUserId 用户ID
+ * @param openid 用户微信openid
+ * @return 支付结果（包含订单信息和支付参数）
+ */
+ PlaceOrderVO payFinalPayment(Integer orderId, Integer appUserId, String openid);
List<ProfitPageListVo> profitPageList(Page<ProfitPageListVo> page, @Valid ProfitPageListQuery query);
--
Gitblit v1.7.1