Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
cf0eeb53ce
@ -182,7 +182,7 @@
|
|||||||
cf.satisfied_amount satisfiedAmount,
|
cf.satisfied_amount satisfiedAmount,
|
||||||
cf.exclusive_function exclusiveFunction,
|
cf.exclusive_function exclusiveFunction,
|
||||||
cf.membership_level membershipLevel,
|
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
|
when '0' then cf.discount_amount
|
||||||
end) as amount
|
end) as amount
|
||||||
FROM
|
FROM
|
||||||
|
Loading…
Reference in New Issue
Block a user