批量特价付费模式变动修改审批通过bug修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -5501,6 +5501,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                             if (vo.getCharging() == 0) {
                                 applyInfoVO.setNewValue(vo.getClearanceFreight().toString() + currencyRespDTOMap.get(vo.getClearanceFreightCurrency().intValue()).getTitleZh() + "/" + unitRespDtoMap.get(vo.getClearanceFreightVolume().intValue()).getTitleZh());
                             }else {
+                                //
+                                vo.setClearanceFreight(BigDecimal.ZERO);
                                 applyInfoVO.setOrgValue("无/none");
                             }
                             applyInfoVOList.add(applyInfoVO);
@@ -5706,7 +5708,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (Objects.equals(oi.getOrderItemId(), batchApplyOrderItemDetailVO.getOrderItemId())) {
                         // 需要标记为固定成交单价， 且需要重置批量加价金额为0
                         oi.setCharging(batchApplyOrderItemDetailVO.getCharging());
-                        oi.setOneClearanceFreight(batchApplyOrderItemDetailVO.getClearanceFreight());
+                        oi.setOneClearanceFreight(Objects.nonNull(batchApplyOrderItemDetailVO.getClearanceFreight())?batchApplyOrderItemDetailVO.getClearanceFreight():BigDecimal.ZERO);
                         oi.setClearanceFreightCurrency(batchApplyOrderItemDetailVO.getClearanceFreightCurrency().intValue());
                         oi.setClearanceFreightVolume(batchApplyOrderItemDetailVO.getClearanceFreightVolume());
                         oi.setOneSeaFreight(batchApplyOrderItemDetailVO.getFreight());
@@ -5778,7 +5780,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     if (Objects.equals(oi.getOrderItemId(), specialApplyVO.getOrderItemId())) {
                         // 需要标记为固定成交单价， 且需要重置批量加价金额为0
                         oi.setCharging(specialApplyVO.getCharging());
-                        oi.setOneClearanceFreight(specialApplyVO.getClearanceFreight());
+                        oi.setOneClearanceFreight(Objects.nonNull(specialApplyVO.getClearanceFreight())?specialApplyVO.getClearanceFreight():BigDecimal.ZERO);
                         oi.setClearanceFreightCurrency(specialApplyVO.getClearanceFreightCurrency().intValue());
                         oi.setClearanceFreightVolume(specialApplyVO.getClearanceFreightVolume());
                         oi.setOneSeaFreight(specialApplyVO.getFreight());