维护

src/main/java/com/mmc/pms/controller/BackstageBrandManageController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.BrandInfoDTO;
+import com.mmc.pms.model.sale.dto.BrandInfoDTO;
 import com.mmc.pms.service.BrandManageService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mmc/pms/controller/BackstageCategoriesController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.ClassifyDetailsDTO;
-import com.mmc.pms.model.dto.ClassifyInfoDTO;
-import com.mmc.pms.model.vo.*;
+import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
+import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
+import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
+import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
+import com.mmc.pms.model.categories.vo.RelevantBusinessVO;
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
+import com.mmc.pms.model.sale.vo.QueryClassifyVO;
 import com.mmc.pms.service.CategoriesService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.Min;
+
 /**
  * @Author lw @Date 2023/5/15 13:24 @Version 1.0
  */
@@ -30,8 +37,8 @@ public class BackstageCategoriesController {
     @ApiOperation(value = "目录列表")
     @GetMapping("directoryList")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DirectoryInfoVO.class)})
-    public ResultBody directoryList(@RequestParam Integer pageNo, @RequestParam Integer pageSize) {
-        return ResultBody.success(categoriesService.directoryList(pageNo, pageSize));
+    public ResultBody directoryList(@RequestParam Integer pageNo, @RequestParam Integer pageSize, @RequestParam(required = false) Integer type) {
+        return ResultBody.success(categoriesService.directoryList(pageNo, pageSize, type));
     }
 
     @ApiOperation(value = "删除目录")
@@ -64,6 +71,7 @@ public class BackstageCategoriesController {
         return categoriesService.exchangeSortType(firstId, secondId);
     }
 
+
     @ApiOperation(value = "分类信息-列表")
     @PostMapping("getClassificationList")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyInfoDTO.class)})
@@ -78,4 +86,27 @@ public class BackstageCategoriesController {
     public ResultBody getClassifyDetails(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id) {
         return categoriesService.getClassifyDetails(id);
     }
+
+    @ApiOperation(value = "分类详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
+    @GetMapping("queryRelevantBusiness")
+    public ResultBody queryRelevantBusiness(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id,
+                                            @ApiParam(value = "业务类型", required = true) @Min(value = 0) @RequestParam(value = "type") Integer type) {
+        return categoriesService.queryRelevantBusiness(id, type);
+    }
+
+    @ApiOperation(value = "分类删除")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
+    @GetMapping("deleteRelevantBusiness")
+    public ResultBody deleteRelevantBusiness(@ApiParam(value = "分类id", required = true) @Min(value = 1) @RequestParam(value = "id") Integer id) {
+        return categoriesService.deleteRelevantBusiness(id);
+    }
+
+    @ApiOperation(value = "目录列表不含分页")
+    @GetMapping("getDirectoryList")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DirectoryInfoVO.class)})
+    public ResultBody getDirectoryList(Integer type) {
+        return categoriesService.getDirectoryList(type);
+    }
+
 }

src/main/java/com/mmc/pms/controller/BackstageGoodsManageController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
+import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
 import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
 import com.mmc.pms.model.qo.ProductSpecPriceQO;
-import com.mmc.pms.model.vo.Create;
-import com.mmc.pms.model.vo.GoodsAddVO;
-import com.mmc.pms.model.vo.Update;
+import com.mmc.pms.model.sale.dto.*;
+import com.mmc.pms.model.sale.vo.GoodsAddVO;
 import com.mmc.pms.service.GoodsInfoService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/mmc/pms/controller/BackstageIndustrySpecController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
 import com.mmc.pms.model.qo.IndustrySkuQO;
-import com.mmc.pms.model.vo.Create;
-import com.mmc.pms.model.vo.IndustrySkuVO;
-import com.mmc.pms.model.vo.IndustrySpecVO;
-import com.mmc.pms.model.vo.Update;
+import com.mmc.pms.model.sale.dto.*;
+import com.mmc.pms.model.sale.vo.IndustrySkuVO;
+import com.mmc.pms.model.sale.vo.IndustrySpecVO;
 import com.mmc.pms.service.IndustrySpecService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mmc/pms/controller/BackstageProductSpecController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
+import com.mmc.pms.model.lease.vo.PriceAcquisition;
 import com.mmc.pms.model.qo.ProductSkuQO;
-import com.mmc.pms.model.vo.Create;
-import com.mmc.pms.model.vo.PriceAcquisition;
-import com.mmc.pms.model.vo.ProductSpecCPQVO;
-import com.mmc.pms.model.vo.Update;
+import com.mmc.pms.model.sale.dto.*;
+import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
 import com.mmc.pms.service.ProductSkuService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mmc/pms/controller/MiniProgramDeviceController.java

@@ -2,9 +2,15 @@ package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.lease.dto.BrandDTO;
+import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
+import com.mmc.pms.model.lease.dto.WareInfoDTO;
+import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
+import com.mmc.pms.model.lease.vo.LeaseVo;
+import com.mmc.pms.model.other.dto.DistrictInfoDTO;
+import com.mmc.pms.model.other.dto.ModelDTO;
 import com.mmc.pms.model.qo.WareInfoQO;
-import com.mmc.pms.model.vo.LeaseVo;
+import com.mmc.pms.model.sale.dto.SkuInfoDTO;
 import com.mmc.pms.page.Page;
 import com.mmc.pms.service.WebDeviceService;
 import io.swagger.annotations.Api;
@@ -22,7 +28,8 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/appDevice")
 public class MiniProgramDeviceController {
-  @Autowired private WebDeviceService webDeviceService;
+    @Autowired
+    private WebDeviceService webDeviceService;
 
     @ApiOperation(value = "地域")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@@ -76,7 +83,7 @@ public class MiniProgramDeviceController {
     }
 
     @ApiOperation(value = "获取设备sku")
-  @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = SkuInfoDTO.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SkuInfoDTO.class)})
     @GetMapping("listWareSkuById")
     public ResultBody<SkuInfoDTO> listWareSkuById(@RequestParam Integer id) {
         return ResultBody.success(webDeviceService.listWareSkuById(id));

src/main/java/com/mmc/pms/controller/MiniProgramProductMallController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.AppGoodsInfoDetailDTO;
-import com.mmc.pms.model.dto.GoodsInfoListDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
+import com.mmc.pms.model.sale.dto.AppGoodsInfoDetailDTO;
+import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
 import com.mmc.pms.service.MiniProgramProductMallService;
 import com.mmc.pms.service.WebProductMallService;
 import io.swagger.annotations.*;
@@ -18,9 +18,11 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/AppProductMall/")
 public class MiniProgramProductMallController {
 
-  @Autowired private WebProductMallService webProductMallService;
+    @Autowired
+    private WebProductMallService webProductMallService;
 
-  @Autowired private MiniProgramProductMallService miniProgramProductMallService;
+    @Autowired
+    private MiniProgramProductMallService miniProgramProductMallService;
 
     @ApiOperation(value = "小程序-商品信息-分页")
     @PostMapping("listPageGoodsInfo")

src/main/java/com/mmc/pms/controller/WebAndMiniProgramCategoryController.java

+package com.mmc.pms.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author LW
+ * @date 2023/6/7 13:33
+ * 概要：
+ */
+@Api(tags = {"分类信息"})
+@RestController
+@RequestMapping("/category")
+public class WebAndMiniProgramCategoryController {
+
+//    @ApiOperation(value = "web-分类信息")
+//    @PostMapping("queryCategoryByType")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
+//    public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
+//            @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
+//        return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
+//    }
+
+
+}

src/main/java/com/mmc/pms/controller/WebDeviceController.java

@@ -2,9 +2,15 @@ package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.lease.dto.BrandDTO;
+import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
+import com.mmc.pms.model.lease.dto.WareInfoDTO;
+import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
+import com.mmc.pms.model.lease.vo.LeaseVo;
+import com.mmc.pms.model.other.dto.AdDTO;
+import com.mmc.pms.model.other.dto.DistrictInfoDTO;
+import com.mmc.pms.model.other.dto.ModelDTO;
 import com.mmc.pms.model.qo.WareInfoQO;
-import com.mmc.pms.model.vo.LeaseVo;
 import com.mmc.pms.page.Page;
 import com.mmc.pms.service.WebDeviceService;
 import io.swagger.annotations.Api;
@@ -23,7 +29,8 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/webDevice")
 public class WebDeviceController {
 
-  @Autowired private WebDeviceService webDeviceService;
+    @Autowired
+    private WebDeviceService webDeviceService;
 
     @ApiOperation(value = "地域")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

src/main/java/com/mmc/pms/controller/WebProductMallController.java

 package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.AdDTO;
-import com.mmc.pms.model.dto.AppGoodsInfoDetailDTO;
-import com.mmc.pms.model.dto.GoodsInfoListDTO;
-import com.mmc.pms.model.dto.ProductCategoryDTO;
+import com.mmc.pms.model.other.dto.AdDTO;
+import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
+import com.mmc.pms.model.sale.dto.AppGoodsInfoDetailDTO;
+import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
 import com.mmc.pms.service.MiniProgramProductMallService;
 import com.mmc.pms.service.WebProductMallService;
 import io.swagger.annotations.*;
@@ -19,9 +19,11 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/webProductMall")
 public class WebProductMallController {
-  @Autowired private WebProductMallService webProductMallService;
+    @Autowired
+    private WebProductMallService webProductMallService;
 
-  @Autowired private MiniProgramProductMallService miniProgramProductMallService;
+    @Autowired
+    private MiniProgramProductMallService miniProgramProductMallService;
 
     @ApiOperation("产品类目")
     @GetMapping("/category")

src/main/java/com/mmc/pms/dao/CategoriesDao.java

@@ -2,9 +2,9 @@ package com.mmc.pms.dao;
 
 import com.mmc.pms.entity.Categories;
 import com.mmc.pms.entity.Directory;
-import com.mmc.pms.model.vo.ClassifyInfoVO;
-import com.mmc.pms.model.vo.DirectoryInfoVO;
-import com.mmc.pms.model.vo.QueryClassifyVO;
+import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
+import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
+import com.mmc.pms.model.sale.vo.QueryClassifyVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -26,7 +26,7 @@ public interface CategoriesDao {
 
     int countDirectoryList();
 
-    List<Directory> directoryList(int i, Integer pageSize);
+    List<Directory> directoryList(int pageNo, Integer pageSize, Integer type);
 
     int countDirectory(Integer id);
 
@@ -42,11 +42,17 @@ public interface CategoriesDao {
 
     Categories getGoodsGroupById(Integer id);
 
-    int updateTypeSort(Integer firstId, Integer sort);
+    int updateTypeSort(Integer id, Integer sort);
 
     List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO);
 
     int countListClassification(QueryClassifyVO queryClassifyVO);
+
+    int selectDirectoryById(Integer id);
+
+    int deleteById(Integer id);
+
+    List<Directory> getDirectoryList(Integer type);
 }
 
 

src/main/java/com/mmc/pms/dao/GoodsInfoDao.java

 package com.mmc.pms.dao;
 
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.vo.GoodsAddVO;
+import com.mmc.pms.model.sale.vo.GoodsAddVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -88,6 +88,8 @@ public interface GoodsInfoDao {
     List<Integer> listIndustrySpecIds(Set<Integer> mallIndstSkuSpecIds);
 
     List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds);
+
+    List<GoodsInfo> ListGoodsInfoByCategoryId(Integer id);
 }
 
 

src/main/java/com/mmc/pms/dao/IndustrySpecDao.java

 package com.mmc.pms.dao;
 
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.IndustrySpecCPQVO;
 import com.mmc.pms.model.qo.IndustrySkuQO;
-import com.mmc.pms.model.vo.IndustrySkuVO;
-import com.mmc.pms.model.vo.IndustrySpecVO;
-import com.mmc.pms.service.Impl.IndustryProductInventoryDO;
+import com.mmc.pms.model.sale.dto.IndustrySpecCPQVO;
+import com.mmc.pms.model.sale.vo.IndustrySkuVO;
+import com.mmc.pms.model.sale.vo.IndustrySpecVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,7 +54,7 @@ public interface IndustrySpecDao {
 
     int countListPageIndustrySpec(Integer id, String keyword);
 
-    List<IndustrySpecDO> listPageIndustrySpec(int i, Integer pageSize, Integer industrySkuId, String keyword);
+    List<IndustrySpecDO> listPageIndustrySpec(int pageNo, Integer pageSize, Integer industrySkuId, String keyword);
 
     int batchInsertSpecPrice(List<IndustrySpecPriceDO> list);
 
@@ -97,4 +96,6 @@ public interface IndustrySpecDao {
     List<MallIndustrySkuInfoSpecDO> getIndustrySkuInfoSpec(Integer goodsInfoId);
 
     List<IndustrySpecPriceDO> listIndustrySpecPrice(Integer channelClass, List<Integer> industrySpecIds);
+
+    List<IndustrySpecPriceDO> getIndustrySpecPriceList(List<Integer> specIds);
 }

src/main/java/com/mmc/pms/dao/MiniProgramProductMallDao.java

@@ -2,7 +2,6 @@ package com.mmc.pms.dao;
 
 import com.mmc.pms.entity.*;
 import com.mmc.pms.model.qo.GoodsInfoQO;
-import com.mmc.pms.service.Impl.IndustryProductInventoryDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/mmc/pms/dao/ProductDao.java

 package com.mmc.pms.dao;
 
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.OrderGoodsProdDTO;
-import com.mmc.pms.model.dto.ProductSkuVO;
-import com.mmc.pms.model.dto.ProductSpecPriceDTO;
-import com.mmc.pms.model.dto.ProductSpecVO;
+import com.mmc.pms.model.lease.vo.PriceAcquisition;
+import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
 import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
 import com.mmc.pms.model.qo.ProductSkuQO;
-import com.mmc.pms.model.vo.PriceAcquisition;
-import com.mmc.pms.model.vo.ProductSpecCPQVO;
+import com.mmc.pms.model.sale.dto.ProductSkuVO;
+import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
+import com.mmc.pms.model.sale.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/mmc/pms/dao/WebAndMiniProgramCategoryDao.java

+package com.mmc.pms.dao;
+
+/**
+ * @Author LW
+ * @date 2023/6/7 13:52
+ * 概要：
+ */
+public interface WebAndMiniProgramCategoryDao {
+}

src/main/java/com/mmc/pms/dao/WebDeviceDao.java

 package com.mmc.pms.dao;
 
-import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.AdDTO;
+import com.mmc.pms.model.lease.vo.LeaseVo;
 import com.mmc.pms.model.qo.WareInfoQO;
-import com.mmc.pms.model.vo.LeaseVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/mmc/pms/entity/AdDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.AdDTO;
-import com.mmc.pms.model.dto.DeviceCategoryDTO;
+import com.mmc.pms.model.other.dto.AdDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/mmc/pms/entity/Brand.java

 package com.mmc.pms.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.mmc.pms.model.dto.BrandDTO;
+import com.mmc.pms.model.lease.dto.BrandDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/BrandInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.BrandInfoDTO;
+import com.mmc.pms.model.sale.dto.BrandInfoDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/Categories.java

 package com.mmc.pms.entity;
 
 
-import com.mmc.pms.model.dto.ClassifyDetailsDTO;
-import com.mmc.pms.model.dto.ClassifyInfoDTO;
-import com.mmc.pms.model.vo.ClassifyInfoVO;
+import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
+import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
+import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/DeviceCategory.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.DeviceCategoryDTO;
+import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/mmc/pms/entity/DeviceListDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.DeviceListDTO;
+import com.mmc.pms.model.lease.dto.DeviceListDTO;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 

src/main/java/com/mmc/pms/entity/Directory.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.vo.DirectoryInfoVO;
+import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -30,7 +30,7 @@ public class Directory implements Serializable {
     /**
      * 其他目录关联id
      */
-    private Integer relevance;
+    private Integer pid;
     /**
      * 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录）
      */
@@ -48,15 +48,17 @@ public class Directory implements Serializable {
      */
     private Integer deleted;
 
+    private String relevanceName;
+
     public Directory(DirectoryInfoVO param) {
         this.id = param.getId();
         this.directoryName = param.getDirectoryName();
-        this.relevance = param.getRelevance();
+        this.pid = param.getPid();
         this.type = param.getType();
     }
 
     public DirectoryInfoVO buildDirectoryInfoVO() {
-        return DirectoryInfoVO.builder().id(id).directoryName(directoryName).relevance(relevance).type(type).build();
+        return DirectoryInfoVO.builder().id(id).directoryName(directoryName).pid(pid).relevanceName(relevanceName).type(type).build();
     }
 }
 

src/main/java/com/mmc/pms/entity/DistrictDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.DistrictInfoDTO;
+import com.mmc.pms.model.other.dto.DistrictInfoDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/GoodsDetailDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsDetailInfoDTO;
-import com.mmc.pms.model.vo.GoodsDetailVO;
+import com.mmc.pms.model.sale.dto.GoodsDetailInfoDTO;
+import com.mmc.pms.model.sale.vo.GoodsDetailVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/GoodsImgDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsImgDTO;
-import com.mmc.pms.model.vo.GoodsImgVO;
+import com.mmc.pms.model.sale.dto.GoodsImgDTO;
+import com.mmc.pms.model.sale.vo.GoodsImgVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/GoodsInfo.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.vo.GoodsAddVO;
+import com.mmc.pms.model.categories.vo.RelevanceGoodsInfoVO;
+import com.mmc.pms.model.sale.vo.GoodsAddVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -70,4 +71,8 @@ public class GoodsInfo implements Serializable {
     public GoodsInfo(Integer id) {
         this.id = id;
     }
+
+    public RelevanceGoodsInfoVO buildRelevanceGoodsInfoVO() {
+        return RelevanceGoodsInfoVO.builder().id(id).goodsName(goodsName).shelf(shelfStatus).mainImage(mainImg).build();
+    }
 }
\ No newline at end of file

src/main/java/com/mmc/pms/entity/GoodsInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.AppGoodsInfoDTO;
-import com.mmc.pms.model.dto.GoodsInfoListDTO;
-import com.mmc.pms.model.vo.CategoryParamAndValueVO;
+import com.mmc.pms.model.sale.dto.AppGoodsInfoDTO;
+import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
+import com.mmc.pms.model.categories.vo.CategoryParamAndValueVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -45,7 +45,9 @@ public class GoodsInfoDO implements Serializable {
     private Integer standardProduct;
     private String tag;
 
-  /** 辅助字段-start */
+    /**
+     * 辅助字段-start
+     */
     private String videoUrl;
 
     private Integer goodsVideoId;

src/main/java/com/mmc/pms/entity/GoodsQaDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsQaDTO;
-import com.mmc.pms.model.vo.GoodsQaVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,13 +23,4 @@ public class GoodsQaDO implements Serializable {
     private Integer deleted;
     private Date updateTime;
     private Date createTime;
-
-  public GoodsQaDO(GoodsQaVO goodsQaVO) {
-    this.question = goodsQaVO.getQuestion();
-    this.answer = goodsQaVO.getAnswer();
-  }
-
-  public GoodsQaDTO buildGoodsQaDTO() {
-    return GoodsQaDTO.builder().id(this.id).answer(this.answer).question(this.question).build();
-  }
 }

src/main/java/com/mmc/pms/entity/GoodsServiceDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsOtherServiceDTO;
-import com.mmc.pms.model.dto.GoodsServiceDTO;
+import com.mmc.pms.model.sale.dto.GoodsOtherServiceDTO;
+import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,11 +24,16 @@ public class GoodsServiceDO implements Serializable {
     private Integer saleServiceId;
     private Date createTime;
 
-  /** 辅助字段-start */
+    /**
+     * 辅助字段-start
+     */
     private String serviceName;
 
     private String remark;
-  /** 辅助字段-end */
+
+    /**
+     * 辅助字段-end
+     */
     public GoodsServiceDTO buildGoodsServiceDTO() {
         return GoodsServiceDTO.builder()
                 .id(this.id)

src/main/java/com/mmc/pms/service/Impl/IndustryProductInventoryDO.java → src/main/java/com/mmc/pms/entity/IndustryProductInventoryDO.java

-package com.mmc.pms.service.Impl;
+package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.ProductInventoryVO;
+import com.mmc.pms.model.sale.dto.ProductInventoryVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/IndustrySku.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.IndustrySkuDTO;
-import com.mmc.pms.model.vo.IndustrySkuVO;
+import com.mmc.pms.model.sale.dto.IndustrySkuDTO;
+import com.mmc.pms.model.sale.vo.IndustrySkuVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/IndustrySpecDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.IndustrySpecDTO;
-import com.mmc.pms.model.dto.MallIndustrySpecDTO;
-import com.mmc.pms.model.vo.IndustrySpecVO;
+import com.mmc.pms.model.sale.dto.IndustrySpecDTO;
+import com.mmc.pms.model.sale.dto.MallIndustrySpecDTO;
+import com.mmc.pms.model.sale.vo.IndustrySpecVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/IndustrySpecPriceDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.IndustrySpecPriceDTO;
+import com.mmc.pms.model.sale.dto.IndustrySpecPriceDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/MallGoodsInfoSimpleDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.OrderGoodsIndstDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/MallGoodsProductDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.OrderGoodsIndstProdListDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsIndstProdListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/MallGoodsSpecSimpleDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.OrderGoodsIndstDetailDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsIndstDetailDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/MallIndustrySkuInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsSpecDTO;
-import com.mmc.pms.model.vo.GoodsProdSpecVO;
+import com.mmc.pms.model.sale.dto.GoodsSpecDTO;
+import com.mmc.pms.model.sale.vo.GoodsProdSpecVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/MallProdInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsSpecDTO;
-import com.mmc.pms.model.vo.GoodsProdSpecVO;
+import com.mmc.pms.model.sale.dto.GoodsSpecDTO;
+import com.mmc.pms.model.sale.vo.GoodsProdSpecVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/Model.java

 package com.mmc.pms.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.mmc.pms.model.dto.ModelDTO;
+import com.mmc.pms.model.other.dto.ModelDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/OrderInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.OrderInfoDTO;
-import com.mmc.pms.model.vo.LeaseOrderVO;
+import com.mmc.pms.model.order.dto.OrderInfoDTO;
+import com.mmc.pms.model.order.vo.LeaseOrderVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/OrderReceiptDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.OrderReceiptDTO;
-import com.mmc.pms.model.vo.OrderReceiptVO;
+import com.mmc.pms.model.order.dto.OrderReceiptDTO;
+import com.mmc.pms.model.order.vo.OrderReceiptVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/ProductCategory.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.ProductCategoryDTO;
+import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/ProductSkuDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.ProductSkuDTO;
-import com.mmc.pms.model.dto.ProductSkuVO;
+import com.mmc.pms.model.sale.dto.ProductSkuDTO;
+import com.mmc.pms.model.sale.dto.ProductSkuVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -58,6 +58,8 @@ public class ProductSkuDO implements Serializable {
                 .model(this.model)
                 .productBrand(this.brandName)
                 .createTime(this.createTime)
+                .categoriesId(categoriesId)
+                .directoryId(directoryId)
                 .categoryName(this.categoryName)
                 .directoryName(directoryName)
                 .build();

src/main/java/com/mmc/pms/entity/ProductSpecDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.MallProductSpecDTO;
-import com.mmc.pms.model.dto.ProductSpecDTO;
-import com.mmc.pms.model.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.dto.ProductSpecDTO;
+import com.mmc.pms.model.sale.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.dto.MallProductSpecDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/ProductSpecPriceDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.ProductSpecPriceDTO;
+import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/RepoCashDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.RepoCashDTO;
+import com.mmc.pms.model.other.dto.RepoCashDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/mmc/pms/entity/SkuInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.SkuInfoDTO;
-import com.mmc.pms.model.vo.WareSkuInfoVO;
+import com.mmc.pms.model.lease.vo.WareSkuInfoVO;
+import com.mmc.pms.model.sale.dto.SkuInfoDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -54,10 +54,10 @@ public class SkuInfoDO implements Serializable {
         this.stockNum = d.getStockNum();
     }
 
-    public SkuInfoDTO buildSkuInfoDTO(){
+    public SkuInfoDTO buildSkuInfoDTO() {
         return SkuInfoDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuTitle(this.skuTitle).rentPrice(this.rentPrice).rentDeposit(this.rentDeposit)
                 .stockNum(this.stockNum).saleNum(this.saleNum).createTime(this.createTime).updateTime(this.updateTime)
-                .skuPriceDTOList(CollectionUtils.isEmpty(this.skuPriceDOList) ? null : this.skuPriceDOList.stream().map(d->{
+                .skuPriceDTOList(CollectionUtils.isEmpty(this.skuPriceDOList) ? null : this.skuPriceDOList.stream().map(d -> {
                     return d.buildSkuPriceDTO();
                 }).collect(Collectors.toList())).build();
     }

src/main/java/com/mmc/pms/entity/SkuPriceDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.SkuPriceDTO;
-import com.mmc.pms.model.vo.WareSkuPriceVO;
+import com.mmc.pms.model.lease.vo.WareSkuPriceVO;
+import com.mmc.pms.model.sale.dto.SkuPriceDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -35,7 +35,7 @@ public class SkuPriceDO implements Serializable {
         this.maxDay = dd.getMaxDay();
     }
 
-    public SkuPriceDTO buildSkuPriceDTO(){
+    public SkuPriceDTO buildSkuPriceDTO() {
         return SkuPriceDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuInfoId(this.skuInfoId).rentPrice(this.rentPrice).minDay(this.minDay)
                 .maxDay(this.maxDay).createTime(this.createTime).build();
     }

src/main/java/com/mmc/pms/entity/SkuUnitDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.SkuUnitDTO;
+import com.mmc.pms.model.sale.dto.SkuUnitDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/WareDetailDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.WareDetailDTO;
+import com.mmc.pms.model.lease.dto.WareDetailDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/WareImgDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.WareImgDTO;
-import com.mmc.pms.model.vo.WareImgVO;
+import com.mmc.pms.model.lease.dto.WareImgDTO;
+import com.mmc.pms.model.lease.vo.WareImgVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/entity/WareInfoDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.AppletWareInfoDTO;
-import com.mmc.pms.model.dto.WareInfoDTO;
-import com.mmc.pms.model.dto.WareInfoItemDTO;
+import com.mmc.pms.model.lease.dto.WareInfoDTO;
+import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
+import com.mmc.pms.model.lease.dto.AppletWareInfoDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -43,7 +43,9 @@ public class WareInfoDO implements Serializable {
     private Date updateTime;
     private Integer pid;
 
-  /** 辅助字段-start */
+    /**
+     * 辅助字段-start
+     */
     private List<WareImgDO> wareImgs;
     // private List<WareVideoDO> wareVideos;
     private WarePropDO warePropDO;
@@ -51,7 +53,9 @@ public class WareInfoDO implements Serializable {
     // private WareDetailDO wareDetailDO;
     // private List<SkuInfoDO> skuInfoDOList;
 
-  /** 辅助字段-end */
+    /**
+     * 辅助字段-end
+     */
     public WareInfoDTO buildWareInfoDTO() {
         return WareInfoDTO.builder()
                 .id(this.id)

src/main/java/com/mmc/pms/entity/WarePropDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.WarePropDTO;
+import com.mmc.pms.model.lease.dto.WarePropDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/mmc/pms/model/dto/ClassifyDetailsDTO.java → src/main/java/com/mmc/pms/model/categories/dto/ClassifyDetailsDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.categories.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/ClassifyInfoDTO.java → src/main/java/com/mmc/pms/model/categories/dto/ClassifyInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.categories.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/vo/CategoriesInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/CategoriesInfoVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.categories.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/vo/CategoryParamAndValueVO.java → src/main/java/com/mmc/pms/model/categories/vo/CategoryParamAndValueVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.categories.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/vo/ClassifyInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/ClassifyInfoVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.categories.vo;
 
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/vo/DirectoryInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/DirectoryInfoVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.categories.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -22,7 +22,9 @@ public class DirectoryInfoVO {
     @ApiModelProperty(value = "目录名称")
     private String directoryName;
     @ApiModelProperty(value = "关联目录的id")
-    private Integer relevance;
+    private Integer pid;
+    @ApiModelProperty(value = "关联目录名称")
+    private String relevanceName;
     @ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）")
     private Integer type;
 }

src/main/java/com/mmc/pms/model/vo/GoodsQaVO.java → src/main/java/com/mmc/pms/model/categories/vo/RelevanceCurriculumVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.categories.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,19 +8,21 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 /**
- * @Author small @Date 2023/5/16 15:23 @Version 1.0
+ * @Author LW
+ * @date 2023/6/7 16:14
+ * 概要：
  */
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.vo.GoodsQaVO", description = "新增/修改参数类")
-public class GoodsQaVO implements Serializable {
+@AllArgsConstructor
+public class RelevanceCurriculumVO implements Serializable {
+
     @ApiModelProperty(value = "id")
     private Integer id;
 
-  @ApiModelProperty(value = "问题")
-  private String question;
+    @ApiModelProperty(value = "课程名称")
+    private String curriculumName;
+    // 课程图片
+    // 状态
 
-  @ApiModelProperty(value = "回答")
-  private String answer;
 }

src/main/java/com/mmc/pms/model/dto/GoodsQaDTO.java → src/main/java/com/mmc/pms/model/categories/vo/RelevanceGoodsInfoVO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.categories.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,20 +9,21 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 /**
- * @Author small @Date 2023/5/16 15:02 @Version 1.0
+ * @Author LW
+ * @date 2023/6/7 16:03
+ * 概要：
  */
-@Builder
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsQaDTO", description = "常见问题DTO")
-public class GoodsQaDTO implements Serializable {
+@AllArgsConstructor
+@Builder
+public class RelevanceGoodsInfoVO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;
-
-  @ApiModelProperty(value = "问题")
-  private String question;
-
-  @ApiModelProperty(value = "回答")
-  private String answer;
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+    @ApiModelProperty(value = "主图")
+    private String mainImage;
+    @ApiModelProperty(value = "状态 上架0 下架1")
+    private Integer shelf;
 }

src/main/java/com/mmc/pms/model/categories/vo/RelevanceServiceInfoVO.java

+package com.mmc.pms.model.categories.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2023/6/7 16:08
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RelevanceServiceInfoVO implements Serializable {
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "服务编号")
+    private String number;
+    @ApiModelProperty(value = "服务名称")
+    private String name;
+    @ApiModelProperty(value = "视频")
+    private String videoUrl;
+    @ApiModelProperty(value = "状态 上架0 下架1")
+    private Integer shelf;
+}

src/main/java/com/mmc/pms/model/categories/vo/RelevantBusinessVO.java

+package com.mmc.pms.model.categories.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2023/6/7 16:54
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RelevantBusinessVO {
+
+    private List<RelevanceCurriculumVO> relevanceCurriculumVOs;
+
+    private List<RelevanceGoodsInfoVO> relevanceGoodsInfoVOs;
+
+    private List<RelevanceServiceInfoVO> relevanceServiceInfoVOs;
+
+}

src/main/java/com/mmc/pms/model/dto/BaseAccountDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @Author small @Date 2023/5/25 9:55 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.BaseAccountDTO", description = "登录信息DTO")
-public class BaseAccountDTO implements Serializable {
-  private static final long serialVersionUID = -2979712090903806216L;
-  private Integer id;
-  private String uid;
-  private String accountPhone;
-  private String accountNo;
-  private String accountName;
-  private String tokenPort;
-
-  @ApiModelProperty(value = "角色ID")
-  private Integer roleId;
-
-  @ApiModelProperty(value = "是否为管理角色:0否 1是")
-  private Integer admin; // 是否为管理角色
-
-  @ApiModelProperty(value = "是否为运营角色:0否 1是")
-  private Integer operate;
-
-  @ApiModelProperty(value = "是否PMC发货专员:0否 1是")
-  private Integer pmc;
-
-  @ApiModelProperty(value = "单位信息")
-  private CompanyCacheDTO companyInfo; // 单位信息
-
-  public BaseAccountDTO(UserAccountDTO user) {
-    this.id = user.getId();
-    this.accountNo = user.getAccountNo();
-    this.accountName = user.getUserName();
-    this.roleId = user.getRoleInfo() == null ? null : user.getRoleInfo().getId();
-    this.admin = user.getRoleInfo() == null ? null : user.getRoleInfo().getAdmin();
-    this.operate = user.getRoleInfo() == null ? null : user.getRoleInfo().getOperate();
-    this.pmc = user.getRoleInfo() == null ? null : user.getRoleInfo().getPmc();
-  }
-
-  public BaseAccountDTO(RepoAccountDTO account) {
-    this.id = account.getId();
-    this.accountName = account.getAccountName();
-    this.uid = account.getUid();
-    this.accountPhone = account.getPhoneNum();
-  }
-
-  public BaseAccountDTO(MallUserDTO account) {
-    this.id = account.getId();
-    this.accountName = account.getNickName();
-    this.uid = account.getUid();
-    this.accountPhone = account.getPhoneNum();
-  }
-
-  public BaseAccountDTO(FlyerAccountDTO account) {
-    this.id = account.getId();
-    this.accountName = account.getAccountName();
-    this.uid = account.getUid();
-    this.accountPhone = account.getPhoneNum();
-  }
-
-  /**
-   * 是否为科比特超级管理员单位(是:无单位资源限制 否:只能看当前和下级单位的资源)
-   *
-   * @return
-   */
-  public boolean isManage() {
-    if (this.getCompanyInfo() == null) {
-      return false;
-    }
-    if (this.getCompanyInfo().getManage() == null) {
-      return false;
-    }
-    return this.getCompanyInfo().getManage() == 1;
-  }
-
-  /**
-   * 判断是否已授权
-   *
-   * @return
-   */
-  //	public boolean authorized() {
-  //		if (StringUtils.isBlank(this.accountName) || StringUtils.isBlank(this.accountPhone)) {
-  //			return false;
-  //		}
-  //		return true;
-  //	}
-}

src/main/java/com/mmc/pms/model/dto/CompanyCacheDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/25 9:56 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CompanyCacheDTO implements Serializable {
-  @ApiModelProperty(value = "单位ID")
-  private Integer id;
-
-  @ApiModelProperty(value = "单位名称")
-  private String company;
-
-  @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
-  private Integer manage;
-
-  @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
-  private List<Integer> companys;
-}

src/main/java/com/mmc/pms/model/dto/CompanySimpleDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/25 9:56 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.sharefly.dto.CompanySimpleDTO", description = "单位信息DTO")
-public class CompanySimpleDTO implements Serializable {
-  private static final long serialVersionUID = 2541404541696571857L;
-
-  @ApiModelProperty(value = "单位ID")
-  private Integer id;
-
-  @ApiModelProperty(value = "单位名称")
-  private String company;
-
-  @ApiModelProperty(value = "账号类型:0合伙人 1员工")
-  private Integer userType;
-
-  @ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
-  private Integer manage;
-
-  @ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
-  private List<Integer> companys;
-}

src/main/java/com/mmc/pms/model/dto/FlyerAccountDTO.java

-package com.mmc.pms.model.dto;
-
-import com.mmc.pms.common.FlyerAccountType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @Author small @Date 2023/5/25 9:58 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.FlyerAccountDTO", description = "飞手端用户DTO")
-public class FlyerAccountDTO implements Serializable {
-  private static final long serialVersionUID = -5663270547201316327L;
-
-  @ApiModelProperty(value = "飞手端用户id")
-  private Integer id;
-
-  @ApiModelProperty(value = "飞手端用户uid")
-  private String uid;
-
-  @ApiModelProperty(value = "飞手端用户名称")
-  private String accountName;
-
-  @ApiModelProperty(value = "联系电话")
-  private String phoneNum;
-
-  @ApiModelProperty(value = "飞手端用户类型，（个人飞手，机构）")
-  private Integer accountType;
-
-  @ApiModelProperty(value = "实名认证状态")
-  private Integer realAuthStatus;
-
-  @ApiModelProperty(value = "企业认证状态")
-  private Integer entAuthStatus;
-
-  @ApiModelProperty(value = "工作状态")
-  private Integer workStatus;
-
-  @ApiModelProperty(value = "常驻城市")
-  private String resAddress;
-
-  @ApiModelProperty(value = "openId")
-  private String openId;
-
-  @ApiModelProperty(value = "unionId")
-  private String unionId;
-
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
-
-  @ApiModelProperty(value = "头像url")
-  private String headerImg;
-
-  @ApiModelProperty(value = "经度")
-  private Double lon;
-
-  @ApiModelProperty(value = "纬度")
-  private Double lat;
-
-  @ApiModelProperty(value = "备注")
-  private String remark;
-
-  @ApiModelProperty(value = "删除状态，0未删除，1删除")
-  private Integer deleted;
-
-  @ApiModelProperty(value = "企业名称")
-  private String entName;
-
-  @ApiModelProperty(value = "生成时间")
-  private Date createTime;
-
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
-
-  @ApiModelProperty(value = "有无订单：0无,1有")
-  private Integer serviceStatus;
-
-  @ApiModelProperty(value = "距离订单距离-单位km")
-  private Double orderDist;
-
-  @ApiModelProperty(value = "服务中的订单名称")
-  private List<String> orderNames;
-
-  @ApiModelProperty(value = "飞手认证状态")
-  private Integer licStatus;
-
-  @ApiModelProperty(value = "机构信息")
-  private FlyerEntInfoDTO entInfo;
-
-  @ApiModelProperty(value = "抢单状态-0否-1是")
-  private Integer applyOrder;
-
-  @ApiModelProperty(value = "多端用户，USER_PORT(云享飞)-FLYER_PORT(云飞手)-REPO_PORT(云仓)")
-  private Set<String> ports;
-
-  @ApiModelProperty(value = "推荐人ID")
-  private Integer rcdFlyerAccountId;
-
-  @ApiModelProperty(value = "推荐人昵称")
-  private String rcdNickName;
-
-  @ApiModelProperty(value = "推荐人uid")
-  private String rcdUid;
-
-  @ApiModelProperty(value = "推荐人账号名称")
-  private String rcdAccountName;
-
-  @ApiModelProperty(value = "已推荐用户数")
-  private Integer rcdUserNumber;
-
-  @ApiModelProperty(value = "是否销售")
-  private Integer sale;
-
-  @ApiModelProperty(value = "是否白名单")
-  private Integer white;
-
-  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
-  private Integer source;
-
-  @ApiModelProperty(value = "订单信息")
-  private FlyerOrderTaskDTO flyerOrderTask;
-
-  @ApiModelProperty(value = "场景认证信息")
-  private FlyerScenesAuthDTO flyerScenesAuth;
-
-  /**
-   * 是否为飞手机构用户
-   *
-   * @return
-   */
-  public boolean checkFlyerEnt() {
-    return (FlyerAccountType.JG.getCode().toString().equals(this.accountType.toString()));
-  }
-
-  /**
-   * 是否为飞手个人用户
-   *
-   * @return
-   */
-  public boolean checkFlyer() {
-    return (FlyerAccountType.GR.getCode().toString().equals(this.accountType.toString()));
-  }
-}

src/main/java/com/mmc/pms/model/dto/FlyerEntInfoDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Author small @Date 2023/5/25 10:00 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.FlyerEntInfoDTO", description = "飞手机构DTO")
-public class FlyerEntInfoDTO implements Serializable {
-  private static final long serialVersionUID = -3064900348178903673L;
-
-  @ApiModelProperty(value = "机构id")
-  private Integer id;
-
-  @ApiModelProperty(value = "飞手端用户id")
-  private Integer flyerAccountId;
-
-  @ApiModelProperty(value = "机构名称")
-  private String entName;
-
-  @ApiModelProperty(value = "机构认证审批状态")
-  private Integer entCheckStatus;
-
-  @ApiModelProperty(value = "机构法人名称")
-  private String entLegalPerson;
-
-  @ApiModelProperty(value = "社会统一信用码")
-  private String uscCode;
-
-  @ApiModelProperty(value = "营业执照url")
-  private String unLicImg;
-
-  @ApiModelProperty(value = "开户银行")
-  private String bankName;
-
-  @ApiModelProperty(value = "账户名称")
-  private String accountHolder;
-
-  @ApiModelProperty(value = "银行账号")
-  private String bankAccount;
-
-  @ApiModelProperty(value = "法人身份证号")
-  private String idNumber;
-
-  @ApiModelProperty(value = "机构备注")
-  private String remark;
-
-  @ApiModelProperty(value = "生成时间")
-  private Date createTime;
-
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
-
-  @ApiModelProperty(value = "飞手总数")
-  private Integer sumOfFlyer;
-
-  @ApiModelProperty(value = "认证飞手数")
-  private Integer countOfAuthFlyer;
-
-  @ApiModelProperty(value = "用户uid")
-  private String uid;
-
-  @ApiModelProperty(value = "用户手机号")
-  private String phoneNum;
-
-  @ApiModelProperty(value = "常驻城市")
-  private String resAddress;
-
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
-}

src/main/java/com/mmc/pms/model/dto/FlyerOrderTaskDTO.java

-package com.mmc.pms.model.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @Author small @Date 2023/5/25 9:59 @Version 1.0
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class FlyerOrderTaskDTO implements Serializable {
-  private static final long serialVersionUID = 4288411060058354326L;
-  private Integer id;
-  private Integer orderId;
-  private Integer flyerAccountId;
-  private Integer orderType;
-  private Integer virtualTeamId;
-  private String orderName;
-  private String orderNo;
-
-  public FlyerOrderTaskDTO(OrderTaskDTO d) {
-    this.orderId = d.getId();
-    this.orderName = d.getOrderName();
-    this.orderNo = d.getOrderNo();
-  }
-}

src/main/java/com/mmc/pms/model/dto/FlyerScenesAuthDTO.java

-package com.mmc.pms.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @Author small @Date 2023/5/25 9:59 @Version 1.0
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class FlyerScenesAuthDTO implements Serializable {
-  private static final long serialVersionUID = 66032902942031710L;
-
-  @ApiModelProperty("飞手id")
-  private Integer id;
-
-  @ApiModelProperty(value = "商务礼仪认证")
-  private Integer protocolAuth;
-
-  @ApiModelProperty(value = "电力巡检认证状态，0未认证，1通过，2未通过")
-  private Integer electricAuth;
-
-  @ApiModelProperty(value = "航空测绘认证状态，0未认证，1通过，2未通过", hidden = true)
-  @JsonIgnore
-  private Integer aviationAuth;
-
-  @ApiModelProperty(value = "应急保障认证状态，0未认证，1通过，2未通过", hidden = true)
-  @JsonIgnore
-  private Integer emergencyAuth;
-
-  @ApiModelProperty(value = "value = 监察巡检认证状态，0未认证，1通过，2未通过", hidden = true)
-  @JsonIgnore
-  private Integer superviseAuth;
-
-  @ApiModelProperty(value = "通用认证状态，0未认证，1通过，2未通过")
-  private Integer universalAuth;
-
-  @ApiModelProperty(value = "油气巡检认证状态，0未认证，1通过，2未通过")
-  private Integer oilGasAuth;
-
-  @ApiModelProperty(value = "演示认证状态，0未认证，1通过，2未通过")
-  private Integer demoAuth;
-
-  @ApiModelProperty(value = "航空测绘外业状态，0未认证，1通过，2未通过")
-  private Integer aviationOutAuth;
-
-  @ApiModelProperty(value = "航空测绘内业状态，0未认证，1通过，2未通过")
-  private Integer aviationInAuth;
-
-  @ApiModelProperty(value = "指挥车认证状态，0未认证，1通过，2未通过")
-  private Integer commandAuth;
-
-  @ApiModelProperty(value = "天目将软件认证状态，0未认证，1通过，2未通过")
-  private Integer tmjAuth;
-}

src/main/java/com/mmc/pms/model/dto/RepoAccountDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Set;
-
-/**
- * @Author small @Date 2023/5/25 9:57 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.RepoAccountDTO", description = "云仓账号信息DTO")
-public class RepoAccountDTO implements Serializable {
-  private static final long serialVersionUID = 1433562781546856233L;
-
-  @ApiModelProperty(value = "用户id")
-  private Integer id;
-
-  @ApiModelProperty(value = "用户uid")
-  private String uid;
-
-  @ApiModelProperty(value = "账号名称")
-  private String accountName;
-
-  @ApiModelProperty(value = "账号类型")
-  private Integer accountType;
-
-  @ApiModelProperty(value = "联系电话")
-  private String phoneNum;
-
-  @ApiModelProperty(value = "实名认证状态")
-  private Integer realAuthStatus;
-
-  @ApiModelProperty(value = "企业认证状态")
-  private Integer entAuthStatus;
-
-  @ApiModelProperty(value = "渠道认证状态")
-  private Integer channelAuthStatus;
-
-  @ApiModelProperty(value = "渠道等级")
-  private Integer channelClass;
-
-  @ApiModelProperty(value = "常驻城市")
-  private String resAddress;
-
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
-
-  @ApiModelProperty(value = "头像url")
-  private String headerImg;
-
-  @ApiModelProperty(value = "经度")
-  private BigDecimal lon;
-
-  @ApiModelProperty(value = "纬度")
-  private BigDecimal lat;
-
-  @ApiModelProperty(value = "备注")
-  private String remark;
-
-  @ApiModelProperty(value = "删除状态，0未删除，1删除")
-  private Integer deleted;
-
-  @ApiModelProperty(value = "企业名称")
-  private String entName;
-
-  @ApiModelProperty(value = "用户名称")
-  private String userName;
-
-  @ApiModelProperty(value = "企业认证时间")
-  private Date entAuthTime;
-
-  @ApiModelProperty(value = "生成时间")
-  private Date createTime;
-
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
-
-  @ApiModelProperty(value = "现金余额")
-  private BigDecimal cashAmt;
-
-  private String unionId;
-  private String openId;
-
-  @ApiModelProperty(value = "多端用户，USER_PORT(云享飞)-FLYER_PORT(云飞手)-REPO_PORT(云仓)")
-  private Set<String> ports;
-
-  @ApiModelProperty(value = "用户推荐人数量")
-  private Integer rcdRepoTeamNum;
-
-  @ApiModelProperty(value = "推荐人Uid")
-  private String rcdUid;
-
-  @ApiModelProperty(value = "推荐人账户名称")
-  private String rcdAccountName;
-
-  @ApiModelProperty(value = "推荐人昵称")
-  private String rcdNickName;
-
-  @ApiModelProperty(value = "推荐人id")
-  private Integer rcdAccountId;
-
-  @ApiModelProperty(value = "是否销售")
-  private Integer sale;
-
-  @ApiModelProperty(value = "是否白名单")
-  private Integer white;
-
-  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
-  private Integer source;
-
-  @ApiModelProperty(value = "推荐单位")
-  private String company;
-
-  @ApiModelProperty(value = "推荐单位ID", hidden = true)
-  private Integer rcdCompanyId;
-}

src/main/java/com/mmc/pms/model/dto/TaskFlyerCostDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/25 10:12 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.TaskFlyerCostDTO", description = "飞手工资DTO")
-public class TaskFlyerCostDTO implements Serializable {
-  private static final long serialVersionUID = 4411028098471010440L;
-
-  @ApiModelProperty(value = "飞手工资id")
-  private Integer id;
-
-  @ApiModelProperty(value = "订单id")
-  private Integer orderTaskId;
-
-  @ApiModelProperty(value = "飞手日薪")
-  private BigDecimal flyerWag;
-
-  @ApiModelProperty(value = "飞手每日补贴")
-  private BigDecimal flyerSudy;
-
-  @ApiModelProperty(value = "每月工资结算日")
-  private Integer payDay;
-
-  @ApiModelProperty(value = "租房补贴")
-  private BigDecimal rentHouseSudy;
-
-  @ApiModelProperty(value = "交通补贴")
-  private BigDecimal trafficSudy;
-
-  @ApiModelProperty(value = "支付比例(例如0.95)")
-  private BigDecimal payPersent;
-
-  @ApiModelProperty(value = "设备信息")
-  private String deviceInfo;
-
-  @ApiModelProperty(value = "生成时间")
-  private Date createTime;
-
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
-
-  @ApiModelProperty(value = "任务编号")
-  private String orderNo;
-
-  @ApiModelProperty(value = "任务名称")
-  private String orderName;
-
-  @ApiModelProperty(value = "飞手数量")
-  private Integer flyerNum;
-
-  @ApiModelProperty(value = "服务类型")
-  private String inspectionName;
-
-  @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
-  private Integer flyerType;
-
-  @ApiModelProperty(value = "任务工资信息列表")
-  private List<WagTermDetailDTO> details;
-
-  @ApiModelProperty(value = "任务开始日")
-  private Date startTime;
-
-  @ApiModelProperty(value = "任务结束日")
-  private Date endTime;
-
-  @ApiModelProperty(value = "高温补贴")
-  private BigDecimal hotSudy;
-
-  @ApiModelProperty(value = "预估金额")
-  private BigDecimal estimateWag;
-
-  @ApiModelProperty(value = "补助标签")
-  private String sudyTag;
-
-  public void defaultValue() {
-    if (this.flyerWag == null) {
-      this.flyerWag = BigDecimal.ZERO;
-    }
-
-    if (this.flyerSudy == null) {
-      this.flyerSudy = BigDecimal.ZERO;
-    }
-
-    if (this.rentHouseSudy == null) {
-      this.rentHouseSudy = BigDecimal.ZERO;
-    }
-
-    if (this.trafficSudy == null) {
-      this.trafficSudy = BigDecimal.ZERO;
-    }
-
-    if (this.payPersent == null) {
-      this.payPersent = BigDecimal.ZERO;
-    }
-
-    if (this.hotSudy == null) {
-      this.hotSudy = BigDecimal.ZERO;
-    }
-  }
-}

src/main/java/com/mmc/pms/model/dto/UserAccountDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Author small @Date 2023/5/25 9:56 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.UserAccountDTO", description = "用户信息DTO")
-public class UserAccountDTO implements Serializable {
-  private static final long serialVersionUID = -3760693134872196985L;
-
-  @ApiModelProperty(value = "用户ID")
-  private Integer id;
-
-  @ApiModelProperty(value = "UID")
-  private String uid;
-
-  @ApiModelProperty(value = "账号")
-  private String accountNo;
-
-  @ApiModelProperty(value = "密码")
-  private String passWord;
-
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
-
-  @ApiModelProperty(value = "姓名")
-  private String userName;
-
-  @ApiModelProperty(value = "身份证号码")
-  private String idNumber;
-
-  @ApiModelProperty(value = "电话号码")
-  private String phoneNum;
-
-  @ApiModelProperty(value = "性别：0未知 1男 2女 ")
-  private Integer userSex;
-
-  @ApiModelProperty(value = "常住地址")
-  private String resAddres;
-
-  private Integer realAuthStatus;
-
-  @ApiModelProperty(value = "常住地址-经度")
-  private String longitude;
-
-  @ApiModelProperty(value = "常住地址-纬度")
-  private String latitude;
-
-  @ApiModelProperty(value = "是否企业用户：0否 1是")
-  private Integer entUser;
-
-  @ApiModelProperty(value = "是否渠道用户：0否 1是")
-  private Integer channelUser;
-
-  @ApiModelProperty(value = "备注")
-  private String remark;
-
-  @ApiModelProperty(value = "账号类型：0神行太保平台账号 ; 100云享飞-客户端; 101云享飞-飞手端; 102云享飞-云仓端")
-  private Integer accountType;
-
-  @ApiModelProperty(value = "账号状态：0禁用 1可用")
-  private Integer accountStatus;
-
-  @ApiModelProperty(value = "角色信息")
-  private RoleInfoDTO roleInfo;
-
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
-
-  @ApiModelProperty(value = "身份证正面照")
-  private String frontIdImg;
-
-  @ApiModelProperty(value = "身份证反面照")
-  private String backIdImg;
-
-  @ApiModelProperty(value = "邮箱")
-  private String email;
-
-  @ApiModelProperty(value = "单位信息")
-  private CompanySimpleDTO companyInfo;
-
-  private Integer rcdCompanyId;
-
-  @ApiModelProperty(value = "渠道等级")
-  private String channelLevel;
-
-  @ApiModelProperty(value = "法大大企业认证状态")
-  private Integer entVerifyStatus;
-
-  public UserAccountDTO(Integer id, String uid, String nickName) {
-    this.id = id;
-    this.uid = uid;
-    this.nickName = nickName;
-  }
-}

src/main/java/com/mmc/pms/model/dto/WagTermDetailDTO.java

-package com.mmc.pms.model.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Author small @Date 2023/5/25 10:13 @Version 1.0
- */
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.WagTermDetailDTO", description = "任务工资信息DTO")
-public class WagTermDetailDTO implements Serializable {
-  private static final long serialVersionUID = 6088946395006027466L;
-
-  @ApiModelProperty(value = "ID")
-  private Integer id;
-
-  @ApiModelProperty(value = "工资日期")
-  private Date costDate;
-
-  @ApiModelProperty(value = "工资(元/日)")
-  private BigDecimal wagPrice;
-
-  @ApiModelProperty(value = "补贴(元/日)")
-  private BigDecimal sudyPrice;
-
-  @ApiModelProperty(value = "出差租房补贴(元/日)")
-  private BigDecimal rentHousePrice;
-
-  @ApiModelProperty(value = "出差交通补贴(元/日)")
-  private BigDecimal trafficPrice;
-
-  @ApiModelProperty(value = "高温补贴(元/日)")
-  private BigDecimal hotPrice;
-
-  @ApiModelProperty(value = "飞手人数")
-  private Integer flyerNum;
-
-  @ApiModelProperty(value = "支付比例")
-  private BigDecimal payPersent;
-
-  @ApiModelProperty(value = "应结工资")
-  private BigDecimal shouldPay;
-
-  @ApiModelProperty(value = "补贴合计-单价（不计算人数）")
-  private BigDecimal daySudyUnit;
-
-  public void defaultValue() {
-    if (this.wagPrice == null) {
-      this.wagPrice = BigDecimal.ZERO;
-    }
-
-    if (this.sudyPrice == null) {
-      this.sudyPrice = BigDecimal.ZERO;
-    }
-
-    if (this.rentHousePrice == null) {
-      this.rentHousePrice = BigDecimal.ZERO;
-    }
-
-    if (this.trafficPrice == null) {
-      this.trafficPrice = BigDecimal.ZERO;
-    }
-
-    if (this.wagPrice == null) {
-      this.wagPrice = BigDecimal.ZERO;
-    }
-
-    if (this.payPersent == null) {
-      this.payPersent = BigDecimal.ZERO;
-    }
-
-    if (this.flyerNum == null) {
-      this.flyerNum = 0;
-    }
-  }
-}

src/main/java/com/mmc/pms/model/vo/Create.java → src/main/java/com/mmc/pms/model/group/Create.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.group;
 
 /**
  * @Author small @Date 2023/5/16 13:37 @Version 1.0
  */
-public interface Create {}
+public interface Create {
+}

src/main/java/com/mmc/pms/model/vo/Freeze.java → src/main/java/com/mmc/pms/model/group/Freeze.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.group;
 
 /**
  * @Author small @Date 2023/5/16 13:49 @Version 1.0
  */
-public interface Freeze {}
+public interface Freeze {
+}

src/main/java/com/mmc/pms/model/vo/Update.java → src/main/java/com/mmc/pms/model/group/Update.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.group;
 
 /**
  * @Author small @Date 2023/5/16 13:37 @Version 1.0
  */
-public interface Update {}
+public interface Update {
+}

src/main/java/com/mmc/pms/model/dto/AppletWareInfoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/AppletWareInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/BrandDTO.java → src/main/java/com/mmc/pms/model/lease/dto/BrandDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/DeviceCategoryDTO.java → src/main/java/com/mmc/pms/model/lease/dto/DeviceCategoryDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/DeviceListDTO.java → src/main/java/com/mmc/pms/model/lease/dto/DeviceListDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/WareDetailDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareDetailDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/dto/WareImgDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareImgDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.pms.model.dto.WareImgDTO", description = "设备图片DTO")
+@ApiModel(value = "com.mmc.pms.model.lease.dto.WareImgDTO", description = "设备图片DTO")
 public class WareImgDTO implements Serializable {
   private static final long serialVersionUID = 1195966760401573468L;
 

src/main/java/com/mmc/pms/model/dto/WareInfoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/WareInfoItemDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareInfoItemDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -19,7 +18,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.pms.model.dto.WareInfoItemDTO", description = "设备列表ItemDTO")
+//@ApiModel(value = "com.mmc.pms.model.lease.dto.WareInfoItemDTO", description = "设备列表ItemDTO")
 public class WareInfoItemDTO implements Serializable {
   private static final long serialVersionUID = -4354269497656808831L;
 

src/main/java/com/mmc/pms/model/dto/WarePropDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WarePropDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/dto/WareVideoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareVideoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.lease.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/vo/LeaseVo.java → src/main/java/com/mmc/pms/model/lease/vo/LeaseVo.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.pms.model.vo.LeaseVo", description = "立即租赁")
+// @ApiModel(value = "com.mmc.pms.model.lease.vo.LeaseVo", description = "立即租赁")
 public class LeaseVo {
     private static final long serialVersionUID = -8917940296555539559L;
 

src/main/java/com/mmc/pms/model/vo/PriceAcquisition.java → src/main/java/com/mmc/pms/model/lease/vo/PriceAcquisition.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/vo/WareImgVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareImgVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/vo/WareInfoVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareInfoVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/vo/WareSkuInfoVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareSkuInfoVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/vo/WareSkuPriceVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareSkuPriceVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.lease.vo;
 
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
+import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstDetailDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDetailDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstProdListDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstProdListDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/mmc/pms/model/dto/OrderGoodsProdDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
+import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/OrderGoodsProdDetailDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDetailDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;