ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 9f8e9b2ac52571a51bc8e14dbba133b8cb0b0ec4 2 parents 86c92542 24145600

Merge branch 'dev6.8.6' into test6.8.6

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -830,7 +830,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { @@ -830,7 +830,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
830 availAmount = money; 830 availAmount = money;
831 tradeAmount = smallBadProductPunishment.multiply(new BigDecimal("-1")); 831 tradeAmount = smallBadProductPunishment.multiply(new BigDecimal("-1"));
832 } else if (Objects.nonNull(attach.getPenaltyEarnestMoney())) { 832 } else if (Objects.nonNull(attach.getPenaltyEarnestMoney())) {
833 - lockAmount = attach.getEarnestMoney(); 833 + lockAmount = attach.getEarnestMoney().multiply(new BigDecimal("-1"));
834 availAmount = attach.getEarnestMoney().subtract(attach.getPenaltyEarnestMoney()); 834 availAmount = attach.getEarnestMoney().subtract(attach.getPenaltyEarnestMoney());
835 tradeAmount = attach.getPenaltyEarnestMoney().multiply(new BigDecimal("-1")); 835 tradeAmount = attach.getPenaltyEarnestMoney().multiply(new BigDecimal("-1"));
836 } else { 836 } else {