Merge branch 'feature-delay-add' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -608,7 +608,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                                 deduction.setName(vio.getDeductions());
                                 BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
                                 //修改归还押金金额
-                                oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
+                                BigDecimal toBeDeposit = oad.getDepositAmount().subtract(diff);
+//                                if(BigDecimal.ZERO.compareTo(toBeDeposit) > 0) {
+//                                    toBeDeposit = BigDecimal.ZERO;
+//                                } else
+                                if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
+                                    toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
+                                }
+                                oad.setDepositAmount(toBeDeposit);
                                 deduction.setAmount(vio.getCost());
 
                                 flag = Boolean.TRUE;
@@ -621,7 +628,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                             OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), DeductionTypeEnum.OTHER_DELAY_SAFE, OrderAccountDeduction.ORIGIN_DEPOSIT);
                             oad.getDeductions().add(oadNew);
                             //修改归还押金金额
-                            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
+                            BigDecimal toBeDeposit = oad.getDepositAmount().subtract(oadNew.getAmount());
+                            if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
+                                toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
+                            }
+                            //修改归还押金金额
+                            oad.setDepositAmount(toBeDeposit);
 
                         }
                     }
@@ -639,7 +651,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 deduction.setName(vio.getDeductions());
                 BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
                 //修改归还押金金额
-                oad.setDepositAmount(oad.getDepositAmount().subtract(diff));
+                BigDecimal toBeDeposit = oad.getDepositAmount().subtract(diff);
+                if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
+                    toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
+                }
+                oad.setDepositAmount(toBeDeposit);
                 deduction.setAmount(vio.getCost());
 
                 //设置订单明细参数
@@ -655,7 +671,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), dte, OrderAccountDeduction.ORIGIN_DEPOSIT);
             oad.getDeductions().add(oadNew);
             //修改归还押金金额
-            oad.setDepositAmount(oad.getDepositAmount().subtract(oadNew.getAmount()));
+            BigDecimal toBeDeposit = oad.getDepositAmount().subtract(oadNew.getAmount());
+            if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
+                toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
+            }
+            oad.setDepositAmount(toBeDeposit);
 
             //设置订单明细参数
             csv.setViolateAmount(csv.getViolateAmount().add(oadNew.getAmount()));