Merge remote-tracking branch 'origin/master'

This commit is contained in:
齐天大圣 2024-03-15 18:13:15 +08:00
commit cf0eeb53ce

View File

@ -182,7 +182,7 @@
cf.satisfied_amount satisfiedAmount,
cf.exclusive_function exclusiveFunction,
cf.membership_level membershipLevel,
(case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount}))
(case cf.discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount}))
when '0' then cf.discount_amount
end) as amount
FROM