|
|
|
@@ -118,7 +118,7 @@ |
|
|
|
</if> |
|
|
|
<if test=" null != toPayMerchant"> |
|
|
|
and ( |
|
|
|
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5,7)) |
|
|
|
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5,6,7)) |
|
|
|
or |
|
|
|
( `pay` - IFNULL(`return_pay`,'0') > 0 and bill_type in (13,21,5,7)) |
|
|
|
) |
|
|
|
|