bug修复

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -170,25 +170,24 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                     // 够抵扣押金
                     shareCashPledge = otherCashPledge;
                 }
-                otherCashPledge = otherCashPledge.subtract(shareCashPledge);
-                if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {
-                    otherAmount = otherAmount.subtract(shareCashPledge);
-                } else {
-                    if (param.getDeductSalaryAmount().equals(1)) {
-                        if (otherCashPledge.compareTo(payWalletDTO.getSalaryAmt()) >= 0) {
-                            salaryCashPledge = payWalletDTO.getSalaryAmt();
-                        } else {
-                            salaryCashPledge = otherCashPledge;
-                        }
-                        otherCashPledge = otherCashPledge.subtract(salaryCashPledge);
-                        if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {
-                            otherAmount = otherAmount.subtract(salaryCashPledge.add(shareCashPledge));
-                        } else {
-                            otherPledge = otherCashPledge;
-                        }
+            }
+            otherCashPledge = otherCashPledge.subtract(shareCashPledge);
+            if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {
+                otherAmount = otherAmount.subtract(shareCashPledge);
+            } else {
+                if (param.getDeductSalaryAmount().equals(1)) {
+                    if (otherCashPledge.compareTo(payWalletDTO.getSalaryAmt()) >= 0) {
+                        salaryCashPledge = payWalletDTO.getSalaryAmt();
+                    } else {
+                        salaryCashPledge = otherCashPledge;
+                    }
+                    otherCashPledge = otherCashPledge.subtract(salaryCashPledge);
+                    if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {
+                        otherAmount = otherAmount.subtract(salaryCashPledge.add(shareCashPledge));
+                    } else {
+                        otherPledge = otherCashPledge;
                     }
                 }
-
             }
             // 抵扣完后当押金为0的时候 继续抵扣其余金额
             if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {