Merge branch 'feature-delay-add' into dev

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

@@ -606,17 +606,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                         for(OrderAccountDeduction deduction : oad.getDeductions()) {
                             if(DeductionTypeEnum.OTHER_DELAY_SAFE.getCode().equals(deduction.getType())) {
                                 deduction.setName(vio.getDeductions());
-                                BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
-                                //修改归还押金金额
-                                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());
+                                //修改归还押金金额
+                                resetDeposit(oad);
 
                                 flag = Boolean.TRUE;
                                 break;
@@ -628,12 +620,7 @@ 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);
                             //修改归还押金金额
-                            BigDecimal toBeDeposit = oad.getDepositAmount().subtract(oadNew.getAmount());
-                            if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
-                                toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
-                            }
-                            //修改归还押金金额
-                            oad.setDepositAmount(toBeDeposit);
+                            resetDeposit(oad);
 
                         }
                     }
@@ -644,19 +631,21 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
     }
 
+    private void resetDeposit(OrderAccountDetail oad) {
+        //修改归还押金金额
+        BigDecimal toDeduction = oad.getDeductions().parallelStream().map(OrderAccountDeduction::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        oad.setDepositAmount(oad.getOriginDepositAmount().subtract(toDeduction));
+    }
+
     private void handleViolateDetail(DeductionTypeEnum dte, OrderAccountDetail oad, DedDetailDTO vio, CancelStartedVO csv) {
         Boolean flag = Boolean.FALSE;
         for(OrderAccountDeduction deduction : oad.getDeductions()) {
             if(dte.getCode().equals(deduction.getType())) {
                 deduction.setName(vio.getDeductions());
                 BigDecimal diff = vio.getCost().subtract(deduction.getAmount());
-                //修改归还押金金额
-                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());
+                //修改归还押金金额
+                resetDeposit(oad);
 
                 //设置订单明细参数
                 csv.setViolateAmount(csv.getViolateAmount().add(diff));
@@ -671,11 +660,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             OrderAccountDeduction oadNew = initDeduction(vio.getCost(), vio.getDeductions(), dte, OrderAccountDeduction.ORIGIN_DEPOSIT);
             oad.getDeductions().add(oadNew);
             //修改归还押金金额
-            BigDecimal toBeDeposit = oad.getDepositAmount().subtract(oadNew.getAmount());
-            if(oad.getOriginDepositAmount().compareTo(toBeDeposit) < 0){
-                toBeDeposit = BigDecimal.ZERO.add(oad.getOriginDepositAmount());
-            }
-            oad.setDepositAmount(toBeDeposit);
+            resetDeposit(oad);
 
             //设置订单明细参数
             csv.setViolateAmount(csv.getViolateAmount().add(oadNew.getAmount()));