1、编辑订单信息父订单来源改为从数据库取，解决上级无法编辑和子单编辑后类型变成主单问题；2、/order/main/page入参delete默认为false；

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java

@@ -87,7 +87,11 @@ public class OrderPageReqVO extends PageParam {
     private LocalDateTime[] createTime;
 
     @Schema(description = "是否作废", example = "0")
-    private Boolean deleted;
+    private boolean deleted;
+
+    public boolean getDeleted() {
+        return deleted;
+    }
 
     private Long organId;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -224,7 +224,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void updateOrder(OrderSaveReqVO updateReqVO) {
         // 校验存在, 订单未删除
-        validateOrderExists(updateReqVO.getId(), getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus());
+        OrderDO orderDO = validateOrderExists(updateReqVO.getId(), getUserOrganId(), OrderDeletedEnum.NOT_DELETED.getStatus());
 
         //校验手机号是否合法
         validatePhoneNumber(updateReqVO.getPhoneNumber());
@@ -232,7 +232,8 @@ public class OrderServiceImpl implements OrderService {
         //验证自定义单号是否存在, 订单未删除
         validateCustomOrderNoExists(updateReqVO.getCustomOrderNo(), updateReqVO.getId());
 
-        Long parentId = updateReqVO.getParentId();
+        Long orderParentId = orderDO.getParentId();
+        Long parentId = orderParentId == 0 ? null : orderParentId;
         // 校验上级订单是否存在
         validateParentOrderExists(parentId);
 
@@ -273,7 +274,7 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     private Integer getOrderType(Long parentId, Integer orderType) {
-        if (ObjectUtil.isNotNull(parentId)) {
+        if (ObjectUtil.isNotNull(parentId) && parentId != 0) {
             if (!OrderTypeEnum.isSubType(orderType)) {
                 throw new ServiceException(ORDER_SUBTYPE_NOT_SUPPORT);
             }
@@ -856,12 +857,20 @@ public class OrderServiceImpl implements OrderService {
 
     }
 
-    //    订单是否存在判断
-    private void validateOrderExists(Long id, Long organId, Integer deleted) {
+    /**
+     * 订单是否存在判断
+     *
+     * @param id
+     * @param organId
+     * @param deleted
+     * @return
+     */
+    private OrderDO validateOrderExists(Long id, Long organId, Integer deleted) {
         OrderDO orderDO = orderMapper.selectOrderOne(id, organId, deleted);
         if (orderDO == null) {
             throw new ServiceException(ORDER_NOT_EXISTS);
         }
+        return orderDO;
     }
 
     /**