This commit is contained in:
Lemon
2025-04-11 15:49:34 +08:00
parent 4e872123a1
commit 4156df68c0

View File

@@ -807,8 +807,8 @@
t2.order_amount AS orderAmount,
t1.settle_amount AS settleAmount,
t1.adapay_member_id AS adapayMemberId,
t3.id as merchantId,
t3.merchant_name as merchantName,
t4.id as merchantId,
t4.merchant_name as merchantName,
t1.electricity_split_ratio AS electricitySplitRatio,
t1.electricity_split_amount AS electricitySplitAmount,
t1.service_split_ratio AS serviceSplitRatio,
@@ -818,7 +818,8 @@
order_split_record t1
JOIN order_basic_info t2 ON t1.order_code = t2.order_code
AND t1.del_flag = '0'
join pile_merchant_info t3 on t2.merchant_id = t3.id and t2.del_flag = '0'
join adapay_member_account t3 on t1.adapay_member_id = t3.adapay_member_id
join pile_merchant_info t4 on t3.merchant_id = t4.id
WHERE
t1.station_id = #{dto.stationId,jdbcType=VARCHAR}
AND t1.trade_date BETWEEN #{dto.startTime,jdbcType=VARCHAR} AND #{dto.endTime,jdbcType=VARCHAR}