Merge branch 'master-fix' into dev

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

@@ -2218,8 +2218,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         orderDO.setNumber(updateObj.getNumber());
         orderDO.setPackageRemarks(updateObj.getPackageRemarks());
         orderDO.setPackageType(updateObj.getPackageType());
+        // TODO 这里计算费用还是走的之前订单信息参数业务，如果有错误提示，那么捕获错误，允许提交审批
+        try {
             orderBusinessService.costCalculation(updater, orderDO, orderConsignorBackVO.getCustomerId(), orderConsigneeBackVO.getCustomerId(), orderConsignorBackVO.getCustomerContactsId(), orderConsigneeBackVO.getCustomerContactsId(),
                     orderItemDOList, 8);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }
         if (Objects.nonNull(updateReqVO.getDisplayBillLadingPrice()) && updateReqVO.getDisplayBillLadingPrice() != orderDO.getDisplayBillLadingPrice()) {
             // 是否显示提单价格的设置变动，添加变动日志
             // 记录货值变动日志