|
@@ -439,7 +439,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
PaymentManagement paymentManagement2 = this.selectById(paymentManagement1.getId());
|
|
PaymentManagement paymentManagement2 = this.selectById(paymentManagement1.getId());
|
|
//付款金额大于本次循环未付金额
|
|
//付款金额大于本次循环未付金额
|
|
if (money >= paymentManagement1.getAmountNotPayable()) {
|
|
if (money >= paymentManagement1.getAmountNotPayable()) {
|
|
- money = money - paymentManagement1.getAmountNotPayable();
|
|
|
|
|
|
+ BigDecimal moneyx = new BigDecimal(Float.toString(money));
|
|
|
|
+ BigDecimal moneyy = new BigDecimal(Float.toString(paymentManagement1.getAmountNotPayable()));
|
|
|
|
+ money = moneyx.subtract(moneyy).floatValue();
|
|
//全部付款
|
|
//全部付款
|
|
paymentManagement1.setStatus(StatusEnum.PUR_PAYaLL.getName());
|
|
paymentManagement1.setStatus(StatusEnum.PUR_PAYaLL.getName());
|
|
paymentManagement1.setStatusFlag(StatusEnum.PUR_PAYaLL.getFlag());
|
|
paymentManagement1.setStatusFlag(StatusEnum.PUR_PAYaLL.getFlag());
|
|
@@ -449,7 +451,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
paymentManagement1.setAmountNotPayable(0.0f);
|
|
paymentManagement1.setAmountNotPayable(0.0f);
|
|
this.updateById(paymentManagement1);
|
|
this.updateById(paymentManagement1);
|
|
} else if (money > 0) {
|
|
} else if (money > 0) {
|
|
- Float moneyTmp = money - paymentManagement1.getAmountNotPayable();
|
|
|
|
|
|
+ BigDecimal moneyx = new BigDecimal(Float.toString(money));
|
|
|
|
+ BigDecimal moneyy = new BigDecimal(Float.toString(paymentManagement1.getAmountNotPayable()));
|
|
|
|
+ Float moneyTmp = moneyx.subtract(moneyy).floatValue();
|
|
//部分付款
|
|
//部分付款
|
|
paymentManagement1.setStatus(StatusEnum.PUR_PAY.getName());
|
|
paymentManagement1.setStatus(StatusEnum.PUR_PAY.getName());
|
|
paymentManagement1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());
|
|
paymentManagement1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());
|