mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-19 18:45:03 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -714,13 +714,13 @@
|
||||
pay_amount as payAmount,
|
||||
settle_amount as settleAmount,
|
||||
confirmed_split_amount as confirmedSplitAmount,
|
||||
GREATEST(0, settle_amount - confirmed_split_amount) AS waitSplitAmount,
|
||||
GREATEST(0, settle_amount - confirmed_split_amount - payment_revoke_amount) AS waitSplitAmount,
|
||||
due_refund_amount as refundAmount,
|
||||
refund_amount as paidAmount,
|
||||
GREATEST(0, due_refund_amount - refund_amount) AS refundPayAmount
|
||||
FROM adapay_unsplit_record
|
||||
WHERE
|
||||
(due_refund_amount > confirmed_split_amount)
|
||||
(settle_amount > confirmed_split_amount - payment_revoke_amount)
|
||||
OR (due_refund_amount > refund_amount)
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user