Merge branch 'master-bacground-im' into dev

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

@@ -161,8 +161,13 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         if(depositRefundRecord != null) {
             DepositRefundRecord newValue = new DepositRefundRecord();
             BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-            newValue.setAmount(orderViolation.getPrice());
-            newValue.setRestAmount(depositRefundRecord.getTotalAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
+            if (orderViolation.getPrice().doubleValue() > 0) {
+                newValue.setAmount(orderViolation.getPrice());
+                newValue.setRestAmount(depositRefundRecord.getRestAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
+            } else {
+                newValue.setAmount(new BigDecimal(0));
+                newValue.setRestAmount(depositRefundRecord.getRestAmount());//减去违章金之后的押金
+            }
             newValue.setIscomplete(false);
             newValue.setId(null);
             mapper.insert(newValue);