Merge branch 'feature-delay-add' into dev

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

@@ -30,7 +30,7 @@ public class OrderLogBiz extends BaseBiz<OrderLogMapper,OrderLog> {
                 setDetail(StrUtil.format(orderLogEnum.getDesc(), oldObj, newObj));
             }};
 
-            updateSelectiveByIdRe(orderLog);
+            insertSelectiveRe(orderLog);
         }catch (Exception e) {
             log.error(e.getMessage(), e);
         }

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

@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.calculate.OrderRefundPriceVO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
+import com.xxfc.platform.order.pojo.price.DelayAddPriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -108,6 +109,11 @@ public class OrderCalculateBiz {
         InProgressVO inProgressVO = new InProgressVO();
         inProgressVO.setUsedDays(useDays);
 
+        //处理不记免赔违约金
+        if(useDays > 0) {
+            inProgressVO.setDelayAddPriceVO(orvd.obtainDelayAddDetail());
+        }
+
         inProgressVO.setMetaOrderUsedAmount(vehicleItemDTO.getUsedAmount(useDays));
         //查看是否有增加的延期天数-->添加分别原订单和延期的使用金额
         if(orvd.getDelayAddDays() > 0 && useDays > vehicleItemDTO.getTotalNum()) {