From f2ddb8b118a80b906055146dd7606300e820b59e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 14 五月 2026 15:43:51 +0800
Subject: [PATCH] feat:联调修改
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 422dcdc..cadb334 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -125,6 +125,9 @@
<if test="req.orderSource != null and req.orderSource == 3 ">
and t1.tripartite_platform_name = 'XinDianTu'
</if>
+ <if test="req.isWhitelist != null">
+ and t1.is_whitelist = #{req.isWhitelist}
+ </if>
<if test="req.paymentType != null and req.paymentType == 1 ">
and t1.recharge_payment_type = 1
</if>
@@ -1050,6 +1053,8 @@
h.electrovalence as electrovalence,
CASE WHEN a.order_source = 1 THEN h.serviceCharge ELSE h.serviceCharge * 0.8 END as serviceCharge,
0 as commissionAmount,
+ <!-- 引流平台分佣按三方订单原始服务费的20%计算，导出需展示在白名单字段前。 -->
+ CASE WHEN a.order_source = 2 THEN IFNULL(h.serviceCharge, 0) * 0.2 ELSE 0 END as sharingAmount,
a.tripartite_platform_name as tripartitePlatformName,
a.create_time as createTime,
a.start_time as startTime,
@@ -2151,6 +2156,9 @@
<if test="req.orderSource != null and req.orderSource == 3 ">
and b.tripartite_platform_name = 'XinDianTu'
</if>
+ <if test="req.isWhitelist != null">
+ and b.is_whitelist = #{req.isWhitelist}
+ </if>
<if test="req.paymentType != null and req.paymentType == 1 ">
and b.recharge_payment_type = 1
</if>
--
Gitblit v1.7.1