From cead7b98d5cebc0825b919799e23732877361de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 18:39:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
index fec45aa..dac1e6e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java
@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingResult;
import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
-import com.ruoyi.order.domain.dto.MerVerifyPrizeDto;
+import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.Order;
import com.ruoyi.order.domain.vo.*;
@@ -103,36 +104,55 @@
* @return
*/
MerHomeShopTotalVo getMerHomeTotal(MerHomeShopTotalVo merHomeShopTotalVo);
-
+
/**
* 获取核销订单
+ *
* @param orderId
* @return
*/
- MerVerifyOrderVo verifyOrder(String orderId,Long shopId);
-
+ MerVerifyOrderVo verifyOrder(String orderId, Long shopId);
+
+ /**
+ * 获取抖音的核销订单
+ *
+ * @param orderId
+ * @param shopId
+ * @return
+ */
+ MerVerifyOrderVo verifyOrderDouYin(String orderId, Long shopId);
+
/**
* 确认核销订单
+ *
* @param merVerifyOrderDto
* @return
*/
MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto);
-
+
/**
- * @description 确认核销优惠券
- * @author jqs
- * @date 2023/6/28 11:26
+ * 核销抖音券
+ *
+ * @return
+ */
+ MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto);
+
+
+ /**
* @param merVerifyCouponDto
- * @return MerVerifyCouponVo
+ * @return MerVerifyCouponVo
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/6/28 11:26
*/
MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto);
-
+
/**
- * @description 确认核销奖品
- * @author jqs
- * @date 2023/7/9 9:54
* @param merVerifyPrizeDto
- * @return MerVerifyAwardVo
+ * @return MerVerifyAwardVo
+ * @description 确认核销奖品
+ * @author jqs
+ * @date 2023/7/9 9:54
*/
MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto);
@@ -233,7 +253,7 @@
* @author jqs34
* @date 2023/6/18 17:20
*/
- MgtBulletinBoardVo boardOrderTotal();
+ MgtBulletinBoardVo boardOrderTotal(List<Long> userIds);
/**
* @description 获取商户订单统计
@@ -253,6 +273,8 @@
* @return MgtTotalActivityTotalVo
*/
MgtTotalActivityTotalVo getTotalActivityTotal(MgtBaseShopDto mgtBaseShopDto);
+
+ MgtTotalActivityTotalVo getTotalActivityJoinMemberTotal(MgtBaseShopDto mgtBaseShopDto);
/**
* @description 获取商户活动年龄分布
@@ -307,6 +329,10 @@
* @return MgtTotalActivityTotalVo
*/
MgtPlTotalActivityTotalVo getPlTotalActivityTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ MgtPlTotalActivityTotalVo getPlTotalActivityJoinMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
+
+ MgtPlTotalActivityTotalVo getPlTotalActivityGetMemberTotal(MgtBasePlatformDto mgtBasePlatformDto);
/**
* @description 获取商户活动年龄分布
@@ -425,7 +451,7 @@
* @param transaction
* @return void
*/
- void payBack(PartnerTransactionsResult transaction);
+ void payBack(PartnerTransactionsResult transaction, BigDecimal feeAmount);
/**
* 取消订单
@@ -528,10 +554,6 @@
List<MerOrderPageVo> pageMerMemberPayOrder(Page page,MerMemberNoClearOrderDto merOrderPageDto);
- void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
- String goodsName, String orderNo,
- String orderId, BigDecimal payMoney,
- String openid, String payerClientIp, List<String> goodsNameList,Integer orderFrom);
/**
* @description 获取销售排行
@@ -573,4 +595,24 @@
* @return
*/
Order getByOutTradeNo(String outTradeNo);
+
+ /**
+ * @description 商户端会员订单统计
+ * @author jqs
+ * @date 2023/8/29 17:39
+ * @param merBaseDto
+ * @return MerMemberSimpleTotalVo
+ */
+ MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(MerBaseDto merBaseDto);
+
+
+ ProfitSharingResult queryBill(String orderId) throws WxPayException;
+
+
+ /**
+ * 根据活动id获取订单商品id列表
+ * @param activityId
+ * @return
+ */
+ List<String> getActivityOrderGoods(String activityId);
}
--
Gitblit v1.7.1