创建sku扩展服务配置

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/enums/ServiceTypeEnum.java

@@ -0,0 +1,45 @@
+package com.tashow.cloud.productapi.enums;
+
+public enum ServiceTypeEnum {
+    TRANSPORT_CAR_CONFIG(1, "接运车辆配置"),
+    TRANSPORT_CAR_MATERIAL(2, "接运车辆服务物料"),
+    BODY_TRANSPORT_CONFIG(3, "遗体运输目的地配置"),
+    BODY_TRANSPORT_MATERIAL(4, "遗体运输目的地物料"),
+    BODY_CLEAN_CONFIG(5, "遗体清洁配置"),
+    BODY_CLEAN_MATERIAL(6, "遗体清洁物料"),
+    MEMORIAL_CONFIG(7, "追思告别配置"),
+    MEMORIAL_MATERIAL(8, "追思告别物料"),
+    CREMATION_CONFIG(9, "遗体火化配置"),
+    CREMATION_MATERIAL(10, "遗体火化物料"),
+    ASH_PROCESSING_CONFIG(11, "骨灰处理配置"),
+    ASH_PROCESSING_DELIVERY(12, "骨灰处理配送方式"),
+    ASH_PROCESSING_MATERIAL(13, "骨灰处理物料"),
+    BONE_ASH_CONFIG(14, "骨灰装殓配置"),
+    SOUVENIR_CONFIG(15, "纪念品配置"),
+    SOUVENIR_DELIVERY(16, "纪念品配送方式");
+
+    private final int code;
+    private final String description;
+
+    ServiceTypeEnum(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static ServiceTypeEnum getByCode(int code) {
+        for (ServiceTypeEnum type : ServiceTypeEnum.values()) {
+            if (type.getCode() == code) {
+                return type;
+            }
+        }
+        return null;
+    }
+}

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/SkuController.java

@@ -42,12 +42,12 @@ public class SkuController {
     @Resource
     private SkuService skuService;
 
-    @PostMapping("/create")
+/*    @PostMapping("/create")
     @Operation(summary = "创建单品SKU")
     @PreAuthorize("@ss.hasPermission('tz:sku:create')")
     public CommonResult<Long> createSku(@Valid @RequestBody SkuSaveReqVO createReqVO) {
         return success(skuService.createSku(createReqVO));
-    }
+    }*/
 
     @PostMapping("/createSkuExtend")
     @Operation(summary = "创建sku扩展服务配置")
@@ -59,7 +59,6 @@ public class SkuController {
 
     @PutMapping("/update")
     @Operation(summary = "更新单品SKU")
-    @PreAuthorize("@ss.hasPermission('tz:sku:update')")
     public CommonResult<Boolean> updateSku(@Valid @RequestBody SkuSaveReqVO updateReqVO) {
         skuService.updateSku(updateReqVO);
         return success(true);
@@ -68,7 +67,6 @@ public class SkuController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除单品SKU")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('tz:sku:delete')")
     public CommonResult<Boolean> deleteSku(@RequestParam("id") Long id) {
         skuService.deleteSku(id);
         return success(true);
@@ -77,20 +75,18 @@ public class SkuController {
     @GetMapping("/get")
     @Operation(summary = "获得单品SKU")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tz:sku:query')")
     public CommonResult<SkuRespVO> getSku(@RequestParam("id") Long id) {
         SkuDO sku = skuService.getSku(id);
         return success(BeanUtils.toBean(sku, SkuRespVO.class));
     }
 
-    @GetMapping("/page")
+  /*  @GetMapping("/page")
     @Operation(summary = "获得单品SKU分页")
-    @PreAuthorize("@ss.hasPermission('tz:sku:query')")
     public CommonResult<PageResult<SkuRespVO>> getSkuPage(@Valid SkuPageReqVO pageReqVO) {
         PageResult<SkuDO> pageResult = skuService.getSkuPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, SkuRespVO.class));
-    }
+    }*/
-
+/*
     @GetMapping("/export-excel")
     @Operation(summary = "导出单品SKU Excel")
     @PreAuthorize("@ss.hasPermission('tz:sku:export')")
@@ -102,6 +98,6 @@ public class SkuController {
         // 导出 Excel
         ExcelUtils.write(response, "单品SKU.xls", "数据", SkuRespVO.class,
                         BeanUtils.toBean(list, SkuRespVO.class));
-    }
+    }*/
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuDO.java

@@ -138,5 +138,9 @@ public class SkuDO extends BaseDO {
      */
     private Integer isSpecs;
 
+    /**
+     * 扩展服务表单id
+     */
+    private Long formId;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDeliverDO.java

@@ -64,13 +64,4 @@ public class SkuServiceDeliverDO extends BaseDO {
      * 电话号码
      */
     private String tel;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-    /**
-     * 最后更新时间
-     */
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceDetailsDO.java

@@ -65,17 +65,22 @@ public class SkuServiceDetailsDO extends BaseDO {
     /**
      * 触发节点名称
      */
-    private String trigger;
+    private String triggerName;
 
     /**
-     * 触发节点id
+     * 触发节点id（或关联节点）
      */
     private Long triggerId;
 
+
+    /**
+     * 是否并行0串行1并行
+     */
+    private Integer isParallel;
+
     /**
      * 描述
      */
-    private String describe;
+    private String describeContent;
-
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceMaterialDO.java

@@ -38,14 +38,6 @@ public class SkuServiceMaterialDO extends BaseDO {
     /**
      * 描述
      */
-    private String describe;
+    private String describeContent;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-    /**
-     * 最后更新时间
-     */
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServiceTransportDO.java

@@ -55,13 +55,5 @@ public class SkuServiceTransportDO extends BaseDO {
      * 电话号码
      */
     private String tel;
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-    /**
-     * 最后更新时间
-     */
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/dto/SkuServicesFormDO.java

@@ -31,10 +31,7 @@ public class SkuServicesFormDO extends BaseDO {
      * 表单名称
      */
     private String name;
-    /**
+
-     * 关联的商品SKU ID
-     */
-    private Long skuId;
     /**
      * 服务名称
      */
@@ -49,13 +46,4 @@ public class SkuServicesFormDO extends BaseDO {
      */
     private Integer type;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-    /**
-     * 最后更新时间
-     */
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/service/impl/SkuServiceImpl.java

@@ -8,6 +8,7 @@ import com.tashow.cloud.product.vo.sku.SkuPageReqVO;
 import com.tashow.cloud.product.vo.sku.SkuSaveReqVO;
 import com.tashow.cloud.productapi.enums.BaseEnum;
 import com.tashow.cloud.productapi.enums.ErrorCodeConstants;
+import com.tashow.cloud.productapi.enums.ServiceTypeEnum;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -58,9 +59,9 @@ public class SkuServiceImpl implements SkuService {
         //接运车辆配置
         if(Objects.equals(skuExtendVO.getTransportCarSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("接运车辆配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.TRANSPORT_CAR_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(1);
+            skuServicesFormDO.setType(ServiceTypeEnum.TRANSPORT_CAR_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceDetailsDO skuServiceDetailsDO:skuExtendVO.getTransportCarList()){
@@ -68,9 +69,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDetailsMapper.insert(skuServiceDetailsDO);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("接运车辆服务物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.TRANSPORT_CAR_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(2);
+            skuServicesForm.setType(ServiceTypeEnum.TRANSPORT_CAR_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getTransportCarMaterialList()){
@@ -81,9 +82,9 @@ public class SkuServiceImpl implements SkuService {
         //遗体运输目的地配置
         if(Objects.equals(skuExtendVO.getTrafficSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("遗体运输目的地配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.BODY_TRANSPORT_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(3);
+            skuServicesFormDO.setType(ServiceTypeEnum.BODY_TRANSPORT_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceTransportDO skuServiceTransportDO:skuExtendVO.getTrafficList()){
@@ -91,9 +92,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceTransportMapper.insert(skuServiceTransportDO);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("遗体运输目的地物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.BODY_TRANSPORT_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(4);
+            skuServicesForm.setType(ServiceTypeEnum.BODY_TRANSPORT_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getTrafficMaterialList()){
@@ -104,9 +105,9 @@ public class SkuServiceImpl implements SkuService {
         //遗体清洁配置
         if(Objects.equals(skuExtendVO.getCleanSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("遗体清洁配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.BODY_CLEAN_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(5);
+            skuServicesFormDO.setType(ServiceTypeEnum.BODY_CLEAN_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getCleanList()){
@@ -114,9 +115,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDetailsMapper.insert(skuServiceDetails);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("遗体清洁物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.BODY_CLEAN_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(6);
+            skuServicesForm.setType(ServiceTypeEnum.BODY_CLEAN_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getCleanMaterialList()){
@@ -127,9 +128,9 @@ public class SkuServiceImpl implements SkuService {
         //追思告别配置
         if(Objects.equals(skuExtendVO.getReflectionSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("追思告别配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.MEMORIAL_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(7);
+            skuServicesFormDO.setType(ServiceTypeEnum.MEMORIAL_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getReflectionList()){
@@ -137,9 +138,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDetailsMapper.insert(skuServiceDetails);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("追思告别物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.MEMORIAL_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(8);
+            skuServicesForm.setType(ServiceTypeEnum.MEMORIAL_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getReflectionMaterialList()){
@@ -151,9 +152,9 @@ public class SkuServiceImpl implements SkuService {
         //遗体火化配置
         if(Objects.equals(skuExtendVO.getCremationSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("遗体火化配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.CREMATION_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(9);
+            skuServicesFormDO.setType(ServiceTypeEnum.CREMATION_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getCremationList()){
@@ -161,9 +162,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDetailsMapper.insert(skuServiceDetails);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("遗体火化物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.CREMATION_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(10);
+            skuServicesForm.setType(ServiceTypeEnum.CREMATION_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getCremationMaterialList()){
@@ -175,9 +176,9 @@ public class SkuServiceImpl implements SkuService {
         //骨灰处理配置
         if(Objects.equals(skuExtendVO.getAshProcessingSwitch(),BaseEnum.YES_ONE.getKey())){
             SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
-            skuServicesFormDO.setServiceName("骨灰处理配置");
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.ASH_PROCESSING_CONFIG.getDescription());
             skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesFormDO.setType(9);
+            skuServicesFormDO.setType(ServiceTypeEnum.ASH_PROCESSING_CONFIG.getCode());
             skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesFormDO);
             for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getAshProcessingList()){
@@ -185,9 +186,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDetailsMapper.insert(skuServiceDetails);
             }
             SkuServicesFormDO skuForm = new SkuServicesFormDO();
-            skuForm.setServiceName("骨灰处理配送方式");
+            skuForm.setServiceName(ServiceTypeEnum.ASH_PROCESSING_DELIVERY.getDescription());
             skuForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuForm.setType(10);
+            skuForm.setType(ServiceTypeEnum.ASH_PROCESSING_DELIVERY.getCode());
             skuForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuForm);
             for(SkuServiceDeliverDO skuServiceDeliverDO:skuExtendVO.getAshProcessingDeliverList()){
@@ -195,9 +196,9 @@ public class SkuServiceImpl implements SkuService {
                 skuServiceDeliverMapper.insert(skuServiceDeliverDO);
             }
             SkuServicesFormDO skuServicesForm = new SkuServicesFormDO();
-            skuServicesForm.setServiceName("骨灰处理物料");
+            skuServicesForm.setServiceName(ServiceTypeEnum.ASH_PROCESSING_MATERIAL.getDescription());
             skuServicesForm.setIsEnabled(BaseEnum.YES.getKey());
-            skuServicesForm.setType(10);
+            skuServicesForm.setType(ServiceTypeEnum.ASH_PROCESSING_MATERIAL.getCode());
             skuServicesForm.setName(skuExtendVO.getSkuFormName());
             skuServicesFormMapper.insert(skuServicesForm);
             for(SkuServiceMaterialDO skuServiceMaterialDO:skuExtendVO.getAshProcessingMaterialList()){
@@ -206,8 +207,43 @@ public class SkuServiceImpl implements SkuService {
             }
         }
 
+        //骨灰装殓配置
+        if(Objects.equals(skuExtendVO.getBoneashSwitch(),BaseEnum.YES_ONE.getKey())){
+            SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.BONE_ASH_CONFIG.getDescription());
+            skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
+            skuServicesFormDO.setType(ServiceTypeEnum.BONE_ASH_CONFIG.getCode());
+            skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
+            skuServicesFormMapper.insert(skuServicesFormDO);
+            for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getBoneashList()){
+                skuServiceDetails.setServiceId(skuServicesFormDO.getId());
+                skuServiceDetailsMapper.insert(skuServiceDetails);
+            }
+        }
 
-
+        //纪念品配置
+        if(Objects.equals(skuExtendVO.getSouvenirSwitch(),BaseEnum.YES_ONE.getKey())){
+            SkuServicesFormDO skuServicesFormDO = new SkuServicesFormDO();
+            skuServicesFormDO.setServiceName(ServiceTypeEnum.SOUVENIR_CONFIG.getDescription());
+            skuServicesFormDO.setIsEnabled(BaseEnum.YES.getKey());
+            skuServicesFormDO.setType(ServiceTypeEnum.SOUVENIR_CONFIG.getCode());
+            skuServicesFormDO.setName(skuExtendVO.getSkuFormName());
+            skuServicesFormMapper.insert(skuServicesFormDO);
+            for(SkuServiceDetailsDO skuServiceDetails:skuExtendVO.getSouvenirList()){
+                skuServiceDetails.setServiceId(skuServicesFormDO.getId());
+                skuServiceDetailsMapper.insert(skuServiceDetails);
+            }
+            SkuServicesFormDO skuForm = new SkuServicesFormDO();
+            skuForm.setServiceName(ServiceTypeEnum.SOUVENIR_DELIVERY.getDescription());
+            skuForm.setIsEnabled(BaseEnum.YES.getKey());
+            skuForm.setType(ServiceTypeEnum.SOUVENIR_DELIVERY.getCode());
+            skuForm.setName(skuExtendVO.getSkuFormName());
+            skuServicesFormMapper.insert(skuForm);
+            for(SkuServiceDeliverDO skuServiceDeliverDO:skuExtendVO.getSouvenirDeliverList()){
+                skuServiceDeliverDO.setServiceId(skuForm.getId());
+                skuServiceDeliverMapper.insert(skuServiceDeliverDO);
+            }
+        }
     }
 
     @Override

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuExtendVO.java

@@ -59,4 +59,15 @@ public class SkuExtendVO {
     @Schema(description = "骨灰处理物料")
     public  List<SkuServiceMaterialDO> ashProcessingMaterialList;
 
+    @Schema(description = "骨灰装殓配置0关1开")
+    private Integer boneashSwitch;
+    @Schema(description = "骨灰装殓配置")
+    public  List<SkuServiceDetailsDO> boneashList;
+
+    @Schema(description = "纪念品配置0关1开")
+    private Integer souvenirSwitch;
+    @Schema(description = "纪念品配置")
+    public  List<SkuServiceDetailsDO> souvenirList;
+    @Schema(description = "纪念品配送方式配置")
+    public  List<SkuServiceDeliverDO> souvenirDeliverList;
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/sku/SkuSaveReqVO.java

@@ -89,5 +89,8 @@ public class SkuSaveReqVO {
 
     @Schema(description = "最小购买数量")
     private Integer moq;
-
+    /**
+     * 扩展服务表单id
+     */
+    private Long formId;
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverPageReqVO.java

@@ -43,10 +43,4 @@ public class SkuServiceDeliverPageReqVO extends PageParam {
     @Schema(description = "电话号码")
     private String tel;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverRespVO.java

@@ -53,12 +53,4 @@ public class SkuServiceDeliverRespVO {
     @ExcelProperty("电话号码")
     private String tel;
 
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedeliver/SkuServiceDeliverSaveReqVO.java

@@ -45,10 +45,4 @@ public class SkuServiceDeliverSaveReqVO {
     @NotEmpty(message = "电话号码不能为空")
     private String tel;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsPageReqVO.java

@@ -38,7 +38,7 @@ public class SkuServiceDetailsPageReqVO extends PageParam {
     private Boolean type;
 
     @Schema(description = "描述")
-    private String describe;
+    private String describeContent;
 
     /**
      * 地点
@@ -48,10 +48,17 @@ public class SkuServiceDetailsPageReqVO extends PageParam {
     /**
      * 触发节点名称
      */
-    private String trigger;
+    private String triggerName;
+
 
     /**
-     * 触发节点id
+     * 触发节点id（或关联节点）
      */
     private Long triggerId;
+
+
+    /**
+     * 是否并行0串行1并行
+     */
+    private Integer isParallel;
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsRespVO.java

@@ -47,7 +47,7 @@ public class SkuServiceDetailsRespVO {
 
     @Schema(description = "描述")
     @ExcelProperty("描述")
-    private String describe;
+    private String describeContent;
 
     /**
      * 地点
@@ -57,11 +57,17 @@ public class SkuServiceDetailsRespVO {
     /**
      * 触发节点名称
      */
-    private String trigger;
+    private String triggerName;
+
 
     /**
-     * 触发节点id
+     * 触发节点id（或关联节点）
      */
     private Long triggerId;
 
+
+    /**
+     * 是否并行0串行1并行
+     */
+    private Integer isParallel;
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicedetails/SkuServiceDetailsSaveReqVO.java

@@ -39,7 +39,7 @@ public class SkuServiceDetailsSaveReqVO {
     private Boolean type;
 
     @Schema(description = "描述")
-    private String describe;
+    private String describeContent;
     /**
      * 地点
      */
@@ -48,11 +48,18 @@ public class SkuServiceDetailsSaveReqVO {
     /**
      * 触发节点名称
      */
-    private String trigger;
+    private String triggerName;
+
 
     /**
-     * 触发节点id
+     * 触发节点id（或关联节点）
      */
     private Long triggerId;
 
+
+    /**
+     * 是否并行0串行1并行
+     */
+    private Integer isParallel;
+
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialPageReqVO.java

@@ -22,12 +22,7 @@ public class SkuServiceMaterialPageReqVO extends PageParam {
     private String name;
 
     @Schema(description = "描述")
-    private String describe;
+    private String describeContent;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialRespVO.java

@@ -26,14 +26,7 @@ public class SkuServiceMaterialRespVO {
 
     @Schema(description = "描述")
     @ExcelProperty("描述")
-    private String describe;
+    private String describeContent;
 
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicematerial/SkuServiceMaterialSaveReqVO.java

@@ -23,12 +23,6 @@ public class SkuServiceMaterialSaveReqVO {
     private String name;
 
     @Schema(description = "描述")
-    private String describe;
+    private String describeContent;
-
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormPageReqVO.java

@@ -18,19 +18,10 @@ public class SkuServicesFormPageReqVO extends PageParam {
     @Schema(description = "表单名称", example = "赵六")
     private String name;
 
-    @Schema(description = "关联的商品SKU ID", example = "20020")
-    private Long skuId;
-
     @Schema(description = "服务名称", example = "芋艿")
     private String serviceName;
 
     @Schema(description = "是否启用该服务")
     private Boolean isEnabled;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormRespVO.java

@@ -20,10 +20,6 @@ public class SkuServicesFormRespVO {
     @ExcelProperty("表单名称")
     private String name;
 
-    @Schema(description = "关联的商品SKU ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20020")
-    @ExcelProperty("关联的商品SKU ID")
-    private Long skuId;
-
     @Schema(description = "服务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @ExcelProperty("服务名称")
     private String serviceName;
@@ -32,12 +28,5 @@ public class SkuServicesFormRespVO {
     @ExcelProperty("是否启用该服务")
     private Boolean isEnabled;
 
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicesform/SkuServicesFormSaveReqVO.java

@@ -18,9 +18,6 @@ public class SkuServicesFormSaveReqVO {
     @NotEmpty(message = "表单名称不能为空")
     private String name;
 
-    @Schema(description = "关联的商品SKU ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20020")
-    @NotNull(message = "关联的商品SKU ID不能为空")
-    private Long skuId;
 
     @Schema(description = "服务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
     @NotEmpty(message = "服务名称不能为空")
@@ -30,10 +27,4 @@ public class SkuServicesFormSaveReqVO {
     @NotNull(message = "是否启用该服务不能为空")
     private Boolean isEnabled;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
-
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportPageReqVO.java

@@ -36,10 +36,5 @@ public class SkuServiceTransportPageReqVO extends PageParam {
     @Schema(description = "电话号码")
     private String tel;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportRespVO.java

@@ -44,12 +44,5 @@ public class SkuServiceTransportRespVO {
     @ExcelProperty("电话号码")
     private String tel;
 
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    @ExcelProperty("最后更新时间")
-    private LocalDateTime updatedAt;
 
 }

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/vo/skuservicetransport/SkuServiceTransportSaveReqVO.java

@@ -39,10 +39,5 @@ public class SkuServiceTransportSaveReqVO {
     @NotEmpty(message = "电话号码不能为空")
     private String tel;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "最后更新时间")
-    private LocalDateTime updatedAt;
 
 }