Authored by LUOXC

Merge branch 'dev6.8.6' into test6.8.6

... ... @@ -830,7 +830,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
availAmount = money;
tradeAmount = smallBadProductPunishment.multiply(new BigDecimal("-1"));
} else if (Objects.nonNull(attach.getPenaltyEarnestMoney())) {
lockAmount = attach.getEarnestMoney();
lockAmount = attach.getEarnestMoney().multiply(new BigDecimal("-1"));
availAmount = attach.getEarnestMoney().subtract(attach.getPenaltyEarnestMoney());
tradeAmount = attach.getPenaltyEarnestMoney().multiply(new BigDecimal("-1"));
} else {
... ...