修改冲突

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

@@ -155,6 +155,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             if(null != orderViolateCoverAmount) {
                 depositDeductAmount = orderViolateCoverAmount;
             }
+            if (null != depositViolateCoverAmount) {
+                depositDeductAmount = orderViolateCoverAmount;
+            }
             if(topAmount.compareTo(depositDeductAmount) > 0) {
                 totalDeductAmount = totalDeductAmount.add(depositDeductAmount);
                 topAmount = topAmount.subtract(depositDeductAmount);

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

@@ -3,8 +3,6 @@ package com.xxfc.platform.order.biz.inner;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -32,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -199,6 +196,10 @@ public class OrderCancelBiz {
 
                         //违约金封顶 租车身份价 * 2天
                         BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
+                        //判断是否修改违约金
+                        if(null != changeViolateAmount) {
+                            oad.changeCancelViolate(changeViolateAmount);
+                        }
 
                         //退款流程
                         orderAccountBiz.rentRefundProcessCancel(baseOrder, BigDecimal.ZERO, timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), orderItem.getBuyAmount(), oad, topAmount, null, changeViolateAmount);