Merge branch 'master-fix' into release

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

@@ -440,6 +440,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             throw exception(ORDER_NOT_EXISTS);
         }
         orderDO.setOrderType(orderType);
+        orderDO.setPickleType(1); // 这里每次设置订单类型都需要重置半泡属性
         handleException(orderId, orderDO, 9);
     }
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -307,7 +307,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         // 提单直接审批通过
         updateObj.setStatus(2);
         //end  提单直接审批通过
-
+        if (null != updateReqVO.getNeedBackend() && updateReqVO.getNeedBackend()) {
             OrderDO order = orderQueryService.getOrderById(Long.valueOf(makeBillOfLading.getOrderId()));
 
             OrderObjectiveDO orderObjectiveDO = orderObjectiveService.getByOrderId(order.getOrderId());
@@ -340,6 +340,8 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
             }
             //设置生成的PDF路径
             updateObj.setImgUrl(pdfUrl);
+        }
+
         /*
         String bpmProcessId =
                 bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),