Merge remote-tracking branch 'origin/main' into main

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductSpuSaveReqVO.java

@@ -45,7 +45,6 @@ public class ProductSpuSaveReqVO {
     private Long categoryId;
 
     @Schema(description = "产品标签为空", example = "21748")
-    @NotNull(message = "产品标签为空")
     private String productTag;
 
     @Schema(description = "运营标签为空", example = "21748")
@@ -57,16 +56,11 @@ public class ProductSpuSaveReqVO {
     @Schema(description = "产品标签4为空", example = "21748")
     private String productTag4;
 
-    @Schema(description = "小程序是否显示票号二维码")
-    private Integer isEwm;
-
-
     @Schema(description = "产品销售渠道(以,分隔)")
     @NotEmpty(message = "产品销售渠道不能为空")
     private String productSaleChannels;
 
-    @Schema(description = "销售价", example = "13215")
-    @NotNull(message = "销售价不能为空")
+    @Schema(description = "销售一口价", example = "13215")
     private BigDecimal salePrice;
 
     @Schema(description = "成本价", example = "11044")

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/project/ProjectServiceImpl.java

@@ -44,19 +44,19 @@ public class ProjectServiceImpl implements ProjectService {
         project.setDeleted(false);
         projectMapper.insert(project);
 
-        if (Objects.equals(createReqVO.getType(), ProjectTypeEnum.PROJECT.getValue())) {
-            ProjectDO childrenProject = new ProjectDO();
-            childrenProject.setId(IdWorker.getId(childrenProject));
-            childrenProject.setParentId(project.getId());
-            childrenProject.setCode(project.getCode());
-            childrenProject.setType(ProjectTypeEnum.DEFAULT.getValue());
-            childrenProject.setName("常规");
-            childrenProject.setUseStatus(UseStatusEnum.ENABLE.getStatus());
-            childrenProject.setSort(UseStatusEnum.ENABLE.getStatus());
-            childrenProject.setSpecificationType(project.getSpecificationType());
-            childrenProject.setDeleted(false);
-            projectMapper.insert(childrenProject);
-        }
+//        if (Objects.equals(createReqVO.getType(), ProjectTypeEnum.PROJECT.getValue())) {
+//            ProjectDO childrenProject = new ProjectDO();
+//            childrenProject.setId(IdWorker.getId(childrenProject));
+//            childrenProject.setParentId(project.getId());
+//            childrenProject.setCode(project.getCode());
+//            childrenProject.setType(ProjectTypeEnum.DEFAULT.getValue());
+//            childrenProject.setName("常规");
+//            childrenProject.setUseStatus(UseStatusEnum.ENABLE.getStatus());
+//            childrenProject.setSort(UseStatusEnum.ENABLE.getStatus());
+//            childrenProject.setSpecificationType(project.getSpecificationType());
+//            childrenProject.setDeleted(false);
+//            projectMapper.insert(childrenProject);
+//        }
 
         // 返回
         return project.getId();
@@ -78,7 +78,7 @@ public class ProjectServiceImpl implements ProjectService {
         validateProjectExists(id);
         // 删除
         projectMapper.deleteById(id);
-        projectMapper.delete(new LambdaQueryWrapperX<ProjectDO>().eq(ProjectDO::getParentId, id));
+//        projectMapper.delete(new LambdaQueryWrapperX<ProjectDO>().eq(ProjectDO::getParentId, id));
     }
 
     private void validateProjectExists(Long id) {