维护

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,63 +28,64 @@ 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)})
-  @GetMapping("/getSecondDistrictInfo")
-  public ResultBody<DistrictInfoDTO> getSecondDistrictInfo() {
-    return webDeviceService.listSecondDistrict();
-  }
+    @ApiOperation(value = "地域")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/getSecondDistrictInfo")
+    public ResultBody<DistrictInfoDTO> getSecondDistrictInfo() {
+        return webDeviceService.listSecondDistrict();
+    }
 
-  @ApiOperation("设备类目")
-  @GetMapping("/category")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DeviceCategoryDTO.class)})
-  public ResultBody<DeviceCategoryDTO> category() {
-    return webDeviceService.category();
-  }
+    @ApiOperation("设备类目")
+    @GetMapping("/category")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DeviceCategoryDTO.class)})
+    public ResultBody<DeviceCategoryDTO> category() {
+        return webDeviceService.category();
+    }
 
-  @ApiOperation("品牌")
-  @GetMapping("/brand")
-  public ResultBody<BrandDTO> brand() {
-    return webDeviceService.brand();
-  }
+    @ApiOperation("品牌")
+    @GetMapping("/brand")
+    public ResultBody<BrandDTO> brand() {
+        return webDeviceService.brand();
+    }
 
-  @ApiOperation("型号")
-  @GetMapping("/model")
-  public ResultBody<ModelDTO> model() {
-    return webDeviceService.model();
-  }
+    @ApiOperation("型号")
+    @GetMapping("/model")
+    public ResultBody<ModelDTO> model() {
+        return webDeviceService.model();
+    }
 
-  @ApiOperation(value = "设备列表筛选")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
-  @PostMapping("/deviceList")
-  public ResultBody<WareInfoItemDTO> listWareInfoPage(
-      @RequestBody @Validated(Page.class) WareInfoQO param) {
-    return webDeviceService.listWareInfoPage(param);
-  }
+    @ApiOperation(value = "设备列表筛选")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
+    @PostMapping("/deviceList")
+    public ResultBody<WareInfoItemDTO> listWareInfoPage(
+            @RequestBody @Validated(Page.class) WareInfoQO param) {
+        return webDeviceService.listWareInfoPage(param);
+    }
 
-  @ApiOperation(value = "设备详情")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-  @GetMapping("/detail")
-  public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
-    WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
-    return wareInfoDTO == null
-        ? ResultBody.error(ResultEnum.NOT_FOUND)
-        : ResultBody.success(wareInfoDTO);
-  }
+    @ApiOperation(value = "设备详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/detail")
+    public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
+        WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
+        return wareInfoDTO == null
+                ? ResultBody.error(ResultEnum.NOT_FOUND)
+                : ResultBody.success(wareInfoDTO);
+    }
 
-  @ApiOperation(value = "立即租赁")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-  @PostMapping("/update")
-  public ResultBody update(@RequestBody LeaseVo param) {
-    return webDeviceService.update(param);
-  }
+    @ApiOperation(value = "立即租赁")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/update")
+    public ResultBody update(@RequestBody LeaseVo param) {
+        return webDeviceService.update(param);
+    }
 
-  @ApiOperation(value = "获取设备sku")
-  @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = SkuInfoDTO.class) })
-  @GetMapping("listWareSkuById")
-  public ResultBody<SkuInfoDTO> listWareSkuById(@RequestParam Integer id) {
-    return ResultBody.success(webDeviceService.listWareSkuById(id));
-  }
+    @ApiOperation(value = "获取设备sku")
+    @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,22 +18,24 @@ 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")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
-  public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
-      @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
-    return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
-  }
+    @ApiOperation(value = "小程序-商品信息-分页")
+    @PostMapping("listPageGoodsInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
+    public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
+            @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
+        return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
+    }
 
-  @ApiOperation(value = "小程序端-获取商品详细信息--共多少种选择")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
-  @GetMapping("getAppGoodsInfoDetail")
-  public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
-    return miniProgramProductMallService.getAppGoodsInfoDetail(id);
-  }
+    @ApiOperation(value = "小程序端-获取商品详细信息--共多少种选择")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
+    @GetMapping("getAppGoodsInfoDetail")
+    public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
+        return miniProgramProductMallService.getAppGoodsInfoDetail(id);
+    }
 }

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,74 +29,75 @@ 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)})
-  @GetMapping("/getSecondDistrictInfo")
-  public ResultBody<DistrictInfoDTO> getSecondDistrictInfo() {
-    return webDeviceService.listSecondDistrict();
-  }
+    @ApiOperation(value = "地域")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/getSecondDistrictInfo")
+    public ResultBody<DistrictInfoDTO> getSecondDistrictInfo() {
+        return webDeviceService.listSecondDistrict();
+    }
 
-  @ApiOperation("设备类目")
-  @GetMapping("/category")
-  public ResultBody<DeviceCategoryDTO> category() {
-    return webDeviceService.category();
-  }
+    @ApiOperation("设备类目")
+    @GetMapping("/category")
+    public ResultBody<DeviceCategoryDTO> category() {
+        return webDeviceService.category();
+    }
 
-  @ApiOperation("品牌")
-  @GetMapping("/brand")
-  public ResultBody<BrandDTO> brand() {
-    return webDeviceService.brand();
-  }
+    @ApiOperation("品牌")
+    @GetMapping("/brand")
+    public ResultBody<BrandDTO> brand() {
+        return webDeviceService.brand();
+    }
 
-  @ApiOperation("型号")
-  @GetMapping("/model")
-  public ResultBody<ModelDTO> model() {
-    return webDeviceService.model();
-  }
+    @ApiOperation("型号")
+    @GetMapping("/model")
+    public ResultBody<ModelDTO> model() {
+        return webDeviceService.model();
+    }
 
-  @ApiOperation("设备品牌")
-  @GetMapping("/deviceBrand")
-  public ResultBody<BrandDTO> deviceBrand() {
-    return webDeviceService.deviceBrand();
-  }
+    @ApiOperation("设备品牌")
+    @GetMapping("/deviceBrand")
+    public ResultBody<BrandDTO> deviceBrand() {
+        return webDeviceService.deviceBrand();
+    }
 
-  @ApiOperation("设备型号")
-  @GetMapping("/deviceModel")
-  public ResultBody<ModelDTO> deviceModel() {
-    return webDeviceService.deviceModel();
-  }
+    @ApiOperation("设备型号")
+    @GetMapping("/deviceModel")
+    public ResultBody<ModelDTO> deviceModel() {
+        return webDeviceService.deviceModel();
+    }
 
-  @ApiOperation(value = "设备详情")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-  @GetMapping("/detail")
-  public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
-    WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
-    return wareInfoDTO == null
-        ? ResultBody.error(ResultEnum.NOT_FOUND)
-        : ResultBody.success(wareInfoDTO);
-  }
+    @ApiOperation(value = "设备详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/detail")
+    public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
+        WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
+        return wareInfoDTO == null
+                ? ResultBody.error(ResultEnum.NOT_FOUND)
+                : ResultBody.success(wareInfoDTO);
+    }
 
-  @ApiOperation(value = "立即租赁")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-  @PostMapping("/update")
-  public ResultBody update(@RequestBody LeaseVo param) {
-    return webDeviceService.update(param);
-  }
+    @ApiOperation(value = "立即租赁")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("/update")
+    public ResultBody update(@RequestBody LeaseVo param) {
+        return webDeviceService.update(param);
+    }
 
-  @ApiOperation("设备广告位")
-  @GetMapping("/ad")
-  public ResultBody<AdDTO> ad() {
-    return webDeviceService.ad();
-  }
+    @ApiOperation("设备广告位")
+    @GetMapping("/ad")
+    public ResultBody<AdDTO> ad() {
+        return webDeviceService.ad();
+    }
 
-  @ApiOperation(value = "设备列表筛选")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
-  @PostMapping("/deviceList")
-  public ResultBody<WareInfoItemDTO> listWareInfoPage(
-          @RequestBody @Validated(Page.class) WareInfoQO param) {
-    return webDeviceService.listWareInfoPage(param);
-  }
+    @ApiOperation(value = "设备列表筛选")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
+    @PostMapping("/deviceList")
+    public ResultBody<WareInfoItemDTO> listWareInfoPage(
+            @RequestBody @Validated(Page.class) WareInfoQO param) {
+        return webDeviceService.listWareInfoPage(param);
+    }
 
 }

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,46 +19,48 @@ 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")
-  public ResultBody<ProductCategoryDTO> productCategory() {
-    return webProductMallService.productCategory();
-  }
+    @ApiOperation("产品类目")
+    @GetMapping("/category")
+    public ResultBody<ProductCategoryDTO> productCategory() {
+        return webProductMallService.productCategory();
+    }
 
-  @ApiOperation("产品部件")
-  @GetMapping("/parts")
-  public ResultBody<ProductCategoryDTO> productParts() {
-    return webProductMallService.productParts();
-  }
+    @ApiOperation("产品部件")
+    @GetMapping("/parts")
+    public ResultBody<ProductCategoryDTO> productParts() {
+        return webProductMallService.productParts();
+    }
 
-  @ApiOperation("产品成色")
-  @GetMapping("/quality")
-  public ResultBody<ProductCategoryDTO> productQuality() {
-    return webProductMallService.productQuality();
-  }
+    @ApiOperation("产品成色")
+    @GetMapping("/quality")
+    public ResultBody<ProductCategoryDTO> productQuality() {
+        return webProductMallService.productQuality();
+    }
 
-  @ApiOperation(value = "web-商品信息-分页")
-  @PostMapping("listPageGoodsInfo")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
-  public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
-      @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
-    return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
-  }
+    @ApiOperation(value = "web-商品信息-分页")
+    @PostMapping("listPageGoodsInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
+    public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
+            @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
+        return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
+    }
 
-  @ApiOperation(value = "web-获取商品详细信息--共多少种选择")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
-  @GetMapping("getAppGoodsInfoDetail")
-  public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
-    return miniProgramProductMallService.getAppGoodsInfoDetail(id);
-  }
+    @ApiOperation(value = "web-获取商品详细信息--共多少种选择")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
+    @GetMapping("getAppGoodsInfoDetail")
+    public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
+        return miniProgramProductMallService.getAppGoodsInfoDetail(id);
+    }
 
-  @ApiOperation("产品商城广告位")
-  @GetMapping("/ad")
-  public ResultBody<AdDTO> ad() {
-    return webProductMallService.ad();
-  }
+    @ApiOperation("产品商城广告位")
+    @GetMapping("/ad")
+    public ResultBody<AdDTO> ad() {
+        return webProductMallService.ad();
+    }
 }

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;
@@ -14,36 +12,36 @@ import java.util.List;
  */
 @Mapper
 public interface WebDeviceDao {
-  List<DistrictDO> listSecondDistrict();
+    List<DistrictDO> listSecondDistrict();
 
-  List<DeviceCategory> category();
+    List<DeviceCategory> category();
 
-  List<Brand> brand();
+    List<Brand> brand();
 
-  List<Brand> deviceBrand();
+    List<Brand> deviceBrand();
 
-  List<Model> model();
+    List<Model> model();
 
-  List<Model> deviceModel();
+    List<Model> deviceModel();
 
-  List<DeviceListDO> deviceList(
-      Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
+    List<DeviceListDO> deviceList(
+            Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
 
-  int update(LeaseVo param);
+    int update(LeaseVo param);
 
-  InventoryDO findInventory(Integer inventoryId);
+    InventoryDO findInventory(Integer inventoryId);
 
-  List<WareInfoDO> detail(Integer id);
+    List<WareInfoDO> detail(Integer id);
 
-  int countListWareInfoPage(WareInfoQO param);
+    int countListWareInfoPage(WareInfoQO param);
 
-  List<WareInfoDO> listWareInfoPage(WareInfoQO param);
+    List<WareInfoDO> listWareInfoPage(WareInfoQO param);
 
-  WareInfoDO getWareInfoById(Integer id);
+    WareInfoDO getWareInfoById(Integer id);
 
-  WareDetailDO getWareDetailById(Integer id);
+    WareDetailDO getWareDetailById(Integer id);
 
-  List<AdDO> ad();
+    List<AdDO> ad();
 
-  List<SkuInfoDO> listSkuInfo(Integer id);
+    List<SkuInfoDO> listSkuInfo(Integer id);
 }

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;
@@ -13,13 +13,13 @@ import lombok.Data;
 @ApiModel("品牌")
 @TableName("brand")
 public class Brand extends BaseEntity {
-  @ApiModelProperty("1")
-  private Integer id;
+    @ApiModelProperty("1")
+    private Integer id;
 
-  @ApiModelProperty("名称")
-  private String name;
+    @ApiModelProperty("名称")
+    private String name;
 
-  public BrandDTO brandDTO() {
-    return BrandDTO.builder().id(this.id).name(this.name).build();
-  }
+    public BrandDTO brandDTO() {
+        return BrandDTO.builder().id(this.id).name(this.name).build();
+    }
 }

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;
 
@@ -9,13 +9,13 @@ import lombok.Data;
  */
 @Data
 public class DeviceCategory extends BaseEntity {
-  @ApiModelProperty(name = "id", value = "类目id", example = "1")
-  private Integer id;
+    @ApiModelProperty(name = "id", value = "类目id", example = "1")
+    private Integer id;
 
-  @ApiModelProperty(name = "id", value = "类目名称", example = "无人机")
-  private String name;
+    @ApiModelProperty(name = "id", value = "类目名称", example = "无人机")
+    private String name;
 
-  public DeviceCategoryDTO deviceCategory() {
-    return DeviceCategoryDTO.builder().id(this.id).name(this.name).build();
-  }
+    public DeviceCategoryDTO deviceCategory() {
+        return DeviceCategoryDTO.builder().id(this.id).name(this.name).build();
+    }
 }

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;
 
@@ -10,31 +10,31 @@ import lombok.Data;
 @Data
 @ApiModel("设备列表")
 public class DeviceListDO {
-  private Integer id;
-  private String deviceName;
-  private String imageUrl;
-  private String price;
-  private String brandName;
-  private String sysDistrictName;
-  private String modelName;
-  private String deviceCategoryName;
-  private Integer residueCount;
-  private Integer inventoryId;
-  private String appraise;
+    private Integer id;
+    private String deviceName;
+    private String imageUrl;
+    private String price;
+    private String brandName;
+    private String sysDistrictName;
+    private String modelName;
+    private String deviceCategoryName;
+    private Integer residueCount;
+    private Integer inventoryId;
+    private String appraise;
 
-  public DeviceListDTO deviceListDTO() {
-    return DeviceListDTO.builder()
-        .id(this.id)
-        .deviceName(this.deviceName)
-        .imageUrl(this.imageUrl)
-        .price(this.price)
-        .brandName(this.brandName)
-        .sysDistrictName(this.sysDistrictName)
-        .modelName(this.modelName)
-        .deviceCategoryName(this.deviceCategoryName)
-        .residueCount(this.residueCount)
-        .inventoryId(this.inventoryId)
-        .appraise(this.appraise)
-        .build();
-  }
+    public DeviceListDTO deviceListDTO() {
+        return DeviceListDTO.builder()
+                .id(this.id)
+                .deviceName(this.deviceName)
+                .imageUrl(this.imageUrl)
+                .price(this.price)
+                .brandName(this.brandName)
+                .sysDistrictName(this.sysDistrictName)
+                .modelName(this.modelName)
+                .deviceCategoryName(this.deviceCategoryName)
+                .residueCount(this.residueCount)
+                .inventoryId(this.inventoryId)
+                .appraise(this.appraise)
+                .build();
+    }
 }

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;
@@ -20,26 +20,26 @@ import java.util.Date;
 @Builder
 @Accessors(chain = true)
 public class GoodsDetailDO implements Serializable {
-  private Integer id;
-  private Integer goodsInfoId;
-  private String goodsDesc;
-  private String content;
-  private String remark;
-  private Date createTime;
-  private Date updateTime;
+    private Integer id;
+    private Integer goodsInfoId;
+    private String goodsDesc;
+    private String content;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
 
-  public GoodsDetailDO(GoodsDetailVO goodsDetailVO) {
-    this.goodsDesc = goodsDetailVO.getGoodsDesc();
-    this.content = goodsDetailVO.getProductDesc();
-    this.remark = goodsDetailVO.getRemark();
-  }
+    public GoodsDetailDO(GoodsDetailVO goodsDetailVO) {
+        this.goodsDesc = goodsDetailVO.getGoodsDesc();
+        this.content = goodsDetailVO.getProductDesc();
+        this.remark = goodsDetailVO.getRemark();
+    }
 
-  public GoodsDetailInfoDTO buildGoodsDetailInfoDTO() {
-    return GoodsDetailInfoDTO.builder()
-        .id(this.id)
-        .goodsDesc(this.goodsDesc)
-        .content(this.content)
-        .remark(this.remark)
-        .build();
-  }
+    public GoodsDetailInfoDTO buildGoodsDetailInfoDTO() {
+        return GoodsDetailInfoDTO.builder()
+                .id(this.id)
+                .goodsDesc(this.goodsDesc)
+                .content(this.content)
+                .remark(this.remark)
+                .build();
+    }
 }

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;
@@ -19,19 +19,19 @@ import java.util.Date;
 @Builder
 public class GoodsImgDO implements Serializable {
 
-  private Integer id;
-  private Integer goodsInfoId;
-  private String imgUrl;
-  private Integer imgType;
-  private Integer deleted;
-  private Date createTime;
+    private Integer id;
+    private Integer goodsInfoId;
+    private String imgUrl;
+    private Integer imgType;
+    private Integer deleted;
+    private Date createTime;
 
-  public GoodsImgDO(GoodsImgVO d) {
-    this.imgUrl = d.getImgUrl();
-    this.imgType = d.getImgType();
-  }
+    public GoodsImgDO(GoodsImgVO d) {
+        this.imgUrl = d.getImgUrl();
+        this.imgType = d.getImgType();
+    }
 
-  public GoodsImgDTO buildGoodsImgDTO() {
-    return GoodsImgDTO.builder().id(this.id).imgUrl(this.imgUrl).imgType(this.imgType).build();
-  }
+    public GoodsImgDTO buildGoodsImgDTO() {
+        return GoodsImgDTO.builder().id(this.id).imgUrl(this.imgUrl).imgType(this.imgType).build();
+    }
 }

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;
@@ -22,73 +22,75 @@ import java.util.List;
 @Builder
 @Accessors(chain = true)
 public class GoodsInfoDO implements Serializable {
-  private static final long serialVersionUID = -1329342381196659417L;
-  private Integer id;
-  private Integer pid;
-  private String goodsNo;
-  private String goodsName;
-  private Integer masterTypeId;
-  private Integer slaveTypeId;
-  private Integer shelfStatus;
-  private Integer skuNum;
-  private Integer deleted;
-  private Date createTime;
-  private Date updateTime;
-  private Integer goodsAttr;
-  private String ecoLabel;
-  private Integer goodsCategoryId;
-  private Integer repoId;
-  private Integer shareFlyServiceId;
-  private Integer goodsType;
-  private Integer sort;
-  private Integer showCode;
-  private Integer standardProduct;
-  private String tag;
+    private static final long serialVersionUID = -1329342381196659417L;
+    private Integer id;
+    private Integer pid;
+    private String goodsNo;
+    private String goodsName;
+    private Integer masterTypeId;
+    private Integer slaveTypeId;
+    private Integer shelfStatus;
+    private Integer skuNum;
+    private Integer deleted;
+    private Date createTime;
+    private Date updateTime;
+    private Integer goodsAttr;
+    private String ecoLabel;
+    private Integer goodsCategoryId;
+    private Integer repoId;
+    private Integer shareFlyServiceId;
+    private Integer goodsType;
+    private Integer sort;
+    private Integer showCode;
+    private Integer standardProduct;
+    private String tag;
 
-  /** 辅助字段-start */
-  private String videoUrl;
+    /**
+     * 辅助字段-start
+     */
+    private String videoUrl;
 
-  private Integer goodsVideoId;
-  private String goodsDesc;
-  private GoodsVideoDO goodsVideoDO;
-  private String mainImg; // 主图
-  private GoodsTypeDO goodsMasterType;
-  private GoodsTypeDO goodsSlaveType;
-  private String remark; // 底部备注
-  private Integer sortTypeId;
-  private List<CategoryParamAndValueVO> paramAndValue;
-  private GoodsConfigExportDO goodsConfigExport; // 功能清单
-  private Integer buyNum; // 购买数量
-  private String directoryName;
-  private Integer isCoupons;
+    private Integer goodsVideoId;
+    private String goodsDesc;
+    private GoodsVideoDO goodsVideoDO;
+    private String mainImg; // 主图
+    private GoodsTypeDO goodsMasterType;
+    private GoodsTypeDO goodsSlaveType;
+    private String remark; // 底部备注
+    private Integer sortTypeId;
+    private List<CategoryParamAndValueVO> paramAndValue;
+    private GoodsConfigExportDO goodsConfigExport; // 功能清单
+    private Integer buyNum; // 购买数量
+    private String directoryName;
+    private Integer isCoupons;
 
-  public GoodsInfoListDTO buildGoodsInfoListDTO() {
-    return GoodsInfoListDTO.builder()
-        .id(this.id)
-        .goodsName(this.goodsName)
-        .status(this.shelfStatus)
-        .createTime(this.createTime)
-        .imgUrl(this.mainImg)
-        .directoryId(this.sortTypeId)
-        .directoryName(this.directoryName)
-         .goodsDesc(this.goodsDesc)
-        .goodsOneLevelTypeName(this.goodsMasterType.getTypeName())
-        .goodsTwoLevelTypeName(this.goodsSlaveType.getTypeName())
-        .isCoupons(this.isCoupons)
-        .build();
-  }
+    public GoodsInfoListDTO buildGoodsInfoListDTO() {
+        return GoodsInfoListDTO.builder()
+                .id(this.id)
+                .goodsName(this.goodsName)
+                .status(this.shelfStatus)
+                .createTime(this.createTime)
+                .imgUrl(this.mainImg)
+                .directoryId(this.sortTypeId)
+                .directoryName(this.directoryName)
+                .goodsDesc(this.goodsDesc)
+                .goodsOneLevelTypeName(this.goodsMasterType.getTypeName())
+                .goodsTwoLevelTypeName(this.goodsSlaveType.getTypeName())
+                .isCoupons(this.isCoupons)
+                .build();
+    }
 
-  public AppGoodsInfoDTO buildAppGoodsInfoDTO() {
-    return AppGoodsInfoDTO.builder()
-        .id(this.id)
-        .goodsName(this.goodsName)
-        .mainImg(this.mainImg)
-        .goodsDesc(this.goodsDesc)
-        .shelfStatus(this.shelfStatus)
-        .goodsAttr(this.goodsAttr)
-        .ecoLabel(this.tag)
-        .showCode(this.showCode)
-        .sort(this.sort)
-        .build();
-  }
+    public AppGoodsInfoDTO buildAppGoodsInfoDTO() {
+        return AppGoodsInfoDTO.builder()
+                .id(this.id)
+                .goodsName(this.goodsName)
+                .mainImg(this.mainImg)
+                .goodsDesc(this.goodsDesc)
+                .shelfStatus(this.shelfStatus)
+                .goodsAttr(this.goodsAttr)
+                .ecoLabel(this.tag)
+                .showCode(this.showCode)
+                .sort(this.sort)
+                .build();
+    }
 }

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;
@@ -18,20 +16,11 @@ import java.util.Date;
 @Data
 @Builder
 public class GoodsQaDO implements Serializable {
-  private Integer id;
-  private Integer goodsInfoId;
-  private String question;
-  private String answer;
-  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();
-  }
+    private Integer id;
+    private Integer goodsInfoId;
+    private String question;
+    private String answer;
+    private Integer deleted;
+    private Date updateTime;
+    private Date createTime;
 }

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;
@@ -18,32 +18,37 @@ import java.util.Date;
 @NoArgsConstructor
 @Builder
 public class GoodsServiceDO implements Serializable {
-  private static final long serialVersionUID = -2612831712612727210L;
-  private Integer id;
-  private Integer goodsInfoId;
-  private Integer saleServiceId;
-  private Date createTime;
+    private static final long serialVersionUID = -2612831712612727210L;
+    private Integer id;
+    private Integer goodsInfoId;
+    private Integer saleServiceId;
+    private Date createTime;
 
-  /** 辅助字段-start */
-  private String serviceName;
+    /**
+     * 辅助字段-start
+     */
+    private String serviceName;
 
-  private String remark;
-  /** 辅助字段-end */
-  public GoodsServiceDTO buildGoodsServiceDTO() {
-    return GoodsServiceDTO.builder()
-        .id(this.id)
-        .saleServiceId(this.saleServiceId)
-        .goodsInfoId(goodsInfoId)
-        .serviceName(serviceName)
-        .remark(remark)
-        .build();
-  }
+    private String remark;
 
-  public GoodsOtherServiceDTO buildGoodsOtherServiceDTO() {
-    return GoodsOtherServiceDTO.builder()
-        .id(this.id)
-        .saleServiceId(this.saleServiceId)
-        .serviceName(this.serviceName)
-        .build();
-  }
+    /**
+     * 辅助字段-end
+     */
+    public GoodsServiceDTO buildGoodsServiceDTO() {
+        return GoodsServiceDTO.builder()
+                .id(this.id)
+                .saleServiceId(this.saleServiceId)
+                .goodsInfoId(goodsInfoId)
+                .serviceName(serviceName)
+                .remark(remark)
+                .build();
+    }
+
+    public GoodsOtherServiceDTO buildGoodsOtherServiceDTO() {
+        return GoodsOtherServiceDTO.builder()
+                .id(this.id)
+                .saleServiceId(this.saleServiceId)
+                .serviceName(this.serviceName)
+                .build();
+    }
 }

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;
@@ -15,17 +15,17 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class IndustryProductInventoryDO implements Serializable {
-  private static final long serialVersionUID = -3586673158091288317L;
-  private Integer id;
-  private Integer industrySpecId;
-  private Integer productSkuId;
-  private Integer selected;
-  private Integer deleted;
-  private Date createTime;
-  private Date updateTime;
+    private static final long serialVersionUID = -3586673158091288317L;
+    private Integer id;
+    private Integer industrySpecId;
+    private Integer productSkuId;
+    private Integer selected;
+    private Integer deleted;
+    private Date createTime;
+    private Date updateTime;
 
-  public IndustryProductInventoryDO(ProductInventoryVO d) {
-    this.productSkuId = d.getProductSku().getId();
-    this.selected = d.getSelect();
-  }
+    public IndustryProductInventoryDO(ProductInventoryVO d) {
+        this.productSkuId = d.getProductSku().getId();
+        this.selected = d.getSelect();
+    }
 }

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;
@@ -17,111 +17,111 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class OrderInfoDO implements Serializable {
-  private static final long serialVersionUID = 6544149196885009444L;
-  private Integer id;
-  private String orderNo;
-  private Integer wareInfoId;
-  private String wareNo;
-  private String wareTitle;
-  private String wareImg;
-  private Integer skuInfoId;
-  private String skuTitle;
-  private Integer repoAccountId;
-  private String uid;
-  private String buyerName;
-  private String buyerPhone;
-  private BigDecimal unitPrice;
-  private Integer wareNum;
-  private BigDecimal shouldPay;
-  private BigDecimal actualPay;
-  private Integer orderType;
-  private BigDecimal deposit;
-  private BigDecimal rentPrice;
-  private Date startDate;
-  private Date endDate;
-  private Integer payDay;
-  private String tranStatus;
-  private Integer exWare;
-  private String remark;
-  private String pfRemark;
-  private String shutReason;
-  private String payNo;
-  private Date payTime;
-  private Date sendWareTime;
-  private Integer rcdCompanyId;
-  private Date createTime;
-  private Date updateTime;
+    private static final long serialVersionUID = 6544149196885009444L;
+    private Integer id;
+    private String orderNo;
+    private Integer wareInfoId;
+    private String wareNo;
+    private String wareTitle;
+    private String wareImg;
+    private Integer skuInfoId;
+    private String skuTitle;
+    private Integer repoAccountId;
+    private String uid;
+    private String buyerName;
+    private String buyerPhone;
+    private BigDecimal unitPrice;
+    private Integer wareNum;
+    private BigDecimal shouldPay;
+    private BigDecimal actualPay;
+    private Integer orderType;
+    private BigDecimal deposit;
+    private BigDecimal rentPrice;
+    private Date startDate;
+    private Date endDate;
+    private Integer payDay;
+    private String tranStatus;
+    private Integer exWare;
+    private String remark;
+    private String pfRemark;
+    private String shutReason;
+    private String payNo;
+    private Date payTime;
+    private Date sendWareTime;
+    private Integer rcdCompanyId;
+    private Date createTime;
+    private Date updateTime;
 
-  /**
-   * 辅助字段
-   *
-   * @return
-   */
-  private OrderReceiptDO receipt;
+    /**
+     * 辅助字段
+     *
+     * @return
+     */
+    private OrderReceiptDO receipt;
 
-  public OrderInfoDTO buildOrderInfoDTO() {
-    return OrderInfoDTO.builder()
-        .id(this.id)
-        .orderNo(this.orderNo)
-        .wareInfoId(this.wareInfoId)
-        .wareNo(this.wareNo)
-        .wareTitle(this.wareTitle)
-        .skuInfoId(this.skuInfoId)
-        .skuTitle(this.skuTitle)
-        .repoAccountId(this.repoAccountId)
-        .uid(this.uid)
-        .buyerName(this.buyerName)
-        .buyerPhone(this.buyerPhone)
-        .unitPrice(this.unitPrice)
-        .wareNum(this.wareNum)
-        .shouldPay(this.shouldPay)
-        .actualPay(this.actualPay)
-        .orderType(this.orderType)
-        .deposit(this.deposit)
-        .rentPrice(this.rentPrice)
-        .startDate(this.startDate)
-        .endDate(this.endDate)
-        .payDay(this.payDay)
-        .tranStatus(this.tranStatus)
-        .createTime(this.createTime)
-        .payTime(this.payTime)
-        .payNo(this.payNo)
-        .wareImg(this.wareImg)
-        .pfRemark(this.pfRemark)
-        .shutReason(this.shutReason)
-        .remark(this.remark)
-        .receipt(this.receipt == null ? null : receipt.buildOrderReceiptDTO())
-        .exWare(this.exWare)
-        .sendWareTime(this.sendWareTime)
-        .build();
-  }
+    public OrderInfoDTO buildOrderInfoDTO() {
+        return OrderInfoDTO.builder()
+                .id(this.id)
+                .orderNo(this.orderNo)
+                .wareInfoId(this.wareInfoId)
+                .wareNo(this.wareNo)
+                .wareTitle(this.wareTitle)
+                .skuInfoId(this.skuInfoId)
+                .skuTitle(this.skuTitle)
+                .repoAccountId(this.repoAccountId)
+                .uid(this.uid)
+                .buyerName(this.buyerName)
+                .buyerPhone(this.buyerPhone)
+                .unitPrice(this.unitPrice)
+                .wareNum(this.wareNum)
+                .shouldPay(this.shouldPay)
+                .actualPay(this.actualPay)
+                .orderType(this.orderType)
+                .deposit(this.deposit)
+                .rentPrice(this.rentPrice)
+                .startDate(this.startDate)
+                .endDate(this.endDate)
+                .payDay(this.payDay)
+                .tranStatus(this.tranStatus)
+                .createTime(this.createTime)
+                .payTime(this.payTime)
+                .payNo(this.payNo)
+                .wareImg(this.wareImg)
+                .pfRemark(this.pfRemark)
+                .shutReason(this.shutReason)
+                .remark(this.remark)
+                .receipt(this.receipt == null ? null : receipt.buildOrderReceiptDTO())
+                .exWare(this.exWare)
+                .sendWareTime(this.sendWareTime)
+                .build();
+    }
 
-  public OrderInfoDO(LeaseOrderVO lease) {
-    this.orderNo = lease.getOrderNo();
-    this.wareInfoId = lease.getWareInfoId();
-    this.wareNo = lease.getWareNo();
-    this.wareTitle = lease.getWareTitle();
-    this.wareImg = lease.getMainImg();
-    this.skuInfoId = lease.getSkuInfoId();
-    this.skuTitle = lease.getSkuTitle();
-    this.repoAccountId = lease.getRepoAccountId();
-    this.uid = lease.getUid();
-    this.buyerName = lease.getBuyerName();
-    this.buyerPhone = lease.getBuyerPhone();
-    this.unitPrice = lease.getUnitPrice();
-    this.wareNum = lease.getWareNum();
-    this.shouldPay = lease.getShouldPay();
-    this.actualPay = lease.getActualPay();
-    this.orderType = lease.getOrderType();
-    this.deposit = lease.getDeposit();
-    this.rentPrice = lease.getRentPrice();
-    this.startDate = lease.getStartDate();
-    this.endDate = lease.getEndDate();
-    this.payDay = lease.getPayDay();
-    this.exWare = lease.getExWare();
-    this.tranStatus = lease.getTranStatus();
-    this.remark = lease.getRemark();
-    this.createTime = lease.getCreateTime();
-    this.rcdCompanyId = lease.getRcdCompanyId();
-  }
+    public OrderInfoDO(LeaseOrderVO lease) {
+        this.orderNo = lease.getOrderNo();
+        this.wareInfoId = lease.getWareInfoId();
+        this.wareNo = lease.getWareNo();
+        this.wareTitle = lease.getWareTitle();
+        this.wareImg = lease.getMainImg();
+        this.skuInfoId = lease.getSkuInfoId();
+        this.skuTitle = lease.getSkuTitle();
+        this.repoAccountId = lease.getRepoAccountId();
+        this.uid = lease.getUid();
+        this.buyerName = lease.getBuyerName();
+        this.buyerPhone = lease.getBuyerPhone();
+        this.unitPrice = lease.getUnitPrice();
+        this.wareNum = lease.getWareNum();
+        this.shouldPay = lease.getShouldPay();
+        this.actualPay = lease.getActualPay();
+        this.orderType = lease.getOrderType();
+        this.deposit = lease.getDeposit();
+        this.rentPrice = lease.getRentPrice();
+        this.startDate = lease.getStartDate();
+        this.endDate = lease.getEndDate();
+        this.payDay = lease.getPayDay();
+        this.exWare = lease.getExWare();
+        this.tranStatus = lease.getTranStatus();
+        this.remark = lease.getRemark();
+        this.createTime = lease.getCreateTime();
+        this.rcdCompanyId = lease.getRcdCompanyId();
+    }
 }

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;
@@ -18,69 +18,69 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class OrderReceiptDO implements Serializable {
-  private static final long serialVersionUID = 7590192330910329668L;
-  private Integer id;
-  private Integer orderInfoId;
-  private Integer receiptMethod;
-  private String takeName;
-  private String takePhone;
-  private String region;
-  private String detailAddress;
-  private String repoName;
-  private String repoAddress;
-  private String bookPhone;
-  private String sendExCode;
-  private String sendExNo;
-  private String sendAddress;
-  private Integer renMethod;
-  private String renPhone;
-  private String renName;
-  private String renExCode;
-  private String renExNo;
-  private String renAddress;
-  private String exName;
+    private static final long serialVersionUID = 7590192330910329668L;
+    private Integer id;
+    private Integer orderInfoId;
+    private Integer receiptMethod;
+    private String takeName;
+    private String takePhone;
+    private String region;
+    private String detailAddress;
+    private String repoName;
+    private String repoAddress;
+    private String bookPhone;
+    private String sendExCode;
+    private String sendExNo;
+    private String sendAddress;
+    private Integer renMethod;
+    private String renPhone;
+    private String renName;
+    private String renExCode;
+    private String renExNo;
+    private String renAddress;
+    private String exName;
 
-  private String renRepoName;
-  private String renRepoAddr;
-  private String renRepoPhone;
+    private String renRepoName;
+    private String renRepoAddr;
+    private String renRepoPhone;
 
-  private Date createTime;
+    private Date createTime;
 
-  public OrderReceiptDO(OrderReceiptVO d) {
-    this.orderInfoId = d.getOrderInfoId();
-    this.receiptMethod = d.getReceiptMethod();
-    this.takeName = d.getTakeName();
-    this.takePhone = d.getTakePhone();
-    this.region = d.getRegion();
-    this.detailAddress = d.getDetailAddress();
-    this.repoName = d.getRepoName();
-    this.repoAddress = d.getRepoAddress();
-    this.bookPhone = d.getBookPhone();
-  }
+    public OrderReceiptDO(OrderReceiptVO d) {
+        this.orderInfoId = d.getOrderInfoId();
+        this.receiptMethod = d.getReceiptMethod();
+        this.takeName = d.getTakeName();
+        this.takePhone = d.getTakePhone();
+        this.region = d.getRegion();
+        this.detailAddress = d.getDetailAddress();
+        this.repoName = d.getRepoName();
+        this.repoAddress = d.getRepoAddress();
+        this.bookPhone = d.getBookPhone();
+    }
 
-  public OrderReceiptDTO buildOrderReceiptDTO() {
-    return OrderReceiptDTO.builder()
-        .id(this.id)
-        .receiptMethod(this.receiptMethod)
-        .takeName(this.takeName)
-        .takePhone(this.takePhone)
-        .region(this.region)
-        .detailAddress(this.detailAddress)
-        .repoName(this.repoName)
-        .repoAddress(this.repoAddress)
-        .bookPhone(this.bookPhone)
-        .sendExCode(this.sendExCode)
-        .sendExNo(this.sendExNo)
-        .sendAddress(this.sendAddress)
-        .renMethod(this.renMethod)
-        .renPhone(this.renPhone)
-        .renName(this.renName)
-        .renExCode(this.renExCode)
-        .renExNo(this.renExNo)
-        .renAddress(this.renAddress)
-        .renRepoName(this.renRepoName)
-        .renRepoAddr(this.renRepoAddr)
-        .renRepoPhone(this.renRepoPhone)
-        .build();
-  }
+    public OrderReceiptDTO buildOrderReceiptDTO() {
+        return OrderReceiptDTO.builder()
+                .id(this.id)
+                .receiptMethod(this.receiptMethod)
+                .takeName(this.takeName)
+                .takePhone(this.takePhone)
+                .region(this.region)
+                .detailAddress(this.detailAddress)
+                .repoName(this.repoName)
+                .repoAddress(this.repoAddress)
+                .bookPhone(this.bookPhone)
+                .sendExCode(this.sendExCode)
+                .sendExNo(this.sendExNo)
+                .sendAddress(this.sendAddress)
+                .renMethod(this.renMethod)
+                .renPhone(this.renPhone)
+                .renName(this.renName)
+                .renExCode(this.renExCode)
+                .renExNo(this.renExNo)
+                .renAddress(this.renAddress)
+                .renRepoName(this.renRepoName)
+                .renRepoAddr(this.renRepoAddr)
+                .renRepoPhone(this.renRepoPhone)
+                .build();
+    }
 }

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;
@@ -16,26 +16,26 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class WareImgDO implements Serializable {
-  private static final long serialVersionUID = -1711990559893951800L;
-  private Integer id;
-  private Integer wareInfoId;
-  private String imgUrl;
-  private Integer imgType;
-  private Integer deleted;
-  private Date createTime;
+    private static final long serialVersionUID = -1711990559893951800L;
+    private Integer id;
+    private Integer wareInfoId;
+    private String imgUrl;
+    private Integer imgType;
+    private Integer deleted;
+    private Date createTime;
 
-  public WareImgDTO buildWareImgDTO() {
-    return WareImgDTO.builder()
-        .id(this.id)
-        .wareInfoId(this.wareInfoId)
-        .imgType(this.imgType)
-        .imgUrl(this.imgUrl)
-        .build();
-  }
+    public WareImgDTO buildWareImgDTO() {
+        return WareImgDTO.builder()
+                .id(this.id)
+                .wareInfoId(this.wareInfoId)
+                .imgType(this.imgType)
+                .imgUrl(this.imgUrl)
+                .build();
+    }
 
-  public WareImgDO(WareImgVO d) {
-    this.id = d.getId();
-    this.imgUrl = d.getImgUrl();
-    this.imgType = d.getImgType();
-  }
+    public WareImgDO(WareImgVO d) {
+        this.id = d.getId();
+        this.imgUrl = d.getImgUrl();
+        this.imgType = d.getImgType();
+    }
 }

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;
@@ -23,114 +23,118 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @NoArgsConstructor
 public class WareInfoDO implements Serializable {
-  private static final long serialVersionUID = 5530961803742843304L;
-  private Integer id;
-  private String wareNo;
-  private String wareTitle;
-  private Integer wareTypeId;
-  private Integer wareStatus;
-  private Integer payStatus;
-  private BigDecimal minDeposit;
-  private BigDecimal maxDeposit;
-  private BigDecimal minRent;
-  private BigDecimal maxRent;
-  private Integer totalStock;
-  private Integer totalSale;
-  private Integer skuNum;
-  private String tags;
-  private Integer deleted;
-  private Date createTime;
-  private Date updateTime;
-  private Integer pid;
+    private static final long serialVersionUID = 5530961803742843304L;
+    private Integer id;
+    private String wareNo;
+    private String wareTitle;
+    private Integer wareTypeId;
+    private Integer wareStatus;
+    private Integer payStatus;
+    private BigDecimal minDeposit;
+    private BigDecimal maxDeposit;
+    private BigDecimal minRent;
+    private BigDecimal maxRent;
+    private Integer totalStock;
+    private Integer totalSale;
+    private Integer skuNum;
+    private String tags;
+    private Integer deleted;
+    private Date createTime;
+    private Date updateTime;
+    private Integer pid;
 
-  /** 辅助字段-start */
-  private List<WareImgDO> wareImgs;
-  // private List<WareVideoDO> wareVideos;
-  private WarePropDO warePropDO;
-  private String wareDetailContent;
-  // private WareDetailDO wareDetailDO;
-  // private List<SkuInfoDO> skuInfoDOList;
+    /**
+     * 辅助字段-start
+     */
+    private List<WareImgDO> wareImgs;
+    // private List<WareVideoDO> wareVideos;
+    private WarePropDO warePropDO;
+    private String wareDetailContent;
+    // private WareDetailDO wareDetailDO;
+    // private List<SkuInfoDO> skuInfoDOList;
 
-  /** 辅助字段-end */
-  public WareInfoDTO buildWareInfoDTO() {
-    return WareInfoDTO.builder()
-        .id(this.id)
-        .wareNo(this.wareNo)
-        .wareTitle(this.wareTitle)
-        .wareTypeId(this.wareTypeId)
-        .wareStatus(this.wareStatus)
-        .payStatus(this.payStatus)
-        .minDeposit(this.minDeposit)
-        .maxDeposit(this.maxDeposit)
-        .minRent(this.minRent)
-        .maxRent(this.maxRent)
-        .totalStock(this.totalStock)
-        .totalSale(this.totalSale)
-        .skuNum(this.skuNum)
-        .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
-        .wareImgs(
-            CollectionUtils.isEmpty(this.wareImgs)
-                ? null
-                : this.wareImgs.stream()
-                    .map(
-                        d -> {
-                          return d.buildWareImgDTO();
-                        })
-                    .collect(Collectors.toList()))
-        .warePropDTO(this.warePropDO == null ? null : warePropDO.buildWarePropDTO())
-        .wareDetailContent(this.wareDetailContent)
-        .build();
-  }
+    /**
+     * 辅助字段-end
+     */
+    public WareInfoDTO buildWareInfoDTO() {
+        return WareInfoDTO.builder()
+                .id(this.id)
+                .wareNo(this.wareNo)
+                .wareTitle(this.wareTitle)
+                .wareTypeId(this.wareTypeId)
+                .wareStatus(this.wareStatus)
+                .payStatus(this.payStatus)
+                .minDeposit(this.minDeposit)
+                .maxDeposit(this.maxDeposit)
+                .minRent(this.minRent)
+                .maxRent(this.maxRent)
+                .totalStock(this.totalStock)
+                .totalSale(this.totalSale)
+                .skuNum(this.skuNum)
+                .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
+                .wareImgs(
+                        CollectionUtils.isEmpty(this.wareImgs)
+                                ? null
+                                : this.wareImgs.stream()
+                                .map(
+                                        d -> {
+                                            return d.buildWareImgDTO();
+                                        })
+                                .collect(Collectors.toList()))
+                .warePropDTO(this.warePropDO == null ? null : warePropDO.buildWarePropDTO())
+                .wareDetailContent(this.wareDetailContent)
+                .build();
+    }
 
-  public WareInfoItemDTO buildWareInfoItemDTO() {
-    return WareInfoItemDTO.builder()
-        .id(this.id)
-        .wareNo(this.wareNo)
-        .wareTitle(this.wareTitle)
-        .wareTypeId(this.wareTypeId)
-        .wareStatus(this.wareStatus)
-        .minDeposit(this.minDeposit)
-        .minRent(this.minRent)
-        .totalStock(this.totalStock)
-        .totalSale(this.totalSale)
-        .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
-        .wareImgs(
-            CollectionUtils.isEmpty(this.wareImgs)
-                ? null
-                : this.wareImgs.stream()
-                    .map(
-                        d -> {
-                          return d.buildWareImgDTO();
-                        })
-                    .collect(Collectors.toList()))
-        .propInfoId(this.warePropDO.getPropInfoId())
-        .createTime(this.createTime)
-        .build();
-  }
+    public WareInfoItemDTO buildWareInfoItemDTO() {
+        return WareInfoItemDTO.builder()
+                .id(this.id)
+                .wareNo(this.wareNo)
+                .wareTitle(this.wareTitle)
+                .wareTypeId(this.wareTypeId)
+                .wareStatus(this.wareStatus)
+                .minDeposit(this.minDeposit)
+                .minRent(this.minRent)
+                .totalStock(this.totalStock)
+                .totalSale(this.totalSale)
+                .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
+                .wareImgs(
+                        CollectionUtils.isEmpty(this.wareImgs)
+                                ? null
+                                : this.wareImgs.stream()
+                                .map(
+                                        d -> {
+                                            return d.buildWareImgDTO();
+                                        })
+                                .collect(Collectors.toList()))
+                .propInfoId(this.warePropDO.getPropInfoId())
+                .createTime(this.createTime)
+                .build();
+    }
 
-  public AppletWareInfoDTO buildAppletWareInfoDTO() {
-    return AppletWareInfoDTO.builder()
-        .id(this.id)
-        .wareNo(this.wareNo)
-        .wareTitle(this.wareTitle)
-        .wareTypeId(this.wareTypeId)
-        .wareStatus(this.wareStatus)
-        .payStatus(this.payStatus)
-        .minDeposit(this.minDeposit)
-        .minRent(this.minRent)
-        .totalStock(this.totalStock)
-        .totalSale(this.totalSale)
-        .skuNum(this.skuNum)
-        .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
-        .wareImgs(
-            CollectionUtils.isEmpty(this.wareImgs)
-                ? null
-                : this.wareImgs.stream()
-                    .map(
-                        d -> {
-                          return d.buildWareImgDTO();
-                        })
-                    .collect(Collectors.toList()))
-        .build();
-  }
+    public AppletWareInfoDTO buildAppletWareInfoDTO() {
+        return AppletWareInfoDTO.builder()
+                .id(this.id)
+                .wareNo(this.wareNo)
+                .wareTitle(this.wareTitle)
+                .wareTypeId(this.wareTypeId)
+                .wareStatus(this.wareStatus)
+                .payStatus(this.payStatus)
+                .minDeposit(this.minDeposit)
+                .minRent(this.minRent)
+                .totalStock(this.totalStock)
+                .totalSale(this.totalSale)
+                .skuNum(this.skuNum)
+                .tags(StringUtils.isEmpty(this.tags) ? null : Arrays.asList(this.tags.split(",")))
+                .wareImgs(
+                        CollectionUtils.isEmpty(this.wareImgs)
+                                ? null
+                                : this.wareImgs.stream()
+                                .map(
+                                        d -> {
+                                            return d.buildWareImgDTO();
+                                        })
+                                .collect(Collectors.toList()))
+                .build();
+    }
 }

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 {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+@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 {
-  @ApiModelProperty(value = "id")
-  private Integer id;
-
-  @ApiModelProperty(value = "问题")
-  private String question;
-
-  @ApiModelProperty(value = "回答")
-  private String answer;
+@AllArgsConstructor
+@Builder
+public class RelevanceGoodsInfoVO implements Serializable {
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @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;
@@ -18,50 +18,50 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class AppletWareInfoDTO implements Serializable {
-  private static final long serialVersionUID = -8861604532607064616L;
+    private static final long serialVersionUID = -8861604532607064616L;
 
-  @ApiModelProperty(value = "ID")
-  private Integer id;
+    @ApiModelProperty(value = "ID")
+    private Integer id;
 
-  @ApiModelProperty(value = "商品编号")
-  private String wareNo;
+    @ApiModelProperty(value = "商品编号")
+    private String wareNo;
 
-  @ApiModelProperty(value = "商品名称")
-  private String wareName;
+    @ApiModelProperty(value = "商品名称")
+    private String wareName;
 
-  @ApiModelProperty(value = "商品标题")
-  private String wareTitle;
+    @ApiModelProperty(value = "商品标题")
+    private String wareTitle;
 
-  @ApiModelProperty(value = "商品类型ID")
-  private Integer wareTypeId;
+    @ApiModelProperty(value = "商品类型ID")
+    private Integer wareTypeId;
 
-  @ApiModelProperty(value = "商品状态")
-  private Integer wareStatus;
+    @ApiModelProperty(value = "商品状态")
+    private Integer wareStatus;
 
-  @ApiModelProperty(value = "减库方式")
-  private Integer payStatus;
+    @ApiModelProperty(value = "减库方式")
+    private Integer payStatus;
 
-  @ApiModelProperty(value = "最小押金")
-  private BigDecimal minDeposit;
+    @ApiModelProperty(value = "最小押金")
+    private BigDecimal minDeposit;
 
-  @ApiModelProperty(value = "最小租金")
-  private BigDecimal minRent;
+    @ApiModelProperty(value = "最小租金")
+    private BigDecimal minRent;
 
-  @ApiModelProperty(value = "总库存数量")
-  private Integer totalStock;
+    @ApiModelProperty(value = "总库存数量")
+    private Integer totalStock;
 
-  @ApiModelProperty(value = "总销量")
-  private Integer totalSale;
+    @ApiModelProperty(value = "总销量")
+    private Integer totalSale;
 
-  @ApiModelProperty(value = "sku数量")
-  private Integer skuNum;
+    @ApiModelProperty(value = "sku数量")
+    private Integer skuNum;
 
-  @ApiModelProperty(value = "标签集合")
-  private List<String> tags;
+    @ApiModelProperty(value = "标签集合")
+    private List<String> tags;
 
-  @ApiModelProperty(value = "商品图片集合")
-  private List<WareImgDTO> wareImgs;
+    @ApiModelProperty(value = "商品图片集合")
+    private List<WareImgDTO> wareImgs;
 
-  @ApiModelProperty(value = "商品视频集合")
-  private List<WareVideoDTO> wareVideos;
+    @ApiModelProperty(value = "商品视频集合")
+    private List<WareVideoDTO> wareVideos;
 }

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;
@@ -14,9 +14,9 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class BrandDTO {
-  @ApiModelProperty("1")
-  private Integer id;
+    @ApiModelProperty("1")
+    private Integer id;
 
-  @ApiModelProperty("品牌名称")
-  private String name;
+    @ApiModelProperty("品牌名称")
+    private String name;
 }

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;
@@ -14,9 +14,9 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DeviceCategoryDTO {
-  @ApiModelProperty(name = "id", value = "类目id", example = "1")
-  private Integer id;
+    @ApiModelProperty(name = "id", value = "类目id", example = "1")
+    private Integer id;
 
-  @ApiModelProperty(name = "id", value = "类目名称", example = "无人机")
-  private String name;
+    @ApiModelProperty(name = "id", value = "类目名称", example = "无人机")
+    private String name;
 }

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;
@@ -14,36 +14,36 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DeviceListDTO {
-  @ApiModelProperty(value = "设备id")
-  private Integer id;
+    @ApiModelProperty(value = "设备id")
+    private Integer id;
 
-  @ApiModelProperty(value = "设备名称")
-  private String deviceName;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
 
-  @ApiModelProperty(value = "设备图片地址")
-  private String imageUrl;
+    @ApiModelProperty(value = "设备图片地址")
+    private String imageUrl;
 
-  @ApiModelProperty(value = "价格")
-  private String price;
+    @ApiModelProperty(value = "价格")
+    private String price;
 
-  @ApiModelProperty(value = "品牌名称")
-  private String brandName;
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
 
-  @ApiModelProperty(value = "地域名称")
-  private String sysDistrictName;
+    @ApiModelProperty(value = "地域名称")
+    private String sysDistrictName;
 
-  @ApiModelProperty(value = "型号名称")
-  private String modelName;
+    @ApiModelProperty(value = "型号名称")
+    private String modelName;
 
-  @ApiModelProperty(value = "类目名称")
-  private String deviceCategoryName;
+    @ApiModelProperty(value = "类目名称")
+    private String deviceCategoryName;
 
-  @ApiModelProperty(value = "剩余库存数量")
-  private Integer residueCount;
+    @ApiModelProperty(value = "剩余库存数量")
+    private Integer residueCount;
 
-  @ApiModelProperty(value = "库存id")
-  private Integer inventoryId;
+    @ApiModelProperty(value = "库存id")
+    private Integer inventoryId;
 
-  @ApiModelProperty(value = "评价")
-  private String appraise;
+    @ApiModelProperty(value = "评价")
+    private String appraise;
 }

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,23 +13,23 @@ 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;
+    private static final long serialVersionUID = -8917940296555539559L;
 
-  @ApiModelProperty(value = "设备id")
-  private Integer id;
+    @ApiModelProperty(value = "设备id")
+    private Integer id;
 
-  @ApiModelProperty(value = "租期天数开始")
-  private Integer startDay;
+    @ApiModelProperty(value = "租期天数开始")
+    private Integer startDay;
 
-  @ApiModelProperty(value = "租期天数结束")
-  private Integer endDay;
+    @ApiModelProperty(value = "租期天数结束")
+    private Integer endDay;
 
-  @ApiModelProperty(value = "库存使用")
-  @NotBlank
-  private Integer inventoryUsage;
+    @ApiModelProperty(value = "库存使用")
+    @NotBlank
+    private Integer inventoryUsage;
 
-  @ApiModelProperty(value = "库存id")
-  private Integer inventoryId;
+    @ApiModelProperty(value = "库存id")
+    private Integer inventoryId;
 }

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;
@@ -16,14 +16,14 @@ import java.io.Serializable;
 @NoArgsConstructor
 @ApiModel(value = "com.mmc.csf.model.vo.WareImgVO", description = "新增/修改参数类")
 public class WareImgVO implements Serializable {
-  private static final long serialVersionUID = 7742617679026160607L;
+    private static final long serialVersionUID = 7742617679026160607L;
 
-  @ApiModelProperty(value = "图片id")
-  private Integer id;
+    @ApiModelProperty(value = "图片id")
+    private Integer id;
 
-  @ApiModelProperty(value = "商品图片地址")
-  private String imgUrl;
+    @ApiModelProperty(value = "商品图片地址")
+    private String imgUrl;
 
-  @ApiModelProperty(value = "商品图片类型")
-  private Integer imgType;
+    @ApiModelProperty(value = "商品图片类型")
+    private Integer imgType;
 }

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;
@@ -22,105 +24,105 @@ import java.util.List;
 @NoArgsConstructor
 @ApiModel(value = "com.mmc.csf.model.vo.WareInfoVO", description = "新增/修改参数类")
 public class WareInfoVO implements Serializable {
-  private static final long serialVersionUID = -4503117649945902464L;
-
-  @ApiModelProperty(value = "id")
-  @NotNull(
-      message = "更新时ID不能为空",
-      groups = {Update.class})
-  private Integer id;
-
-  @ApiModelProperty(value = "商品名称")
-  @NotEmpty(
-      message = "商品名称不能为空",
-      groups = {Create.class})
-  @Size(
-      max = 60,
-      message = "商品名称不能超过60个字符",
-      groups = {Create.class, Update.class})
-  private String wareTitle;
-
-  @ApiModelProperty(value = "商品类型id")
-  @NotNull(
-      message = "商品类型ID不能为空",
-      groups = {Create.class})
-  private Integer wareTypeId;
-
-  @ApiModelProperty(value = "商品活动id")
-  private Integer propInfoId;
-
-  @ApiModelProperty(value = "商品活动海报url")
-  private String propPoster;
-
-  @ApiModelProperty(value = "商品状态")
-  @NotNull(
-      message = "商品状态不能为空",
-      groups = {Create.class})
-  private Integer wareStatus;
-
-  @ApiModelProperty(value = "支付信息（减库方式）")
-  @NotNull(
-      message = "支付信息（减库方式）不能为空",
-      groups = {Create.class})
-  private Integer payStatus;
-
-  @ApiModelProperty(value = "一口押金-最小押金")
-  @NotNull(
-      message = "最小押金不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      groups = {Create.class, Update.class})
-  private BigDecimal minDeposit;
-
-  @ApiModelProperty(value = "一口价-最小日租金")
-  @NotNull(
-      message = "最小租金不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      groups = {Create.class, Update.class})
-  private BigDecimal minRent;
-
-  @ApiModelProperty(value = "商品标签")
-  private String tags;
-
-  @ApiModelProperty(value = "商品总量")
-  @Min(
-      value = 0,
-      groups = {Create.class})
-  private Integer totalStock;
-
-  @ApiModelProperty(value = "商品详情")
-  @NotEmpty(
-      message = "商品详情不能为空",
-      groups = {Create.class})
-  private String wareDetailContent;
-
-  @ApiModelProperty(value = "sku总数量")
-  @Min(
-      value = 0,
-      groups = {Create.class, Update.class})
-  private Integer skuNum;
-
-  @ApiModelProperty(value = "商品图片")
-  @NotEmpty(
-      message = "商品图片不能为空",
-      groups = {Create.class})
-  private List<WareImgVO> imgList;
-
-  @ApiModelProperty(value = "新加的商品sku")
-  @NotEmpty(
-      message = "商品sku不能为空",
-      groups = {Create.class})
-  private List<WareSkuInfoVO> wareSkuInfoList;
-
-  @ApiModelProperty(value = "更新的商品sku")
-  private List<WareSkuInfoVO> updateSkuList;
-
-  @ApiModelProperty(value = "需要删除的sku的id列表")
-  private List<Integer> deleteSkuIds;
-
-  @ApiModelProperty(value = "需要删除的照片id列表")
-  private List<Integer> deleteImgIds;
+    private static final long serialVersionUID = -4503117649945902464L;
+
+    @ApiModelProperty(value = "id")
+    @NotNull(
+            message = "更新时ID不能为空",
+            groups = {Update.class})
+    private Integer id;
+
+    @ApiModelProperty(value = "商品名称")
+    @NotEmpty(
+            message = "商品名称不能为空",
+            groups = {Create.class})
+    @Size(
+            max = 60,
+            message = "商品名称不能超过60个字符",
+            groups = {Create.class, Update.class})
+    private String wareTitle;
+
+    @ApiModelProperty(value = "商品类型id")
+    @NotNull(
+            message = "商品类型ID不能为空",
+            groups = {Create.class})
+    private Integer wareTypeId;
+
+    @ApiModelProperty(value = "商品活动id")
+    private Integer propInfoId;
+
+    @ApiModelProperty(value = "商品活动海报url")
+    private String propPoster;
+
+    @ApiModelProperty(value = "商品状态")
+    @NotNull(
+            message = "商品状态不能为空",
+            groups = {Create.class})
+    private Integer wareStatus;
+
+    @ApiModelProperty(value = "支付信息（减库方式）")
+    @NotNull(
+            message = "支付信息（减库方式）不能为空",
+            groups = {Create.class})
+    private Integer payStatus;
+
+    @ApiModelProperty(value = "一口押金-最小押金")
+    @NotNull(
+            message = "最小押金不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            groups = {Create.class, Update.class})
+    private BigDecimal minDeposit;
+
+    @ApiModelProperty(value = "一口价-最小日租金")
+    @NotNull(
+            message = "最小租金不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            groups = {Create.class, Update.class})
+    private BigDecimal minRent;
+
+    @ApiModelProperty(value = "商品标签")
+    private String tags;
+
+    @ApiModelProperty(value = "商品总量")
+    @Min(
+            value = 0,
+            groups = {Create.class})
+    private Integer totalStock;
+
+    @ApiModelProperty(value = "商品详情")
+    @NotEmpty(
+            message = "商品详情不能为空",
+            groups = {Create.class})
+    private String wareDetailContent;
+
+    @ApiModelProperty(value = "sku总数量")
+    @Min(
+            value = 0,
+            groups = {Create.class, Update.class})
+    private Integer skuNum;
+
+    @ApiModelProperty(value = "商品图片")
+    @NotEmpty(
+            message = "商品图片不能为空",
+            groups = {Create.class})
+    private List<WareImgVO> imgList;
+
+    @ApiModelProperty(value = "新加的商品sku")
+    @NotEmpty(
+            message = "商品sku不能为空",
+            groups = {Create.class})
+    private List<WareSkuInfoVO> wareSkuInfoList;
+
+    @ApiModelProperty(value = "更新的商品sku")
+    private List<WareSkuInfoVO> updateSkuList;
+
+    @ApiModelProperty(value = "需要删除的sku的id列表")
+    private List<Integer> deleteSkuIds;
+
+    @ApiModelProperty(value = "需要删除的照片id列表")
+    private List<Integer> deleteImgIds;
 }

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;
@@ -22,47 +24,47 @@ import java.util.List;
 @NoArgsConstructor
 @ApiModel(value = "com.mmc.csf.model.vo.WareSkuInfoVO", description = "新增/修改参数类")
 public class WareSkuInfoVO implements Serializable {
-  private static final long serialVersionUID = 7401232386069965527L;
+    private static final long serialVersionUID = 7401232386069965527L;
 
-  @ApiModelProperty(value = "sku的id")
-  @NotNull(
-      message = "sku的id不能为空",
-      groups = {Update.class})
-  private Integer id;
+    @ApiModelProperty(value = "sku的id")
+    @NotNull(
+            message = "sku的id不能为空",
+            groups = {Update.class})
+    private Integer id;
 
-  @ApiModelProperty(value = "商品skuTitle名称")
-  @NotEmpty(
-      message = "商品skuTitle名称不能为空",
-      groups = {Create.class})
-  private String skuTitle;
+    @ApiModelProperty(value = "商品skuTitle名称")
+    @NotEmpty(
+            message = "商品skuTitle名称不能为空",
+            groups = {Create.class})
+    private String skuTitle;
 
-  @ApiModelProperty(value = "出租押金")
-  @NotNull(
-      message = "出租押金不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      message = "出租押金不能小于0",
-      groups = {Create.class, Update.class})
-  @Max(
-      value = 100000000,
-      message = "出租押金不能大于100000000",
-      groups = {Create.class, Update.class})
-  private BigDecimal rentDeposit;
+    @ApiModelProperty(value = "出租押金")
+    @NotNull(
+            message = "出租押金不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            message = "出租押金不能小于0",
+            groups = {Create.class, Update.class})
+    @Max(
+            value = 100000000,
+            message = "出租押金不能大于100000000",
+            groups = {Create.class, Update.class})
+    private BigDecimal rentDeposit;
 
-  @ApiModelProperty(value = "sku库存数量")
-  @NotNull(
-      message = "sku库存数量不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      message = "sku库存数量不能小于0",
-      groups = {Create.class, Update.class})
-  private Integer stockNum;
+    @ApiModelProperty(value = "sku库存数量")
+    @NotNull(
+            message = "sku库存数量不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            message = "sku库存数量不能小于0",
+            groups = {Create.class, Update.class})
+    private Integer stockNum;
 
-  @ApiModelProperty(value = "sku对应价格列表")
-  @NotEmpty(
-      message = "sku对应价格列表不能为空",
-      groups = {Create.class})
-  List<WareSkuPriceVO> wareSkuPriceVOList;
+    @ApiModelProperty(value = "sku对应价格列表")
+    @NotEmpty(
+            message = "sku对应价格列表不能为空",
+            groups = {Create.class})
+    List<WareSkuPriceVO> wareSkuPriceVOList;
 }

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;
@@ -20,45 +22,45 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @ApiModel(value = "com.mmc.csf.model.vo.WareSkuInfoVO", description = "新增/修改参数类")
 public class WareSkuPriceVO implements Serializable {
-  private static final long serialVersionUID = -3033801564005806565L;
+    private static final long serialVersionUID = -3033801564005806565L;
 
-  @ApiModelProperty(value = "sku对应的id")
-  @NotNull(
-      message = "sku对应的id不能为空",
-      groups = {Update.class})
-  private Integer id;
+    @ApiModelProperty(value = "sku对应的id")
+    @NotNull(
+            message = "sku对应的id不能为空",
+            groups = {Update.class})
+    private Integer id;
 
-  @ApiModelProperty(value = "出租价格")
-  @NotNull(
-      message = "出租价格不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      message = "出租价格不能小于0",
-      groups = {Create.class, Update.class})
-  @Max(
-      value = 100000000,
-      message = "出租价格不能大于100000000",
-      groups = {Create.class, Update.class})
-  private BigDecimal rentPrice;
+    @ApiModelProperty(value = "出租价格")
+    @NotNull(
+            message = "出租价格不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            message = "出租价格不能小于0",
+            groups = {Create.class, Update.class})
+    @Max(
+            value = 100000000,
+            message = "出租价格不能大于100000000",
+            groups = {Create.class, Update.class})
+    private BigDecimal rentPrice;
 
-  @ApiModelProperty(value = "起租天数")
-  @NotNull(
-      message = "起租天数不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      message = "起租天数不能小于0",
-      groups = {Create.class, Update.class})
-  private Integer minDay;
+    @ApiModelProperty(value = "起租天数")
+    @NotNull(
+            message = "起租天数不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            message = "起租天数不能小于0",
+            groups = {Create.class, Update.class})
+    private Integer minDay;
 
-  @ApiModelProperty(value = "最大天数")
-  @NotNull(
-      message = "最大天数不能为空",
-      groups = {Create.class})
-  @Min(
-      value = 0,
-      message = "最大天数不能小于0",
-      groups = {Create.class, Update.class})
-  private Integer maxDay;
+    @ApiModelProperty(value = "最大天数")
+    @NotNull(
+            message = "最大天数不能为空",
+            groups = {Create.class})
+    @Min(
+            value = 0,
+            message = "最大天数不能小于0",
+            groups = {Create.class, Update.class})
+    private Integer maxDay;
 }

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;

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import com.mmc.pms.entity.RepoCashDO;
+import com.mmc.pms.model.other.dto.KdnExpDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -21,127 +22,127 @@ import java.util.List;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.model.dto.OrderInfoDTO", description = "云仓订单DTO")
 public class OrderInfoDTO implements Serializable {
-  private static final long serialVersionUID = 1572467108563651846L;
+    private static final long serialVersionUID = 1572467108563651846L;
 
-  @ApiModelProperty(value = "ID")
-  private Integer id;
+    @ApiModelProperty(value = "ID")
+    private Integer id;
 
-  @ApiModelProperty(value = "订单编号")
-  private String orderNo;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
 
-  @ApiModelProperty(value = "商品ID")
-  private Integer wareInfoId;
+    @ApiModelProperty(value = "商品ID")
+    private Integer wareInfoId;
 
-  @ApiModelProperty(value = "商品编号")
-  private String wareNo;
+    @ApiModelProperty(value = "商品编号")
+    private String wareNo;
 
-  @ApiModelProperty(value = "商品标题")
-  private String wareTitle;
+    @ApiModelProperty(value = "商品标题")
+    private String wareTitle;
 
-  @ApiModelProperty(value = "商品图片")
-  private String wareImg;
+    @ApiModelProperty(value = "商品图片")
+    private String wareImg;
 
-  @ApiModelProperty(value = "套餐（sku）ID")
-  private Integer skuInfoId;
+    @ApiModelProperty(value = "套餐（sku）ID")
+    private Integer skuInfoId;
 
-  @ApiModelProperty(value = "套餐（sku）名称")
-  private String skuTitle;
+    @ApiModelProperty(value = "套餐（sku）名称")
+    private String skuTitle;
 
-  @ApiModelProperty(value = "购买用户ID")
-  private Integer repoAccountId;
+    @ApiModelProperty(value = "购买用户ID")
+    private Integer repoAccountId;
 
-  @ApiModelProperty(value = "用户UID")
-  private String uid;
+    @ApiModelProperty(value = "用户UID")
+    private String uid;
 
-  @ApiModelProperty(value = "买家name")
-  private String buyerName;
+    @ApiModelProperty(value = "买家name")
+    private String buyerName;
 
-  @ApiModelProperty(value = "买家电话")
-  private String buyerPhone;
+    @ApiModelProperty(value = "买家电话")
+    private String buyerPhone;
 
-  @ApiModelProperty(value = "单价")
-  private BigDecimal unitPrice;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal unitPrice;
 
-  @ApiModelProperty(value = "购买的商品数量")
-  private Integer wareNum;
+    @ApiModelProperty(value = "购买的商品数量")
+    private Integer wareNum;
 
-  @ApiModelProperty(value = "应付款金额")
-  private BigDecimal shouldPay;
+    @ApiModelProperty(value = "应付款金额")
+    private BigDecimal shouldPay;
 
-  @ApiModelProperty(value = "实收款金额")
-  private BigDecimal actualPay;
+    @ApiModelProperty(value = "实收款金额")
+    private BigDecimal actualPay;
 
-  @ApiModelProperty(value = "订单类型：0租赁 100购买")
-  private Integer orderType;
+    @ApiModelProperty(value = "订单类型：0租赁 100购买")
+    private Integer orderType;
 
-  @ApiModelProperty(value = "押金")
-  private BigDecimal deposit;
+    @ApiModelProperty(value = "押金")
+    private BigDecimal deposit;
 
-  @ApiModelProperty(value = "租金总金额")
-  private BigDecimal rentPrice;
+    @ApiModelProperty(value = "租金总金额")
+    private BigDecimal rentPrice;
 
-  @ApiModelProperty(value = "租约开始日")
-  private Date startDate;
+    @ApiModelProperty(value = "租约开始日")
+    private Date startDate;
 
-  @ApiModelProperty(value = "租约结束日")
-  private Date endDate;
+    @ApiModelProperty(value = "租约结束日")
+    private Date endDate;
 
-  @ApiModelProperty(value = "付款天数")
-  private Integer payDay;
+    @ApiModelProperty(value = "付款天数")
+    private Integer payDay;
 
-  @ApiModelProperty(value = "交易状态：查订单状态字典")
-  private String tranStatus;
+    @ApiModelProperty(value = "交易状态：查订单状态字典")
+    private String tranStatus;
 
-  @ApiModelProperty(value = "减库方式 0:买家拍下减库存 1:卖家付款减库存")
-  private Integer exWare;
+    @ApiModelProperty(value = "减库方式 0:买家拍下减库存 1:卖家付款减库存")
+    private Integer exWare;
 
-  @ApiModelProperty(value = "用户备注")
-  private String remark;
+    @ApiModelProperty(value = "用户备注")
+    private String remark;
 
-  @ApiModelProperty(value = "平台人员备注")
-  private String pfRemark;
+    @ApiModelProperty(value = "平台人员备注")
+    private String pfRemark;
 
-  @ApiModelProperty(value = "关闭原因")
-  private String shutReason;
+    @ApiModelProperty(value = "关闭原因")
+    private String shutReason;
 
-  @ApiModelProperty(value = "交易编号")
-  private String payNo;
+    @ApiModelProperty(value = "交易编号")
+    private String payNo;
 
-  @ApiModelProperty(value = "支付时间")
-  private Date payTime;
+    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
 
-  @ApiModelProperty(value = "发货时间")
-  private Date sendWareTime;
+    @ApiModelProperty(value = "发货时间")
+    private Date sendWareTime;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "物流信息/收货地址信息")
-  private OrderReceiptDTO receipt;
+    @ApiModelProperty(value = "物流信息/收货地址信息")
+    private OrderReceiptDTO receipt;
 
-  @ApiModelProperty(value = "退款单详情信息,无则为null")
-  private OrderRefundDTO orderRefund;
+    @ApiModelProperty(value = "退款单详情信息,无则为null")
+    private OrderRefundDTO orderRefund;
 
-  @ApiModelProperty(value = "发货-物流动态,无则为null")
-  private KdnExpDTO express;
+    @ApiModelProperty(value = "发货-物流动态,无则为null")
+    private KdnExpDTO express;
 
-  @ApiModelProperty(value = "退货-物流动态,无则为null")
-  private KdnExpDTO refundExpress;
+    @ApiModelProperty(value = "退货-物流动态,无则为null")
+    private KdnExpDTO refundExpress;
 
-  @ApiModelProperty(value = "质检详情,无则为null")
-  private List<OrderVcuDTO> vcus;
+    @ApiModelProperty(value = "质检详情,无则为null")
+    private List<OrderVcuDTO> vcus;
 
-  public RepoCashDO buildRepoCashDO() {
-    return RepoCashDO.builder()
-        .uid(this.uid)
-        .accountName(this.buyerName)
-        .orderInfoId(this.id)
-        .orderNo(this.orderNo)
-        .skuInfoId(this.skuInfoId)
-        .skuTitle(this.skuTitle)
-        .wareInfoId(this.wareInfoId)
-        .wareTitle(this.wareTitle)
-        .wareNo(this.wareNo)
-        .build();
-  }
+    public RepoCashDO buildRepoCashDO() {
+        return RepoCashDO.builder()
+                .uid(this.uid)
+                .accountName(this.buyerName)
+                .orderInfoId(this.id)
+                .orderNo(this.orderNo)
+                .skuInfoId(this.skuInfoId)
+                .skuTitle(this.skuTitle)
+                .wareInfoId(this.wareInfoId)
+                .wareTitle(this.wareTitle)
+                .wareNo(this.wareNo)
+                .build();
+    }
 }

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,68 +17,68 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.model.dto.OrderReceiptDTO", description = "订单收货信息DTO")
 public class OrderReceiptDTO implements Serializable {
-  private static final long serialVersionUID = -6212026509857770276L;
+    private static final long serialVersionUID = -6212026509857770276L;
 
-  @ApiModelProperty(value = "地址ID")
-  private Integer id;
+    @ApiModelProperty(value = "地址ID")
+    private Integer id;
 
-  @ApiModelProperty(value = "收货方式：0邮寄 1门店地址")
-  private Integer receiptMethod;
+    @ApiModelProperty(value = "收货方式：0邮寄 1门店地址")
+    private Integer receiptMethod;
 
-  @ApiModelProperty(value = "0-收货人姓名")
-  private String takeName;
+    @ApiModelProperty(value = "0-收货人姓名")
+    private String takeName;
 
-  @ApiModelProperty(value = "0-收货人电话")
-  private String takePhone;
+    @ApiModelProperty(value = "0-收货人电话")
+    private String takePhone;
 
-  @ApiModelProperty(value = "0-收货区域")
-  private String region;
+    @ApiModelProperty(value = "0-收货区域")
+    private String region;
 
-  @ApiModelProperty(value = "0-收获详细地址")
-  private String detailAddress;
+    @ApiModelProperty(value = "0-收获详细地址")
+    private String detailAddress;
 
-  @ApiModelProperty(value = "1-门店名称")
-  private String repoName;
+    @ApiModelProperty(value = "1-门店名称")
+    private String repoName;
 
-  @ApiModelProperty(value = "1-门店详细地址")
-  private String repoAddress;
+    @ApiModelProperty(value = "1-门店详细地址")
+    private String repoAddress;
 
-  @ApiModelProperty(value = "1-预留手机号")
-  private String bookPhone;
+    @ApiModelProperty(value = "1-预留手机号")
+    private String bookPhone;
 
-  @ApiModelProperty(value = "发货-物流公司码")
-  private String sendExCode;
+    @ApiModelProperty(value = "发货-物流公司码")
+    private String sendExCode;
 
-  @ApiModelProperty(value = "发货-物流单号")
-  private String sendExNo;
+    @ApiModelProperty(value = "发货-物流单号")
+    private String sendExNo;
 
-  @ApiModelProperty(value = "发货地址")
-  private String sendAddress;
+    @ApiModelProperty(value = "发货地址")
+    private String sendAddress;
 
-  @ApiModelProperty(value = "退还货方式：0邮寄 1门店地址")
-  private Integer renMethod;
+    @ApiModelProperty(value = "退还货方式：0邮寄 1门店地址")
+    private Integer renMethod;
 
-  @ApiModelProperty(value = "退还货-收货电话")
-  private String renPhone;
+    @ApiModelProperty(value = "退还货-收货电话")
+    private String renPhone;
 
-  @ApiModelProperty(value = "退还货-收货人")
-  private String renName;
+    @ApiModelProperty(value = "退还货-收货人")
+    private String renName;
 
-  @ApiModelProperty(value = "退还货-物流公司码")
-  private String renExCode;
+    @ApiModelProperty(value = "退还货-物流公司码")
+    private String renExCode;
 
-  @ApiModelProperty(value = "退还货-物流单号")
-  private String renExNo;
+    @ApiModelProperty(value = "退还货-物流单号")
+    private String renExNo;
 
-  @ApiModelProperty(value = "退还货-地址")
-  private String renAddress;
+    @ApiModelProperty(value = "退还货-地址")
+    private String renAddress;
 
-  @ApiModelProperty(value = "退还货-门店名称")
-  private String renRepoName;
+    @ApiModelProperty(value = "退还货-门店名称")
+    private String renRepoName;
 
-  @ApiModelProperty(value = "退还货-门店地址")
-  private String renRepoAddr;
+    @ApiModelProperty(value = "退还货-门店地址")
+    private String renRepoAddr;
 
-  @ApiModelProperty(value = "退还货-门店联系电话")
-  private String renRepoPhone;
+    @ApiModelProperty(value = "退还货-门店联系电话")
+    private String renRepoPhone;
 }

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
+import com.mmc.pms.model.other.dto.RefundLogDTO;
+import com.mmc.pms.model.other.dto.RepoCashDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,44 +22,44 @@ import java.util.List;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.model.dto.OrderRefundDTO", description = "退款单DTO")
 public class OrderRefundDTO implements Serializable {
-  private static final long serialVersionUID = -6124933008580173589L;
+    private static final long serialVersionUID = -6124933008580173589L;
 
-  @ApiModelProperty(value = "退款单ID")
-  private Integer id;
+    @ApiModelProperty(value = "退款单ID")
+    private Integer id;
 
-  @ApiModelProperty(value = "订单ID")
-  private Integer orderInfoId;
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderInfoId;
 
-  @ApiModelProperty(value = "退款单号")
-  private String refundNo;
+    @ApiModelProperty(value = "退款单号")
+    private String refundNo;
 
-  @ApiModelProperty(value = "退款单状态：查字典")
-  private Integer refundStatus;
+    @ApiModelProperty(value = "退款单状态：查字典")
+    private Integer refundStatus;
 
-  @ApiModelProperty(value = "应退款金额")
-  private BigDecimal shouldRefund;
+    @ApiModelProperty(value = "应退款金额")
+    private BigDecimal shouldRefund;
 
-  @ApiModelProperty(value = "实际退款金额")
-  private BigDecimal actualRefund;
+    @ApiModelProperty(value = "实际退款金额")
+    private BigDecimal actualRefund;
 
-  @ApiModelProperty(value = "退款理由")
-  private String reason;
+    @ApiModelProperty(value = "退款理由")
+    private String reason;
 
-  @ApiModelProperty(value = "创建时间/申请时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间/申请时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "退款-设备情况(图片&视频)")
-  private OrderVcuDTO orderVcu;
+    @ApiModelProperty(value = "退款-设备情况(图片&视频)")
+    private OrderVcuDTO orderVcu;
 
-  @ApiModelProperty(value = "订单信息")
-  private OrderInfoDTO orderInfo;
+    @ApiModelProperty(value = "订单信息")
+    private OrderInfoDTO orderInfo;
 
-  @ApiModelProperty(value = "退款协商历史")
-  private List<RefundLogDTO> rlogs;
+    @ApiModelProperty(value = "退款协商历史")
+    private List<RefundLogDTO> rlogs;
 
-  @ApiModelProperty(value = "退款流水信息")
-  private RepoCashDTO refundCash;
+    @ApiModelProperty(value = "退款流水信息")
+    private RepoCashDTO refundCash;
 
-  @ApiModelProperty(value = "平台备注")
-  private String pfRemark;
+    @ApiModelProperty(value = "平台备注")
+    private String pfRemark;
 }

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -19,212 +19,185 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class OrderTaskDTO implements Serializable {
-  private static final long serialVersionUID = 6732943573766573605L;
+    private static final long serialVersionUID = 6732943573766573605L;
 
-  @ApiModelProperty(value = "订单id")
-  private Integer id;
+    @ApiModelProperty(value = "订单id")
+    private Integer id;
 
-  @ApiModelProperty(value = "主任务id")
-  private Integer parentId;
+    @ApiModelProperty(value = "主任务id")
+    private Integer parentId;
 
-  @ApiModelProperty(value = "用户id")
-  private Integer userAccountId;
+    @ApiModelProperty(value = "用户id")
+    private Integer userAccountId;
 
-  @ApiModelProperty(value = "订单专属运营id")
-  private Integer userOperateId;
+    @ApiModelProperty(value = "订单专属运营id")
+    private Integer userOperateId;
 
-  @ApiModelProperty(value = "用户订单uid")
-  private String uid;
+    @ApiModelProperty(value = "用户订单uid")
+    private String uid;
 
-  @ApiModelProperty(value = "订单编号")
-  private String orderNo; // 单号
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo; // 单号
 
-  @ApiModelProperty(value = "订单名称")
-  private String orderName; // 名称
+    @ApiModelProperty(value = "订单名称")
+    private String orderName; // 名称
 
-  @ApiModelProperty(value = "账单金额")
-  private BigDecimal orderAmt; // 账单金额
+    @ApiModelProperty(value = "账单金额")
+    private BigDecimal orderAmt; // 账单金额
 
-  @ApiModelProperty(value = "订单现金金额")
-  private BigDecimal orderCashAmt;
+    @ApiModelProperty(value = "订单现金金额")
+    private BigDecimal orderCashAmt;
 
-  @ApiModelProperty(value = "订单信用金额")
-  private BigDecimal orderCreditAmt;
+    @ApiModelProperty(value = "订单信用金额")
+    private BigDecimal orderCreditAmt;
 
-  @ApiModelProperty(value = "任务状态")
-  private Integer orderStatus; // 任务状态
+    @ApiModelProperty(value = "任务状态")
+    private Integer orderStatus; // 任务状态
 
-  @ApiModelProperty(value = "评价状态")
-  private Integer evaluateStatus; // 评价状态
+    @ApiModelProperty(value = "评价状态")
+    private Integer evaluateStatus; // 评价状态
 
-  private String lastMsg1; // 消息
-  private String lastMag2;
+    private String lastMsg1; // 消息
+    private String lastMag2;
 
-  @ApiModelProperty(value = "生成时间")
-  private Date createTime;
+    @ApiModelProperty(value = "生成时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "更新时间")
-  private Date updateTime;
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
 
-  @ApiModelProperty(value = "备注")
-  private String basicInfo; // 基本信息
+    @ApiModelProperty(value = "备注")
+    private String basicInfo; // 基本信息
 
-  @ApiModelProperty(value = "预计开始时间")
-  private String startTime; // 开始时间
+    @ApiModelProperty(value = "预计开始时间")
+    private String startTime; // 开始时间
 
-  @ApiModelProperty(value = "预计结束时间")
-  private String endTime; // 结束时间
+    @ApiModelProperty(value = "预计结束时间")
+    private String endTime; // 结束时间
 
-  @ApiModelProperty(value = "实际开始时间")
-  private String acStartTime; // 实际开始时间
+    @ApiModelProperty(value = "实际开始时间")
+    private String acStartTime; // 实际开始时间
 
-  @ApiModelProperty(value = "实际结束时间")
-  private String acEndTime; // 实际结束时间
+    @ApiModelProperty(value = "实际结束时间")
+    private String acEndTime; // 实际结束时间
 
-  @ApiModelProperty(value = "订单地址")
-  private String taskAddress;
+    @ApiModelProperty(value = "订单地址")
+    private String taskAddress;
 
-  private String image;
+    private String image;
 
-  @ApiModelProperty(value = "服务id")
-  private Integer inspectionId;
+    @ApiModelProperty(value = "服务id")
+    private Integer inspectionId;
 
-  @ApiModelProperty(value = "服务名称")
-  private String inspectionName;
+    @ApiModelProperty(value = "服务名称")
+    private String inspectionName;
 
-  @ApiModelProperty(value = "运营联系电话")
-  private String phoneNum;
+    @ApiModelProperty(value = "运营联系电话")
+    private String phoneNum;
 
-  @ApiModelProperty(value = "专属运营名称")
-  private String operateName;
+    @ApiModelProperty(value = "专属运营名称")
+    private String operateName;
 
-  @ApiModelProperty(value = "经度")
-  private BigDecimal lon;
+    @ApiModelProperty(value = "经度")
+    private BigDecimal lon;
 
-  @ApiModelProperty(value = "纬度")
-  private BigDecimal lat;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal lat;
 
-  @ApiModelProperty(value = "用户名称")
-  private String userName;
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
 
-  @ApiModelProperty(value = "是否企业")
-  private Integer entUser;
+    @ApiModelProperty(value = "是否企业")
+    private Integer entUser;
 
-  @ApiModelProperty(value = "企业名称")
-  private String entName;
+    @ApiModelProperty(value = "企业名称")
+    private String entName;
 
-  @ApiModelProperty(value = "是否实名")
-  private Integer realAuthStatus;
+    @ApiModelProperty(value = "是否实名")
+    private Integer realAuthStatus;
 
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
 
-  @ApiModelProperty(value = "订单关闭原因")
-  private String shutReason;
+    @ApiModelProperty(value = "订单关闭原因")
+    private String shutReason;
 
-  @ApiModelProperty(value = "用户联系电话")
-  private String userPhoneNum;
+    @ApiModelProperty(value = "用户联系电话")
+    private String userPhoneNum;
 
-  @ApiModelProperty(value = "飞手Id")
-  private Integer flyerAccountId;
+    @ApiModelProperty(value = "飞手Id")
+    private Integer flyerAccountId;
 
-  @ApiModelProperty(value = "平台工作人员设置的备注")
-  private String pfRemark;
+    @ApiModelProperty(value = "平台工作人员设置的备注")
+    private String pfRemark;
 
-  @ApiModelProperty(value = "飞手端-推送-数据-0否-1是")
-  private Integer dummy;
+    @ApiModelProperty(value = "飞手端-推送-数据-0否-1是")
+    private Integer dummy;
 
-  @ApiModelProperty(value = "飞手UID")
-  private String flyerUid;
+    @ApiModelProperty(value = "飞手UID")
+    private String flyerUid;
 
-  @ApiModelProperty(value = "飞手账号名")
-  private String flyerAccountName;
+    @ApiModelProperty(value = "飞手账号名")
+    private String flyerAccountName;
 
-  @ApiModelProperty(value = "抢单状态：0待接单,1抢单中")
-  private Integer applyStatus;
+    @ApiModelProperty(value = "抢单状态：0待接单,1抢单中")
+    private Integer applyStatus;
 
-  @ApiModelProperty(value = "预付款总金额")
-  private BigDecimal totalFreeze;
+    @ApiModelProperty(value = "预付款总金额")
+    private BigDecimal totalFreeze;
 
-  @ApiModelProperty(value = "结算总金额")
-  private BigDecimal totalPay;
+    @ApiModelProperty(value = "结算总金额")
+    private BigDecimal totalPay;
 
-  @ApiModelProperty(value = "倒计时")
-  private Long countSconds;
+    @ApiModelProperty(value = "倒计时")
+    private Long countSconds;
 
-  @ApiModelProperty(value = "飞手基本信息")
-  private FlyerAccountDTO flyerAccount;
+    @ApiModelProperty(value = "飞手类型")
+    private Integer flyerType;
 
-  @ApiModelProperty(value = "飞手类型")
-  private Integer flyerType;
+    @ApiModelProperty(value = "飞手个数")
+    private Integer flyerNum;
 
-  @ApiModelProperty(value = "飞手个数")
-  private Integer flyerNum;
+    @ApiModelProperty(value = "0:隐藏 1:显示")
+    private Integer display;
 
-  @ApiModelProperty(value = "0:隐藏 1:显示")
-  private Integer display;
+    @ApiModelProperty(value = "下期飞手入账时间")
+    private String nextFlyerIncomeDate;
 
-  @ApiModelProperty(value = "飞手-结算-信息", hidden = true)
-  private TaskFlyerCostDTO taskFlyerCost;
+    @ApiModelProperty(value = "是否进行过催付款 0：未催 1：已催")
+    private Integer urge;
 
-  @ApiModelProperty(value = "下期飞手入账时间")
-  private String nextFlyerIncomeDate;
+    @ApiModelProperty(value = "订单类型")
+    private Integer orderType;
 
-  @ApiModelProperty(value = "是否进行过催付款 0：未催 1：已催")
-  private Integer urge;
+    @ApiModelProperty(value = "确认需求备注")
+    private String cmdRemark;
 
-  @ApiModelProperty(value = "订单类型")
-  private Integer orderType;
+    @ApiModelProperty(value = "飞手可抢单开始时间")
+    private Date flyerStartTime;
 
-  @ApiModelProperty(value = "确认需求备注")
-  private String cmdRemark;
+    @ApiModelProperty(value = "飞手可抢单结束时间")
+    private Date flyerEndTime;
 
-  @ApiModelProperty(value = "飞手可抢单开始时间")
-  private Date flyerStartTime;
+    @ApiModelProperty(value = "预估金额")
+    private BigDecimal estimatedAmount;
 
-  @ApiModelProperty(value = "飞手可抢单结束时间")
-  private Date flyerEndTime;
+    @ApiModelProperty(value = "申请id")
+    private Integer orderApplyId;
 
-  @ApiModelProperty(value = "预估金额")
-  private BigDecimal estimatedAmount;
+    @ApiModelProperty(value = "用户下单附件预览效果")
+    private String userPreview;
 
-  @ApiModelProperty(value = "申请id")
-  private Integer orderApplyId;
+    @ApiModelProperty(value = "平台上传附件预览效果")
+    private String platformPreview;
 
-  @ApiModelProperty(value = "用户下单附件预览效果")
-  private String userPreview;
+    @ApiModelProperty(value = "文案描述")
+    private String copywriting;
 
-  @ApiModelProperty(value = "平台上传附件预览效果")
-  private String platformPreview;
+    @ApiModelProperty(value = "子任务列表")
+    private List<OrderTaskDTO> children;
 
-  @ApiModelProperty(value = "文案描述")
-  private String copywriting;
+    @ApiModelProperty(value = "子订单信息")
+    private List<OrderTaskSonDTO> son;
 
-  @ApiModelProperty(value = "子任务列表")
-  private List<OrderTaskDTO> children;
-
-  @ApiModelProperty(value = "子订单信息")
-  private List<OrderTaskSonDTO> son;
-
-  public void buildOperateUser(UserAccountDTO op) {
-    this.phoneNum = op.getPhoneNum();
-    this.operateName = op.getUserName();
-    this.userOperateId = op.getId();
-  }
-
-  public void buildWxUser(UserAccountDTO wx) {
-    this.userAccountId = wx.getId();
-    this.uid = wx.getUid();
-    this.nickName = wx.getNickName();
-    this.userName = wx.getUserName();
-    this.userPhoneNum = wx.getPhoneNum();
-  }
-
-  public FlyerOrderTaskDTO buildFlyerOrderTaskDTO() {
-    return FlyerOrderTaskDTO.builder()
-        .orderId(this.id)
-        .orderNo(this.orderNo)
-        .orderName(this.orderName)
-        .build();
-  }
 }

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,115 +18,115 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 public class OrderTaskSonDTO implements Serializable {
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  private Integer id;
+    private Integer id;
 
-  @ApiModelProperty(value = "0为主任务")
-  private Integer parentId;
+    @ApiModelProperty(value = "0为主任务")
+    private Integer parentId;
 
-  @ApiModelProperty(value = "客户ID")
-  private Integer userAccountId;
+    @ApiModelProperty(value = "客户ID")
+    private Integer userAccountId;
 
-  @ApiModelProperty(value = "运营人员ID（负责这个order的运营人员id")
-  private Integer userOperateId;
+    @ApiModelProperty(value = "运营人员ID（负责这个order的运营人员id")
+    private Integer userOperateId;
 
-  @ApiModelProperty(value = "订单编号")
-  private String orderNo;
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
 
-  @ApiModelProperty(value = "订单名称")
-  private String orderName;
+    @ApiModelProperty(value = "订单名称")
+    private String orderName;
 
-  @ApiModelProperty(value = "订单总金额")
-  private BigDecimal orderAmt;
+    @ApiModelProperty(value = "订单总金额")
+    private BigDecimal orderAmt;
 
-  @ApiModelProperty(value = "订单金额中的现金金额")
-  private BigDecimal cashAmt;
+    @ApiModelProperty(value = "订单金额中的现金金额")
+    private BigDecimal cashAmt;
 
-  @ApiModelProperty(value = "订单金额中的信用金额")
-  private BigDecimal creditAmt;
+    @ApiModelProperty(value = "订单金额中的信用金额")
+    private BigDecimal creditAmt;
 
-  @ApiModelProperty(value = "任务飞行地址")
-  private String taskAddress;
+    @ApiModelProperty(value = "任务飞行地址")
+    private String taskAddress;
 
-  @ApiModelProperty(value = "基本信息")
-  private String basicInfo;
+    @ApiModelProperty(value = "基本信息")
+    private String basicInfo;
 
-  @ApiModelProperty(value = "服务开始时间")
-  private LocalDateTime startTime;
+    @ApiModelProperty(value = "服务开始时间")
+    private LocalDateTime startTime;
 
-  @ApiModelProperty(value = "服务结束时间")
-  private LocalDateTime endTime;
+    @ApiModelProperty(value = "服务结束时间")
+    private LocalDateTime endTime;
 
-  @ApiModelProperty(value = "实际服务开始时间")
-  private LocalDateTime acStartTime;
+    @ApiModelProperty(value = "实际服务开始时间")
+    private LocalDateTime acStartTime;
 
-  @ApiModelProperty(value = "实际服务结束时间")
-  private LocalDateTime acEndTime;
+    @ApiModelProperty(value = "实际服务结束时间")
+    private LocalDateTime acEndTime;
 
-  @ApiModelProperty(
-      value =
-          "0下单初始化(待分配运营）->	100已分配运营（待需求确认）->	200已经需求确认(待订单确认)->	300已订单确认（待预支付）->	400已预支付(调度中)->	500飞手已接单(待抵达现场)->	525飞手已抵达(待开始作业)->	550已开始作业(作业中)->	575飞手已完成作业(待平台确认作业完成)->	600平台已确认作业完成(待验收结算)->	700验收通过->	900订单关闭")
-  private Integer orderStatus;
+    @ApiModelProperty(
+            value =
+                    "0下单初始化(待分配运营）->	100已分配运营（待需求确认）->	200已经需求确认(待订单确认)->	300已订单确认（待预支付）->	400已预支付(调度中)->	500飞手已接单(待抵达现场)->	525飞手已抵达(待开始作业)->	550已开始作业(作业中)->	575飞手已完成作业(待平台确认作业完成)->	600平台已确认作业完成(待验收结算)->	700验收通过->	900订单关闭")
+    private Integer orderStatus;
 
-  @ApiModelProperty(value = "评价状态：0未评价 1已评价")
-  private Integer evaluateStatus;
+    @ApiModelProperty(value = "评价状态：0未评价 1已评价")
+    private Integer evaluateStatus;
 
-  private LocalDateTime createTime;
+    private LocalDateTime createTime;
 
-  private LocalDateTime updateTime;
+    private LocalDateTime updateTime;
 
-  @ApiModelProperty(value = "服务项ID")
-  private Integer inspectionId;
+    @ApiModelProperty(value = "服务项ID")
+    private Integer inspectionId;
 
-  @ApiModelProperty(value = "服务名称")
-  private String inspectionName;
+    @ApiModelProperty(value = "服务名称")
+    private String inspectionName;
 
-  @ApiModelProperty(value = "最近一次操作信息")
-  private String lastMsg;
+    @ApiModelProperty(value = "最近一次操作信息")
+    private String lastMsg;
 
-  @ApiModelProperty(value = "任务地址经度")
-  private BigDecimal lon;
+    @ApiModelProperty(value = "任务地址经度")
+    private BigDecimal lon;
 
-  @ApiModelProperty(value = "任务地址纬度")
-  private BigDecimal lat;
+    @ApiModelProperty(value = "任务地址纬度")
+    private BigDecimal lat;
 
-  @ApiModelProperty(value = "订单关闭原因")
-  private String shutReason;
+    @ApiModelProperty(value = "订单关闭原因")
+    private String shutReason;
 
-  @ApiModelProperty(value = "是否营销数据（假数据）：0:否 1:是")
-  private Boolean isDummy;
+    @ApiModelProperty(value = "是否营销数据（假数据）：0:否 1:是")
+    private Boolean isDummy;
 
-  @ApiModelProperty(value = "平台备注")
-  private String pfRemark;
+    @ApiModelProperty(value = "平台备注")
+    private String pfRemark;
 
-  @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
-  private Integer flyerType;
+    @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
+    private Integer flyerType;
 
-  @ApiModelProperty(value = "任务飞手人数")
-  private Integer flyerNum;
+    @ApiModelProperty(value = "任务飞手人数")
+    private Integer flyerNum;
 
-  @ApiModelProperty(value = "0:隐藏 1:显示(隐藏后飞手端不显示，不参与抢单)")
-  private Integer display;
+    @ApiModelProperty(value = "0:隐藏 1:显示(隐藏后飞手端不显示，不参与抢单)")
+    private Integer display;
 
-  @ApiModelProperty(value = "飞手评价：0未评价 1已评价")
-  private Integer flyerEval;
+    @ApiModelProperty(value = "飞手评价：0未评价 1已评价")
+    private Integer flyerEval;
 
-  @ApiModelProperty(value = "是否进行过催单 0：未通知 1：已通知")
-  private Integer isUrge;
+    @ApiModelProperty(value = "是否进行过催单 0：未通知 1：已通知")
+    private Integer isUrge;
 
-  @ApiModelProperty(value = "订单类型：0普通订单，1推荐订单，2加急单")
-  private Integer orderType;
+    @ApiModelProperty(value = "订单类型：0普通订单，1推荐订单，2加急单")
+    private Integer orderType;
 
-  @ApiModelProperty(value = "需求确认备注")
-  private String cmdRemark;
+    @ApiModelProperty(value = "需求确认备注")
+    private String cmdRemark;
 
-  @ApiModelProperty(value = "飞手抢单开始时间")
-  private LocalDateTime flyerStartTime;
+    @ApiModelProperty(value = "飞手抢单开始时间")
+    private LocalDateTime flyerStartTime;
 
-  @ApiModelProperty(value = "飞手抢单结束时间")
-  private LocalDateTime flyerEndTime;
+    @ApiModelProperty(value = "飞手抢单结束时间")
+    private LocalDateTime flyerEndTime;
 
-  @ApiModelProperty(value = "推荐机构")
-  private Integer rcdCompanyId;
+    @ApiModelProperty(value = "推荐机构")
+    private Integer rcdCompanyId;
 }

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

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.order.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,26 +18,26 @@ import java.util.List;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.model.dto.OrderVcuDTO", description = "订单凭证DTO")
 public class OrderVcuDTO implements Serializable {
-  private static final long serialVersionUID = -7101242524092899210L;
+    private static final long serialVersionUID = -7101242524092899210L;
 
-  @ApiModelProperty(value = "ID")
-  private Integer id;
+    @ApiModelProperty(value = "ID")
+    private Integer id;
 
-  @ApiModelProperty(value = "订单ID")
-  private Integer orderInfoId;
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderInfoId;
 
-  @ApiModelProperty(value = "0:发货 1:收货 2:归还 3:平台收货")
-  private Integer vcuType;
+    @ApiModelProperty(value = "0:发货 1:收货 2:归还 3:平台收货")
+    private Integer vcuType;
 
-  @ApiModelProperty(value = "设备状况:0无问题 1有问题")
-  private Integer vcuSatus;
+    @ApiModelProperty(value = "设备状况:0无问题 1有问题")
+    private Integer vcuSatus;
 
-  @ApiModelProperty(value = "描述-备注")
-  private String remark;
+    @ApiModelProperty(value = "描述-备注")
+    private String remark;
 
-  @ApiModelProperty(value = "图片集合")
-  private List<String> imgs;
+    @ApiModelProperty(value = "图片集合")
+    private List<String> imgs;
 
-  @ApiModelProperty(value = "视频")
-  private String videoUrl;
+    @ApiModelProperty(value = "视频")
+    private String videoUrl;
 }

src/main/java/com/mmc/pms/model/vo/LeaseOrderVO.java → src/main/java/com/mmc/pms/model/order/vo/LeaseOrderVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.order.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,32 +17,32 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class LeaseOrderVO implements Serializable {
-  private static final long serialVersionUID = 3876353091071918771L;
-  private String orderNo;
-  private Integer wareInfoId;
-  private String wareNo;
-  private String wareTitle;
-  private String mainImg;
-  private Integer skuInfoId;
-  private String skuTitle;
-  private Integer repoAccountId;
-  private String uid;
-  private String buyerName;
-  private String buyerPhone;
-  private BigDecimal unitPrice;
-  private Integer wareNum;
-  private BigDecimal shouldPay;
-  private BigDecimal actualPay;
-  private Integer orderType;
-  private BigDecimal deposit;
-  private BigDecimal rentPrice;
-  private Date startDate;
-  private Date endDate;
-  private Integer payDay;
-  private Integer exWare;
-  private String tranStatus;
-  private String remark;
-  private Integer rcdCompanyId;
-  private Date createTime;
-  private OrderReceiptVO orderReceipt;
+    private static final long serialVersionUID = 3876353091071918771L;
+    private String orderNo;
+    private Integer wareInfoId;
+    private String wareNo;
+    private String wareTitle;
+    private String mainImg;
+    private Integer skuInfoId;
+    private String skuTitle;
+    private Integer repoAccountId;
+    private String uid;
+    private String buyerName;
+    private String buyerPhone;
+    private BigDecimal unitPrice;
+    private Integer wareNum;
+    private BigDecimal shouldPay;
+    private BigDecimal actualPay;
+    private Integer orderType;
+    private BigDecimal deposit;
+    private BigDecimal rentPrice;
+    private Date startDate;
+    private Date endDate;
+    private Integer payDay;
+    private Integer exWare;
+    private String tranStatus;
+    private String remark;
+    private Integer rcdCompanyId;
+    private Date createTime;
+    private OrderReceiptVO orderReceipt;
 }

src/main/java/com/mmc/pms/model/vo/OrderReceiptVO.java → src/main/java/com/mmc/pms/model/order/vo/OrderReceiptVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.order.vo;
 
 import com.mmc.pms.entity.OrderReceiptDO;
-import com.mmc.pms.model.dto.RepoAddressDTO;
-import com.mmc.pms.model.dto.RepoInfoDTO;
+import com.mmc.pms.model.other.dto.RepoAddressDTO;
+import com.mmc.pms.model.other.dto.RepoInfoDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,62 +20,62 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.model.vo.OrderReceiptVO", description = "收货地址类")
 public class OrderReceiptVO implements Serializable {
-  private static final long serialVersionUID = -3695743775258866831L;
+    private static final long serialVersionUID = -3695743775258866831L;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private Integer id;
+    @ApiModelProperty(value = "", hidden = true)
+    private Integer id;
 
-  @ApiModelProperty(value = "订单id")
-  private Integer orderInfoId;
+    @ApiModelProperty(value = "订单id")
+    private Integer orderInfoId;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private Integer receiptMethod;
+    @ApiModelProperty(value = "", hidden = true)
+    private Integer receiptMethod;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private String takeName;
+    @ApiModelProperty(value = "", hidden = true)
+    private String takeName;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private String takePhone;
+    @ApiModelProperty(value = "", hidden = true)
+    private String takePhone;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private String region;
+    @ApiModelProperty(value = "", hidden = true)
+    private String region;
 
-  @ApiModelProperty(value = "", hidden = true)
-  private String detailAddress;
+    @ApiModelProperty(value = "", hidden = true)
+    private String detailAddress;
 
-  @ApiModelProperty(value = "门店名称")
-  private String repoName;
+    @ApiModelProperty(value = "门店名称")
+    private String repoName;
 
-  @ApiModelProperty(value = "门店地址")
-  private String repoAddress;
+    @ApiModelProperty(value = "门店地址")
+    private String repoAddress;
 
-  @ApiModelProperty(value = "预留手机号")
-  private String bookPhone;
+    @ApiModelProperty(value = "预留手机号")
+    private String bookPhone;
 
-  @ApiModelProperty(value = "物流公司编码")
-  private String sendExCode;
+    @ApiModelProperty(value = "物流公司编码")
+    private String sendExCode;
 
-  @ApiModelProperty(value = "物流单号")
-  private String sendExNo;
+    @ApiModelProperty(value = "物流单号")
+    private String sendExNo;
 
-  public void buildAddress(RepoAddressDTO d) {
-    this.takeName = d.getRealName();
-    this.takePhone = d.getPhoneNum();
-    this.region = d.getRegion();
-    this.detailAddress = d.getDetailAddress();
-  }
+    public void buildAddress(RepoAddressDTO d) {
+        this.takeName = d.getRealName();
+        this.takePhone = d.getPhoneNum();
+        this.region = d.getRegion();
+        this.detailAddress = d.getDetailAddress();
+    }
 
-  public void buildAddress(RepoInfoDTO d, String bookPhone) {
-    this.repoName = d.getRepoName();
-    this.repoAddress = d.getRepoAddress();
-    this.bookPhone = bookPhone;
-  }
+    public void buildAddress(RepoInfoDTO d, String bookPhone) {
+        this.repoName = d.getRepoName();
+        this.repoAddress = d.getRepoAddress();
+        this.bookPhone = bookPhone;
+    }
 
-  public OrderReceiptDO buildOrderReceiptDO() {
-    return OrderReceiptDO.builder()
-        .orderInfoId(this.orderInfoId)
-        .sendExCode(this.sendExCode)
-        .sendExNo(this.sendExNo)
-        .build();
-  }
+    public OrderReceiptDO buildOrderReceiptDO() {
+        return OrderReceiptDO.builder()
+                .orderInfoId(this.orderInfoId)
+                .sendExCode(this.sendExCode)
+                .sendExNo(this.sendExNo)
+                .build();
+    }
 }

src/main/java/com/mmc/pms/model/dto/AdDTO.java → src/main/java/com/mmc/pms/model/other/dto/AdDTO.java

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

src/main/java/com/mmc/pms/model/dto/DistrictInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/DistrictInfoDTO.java

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

src/main/java/com/mmc/pms/model/dto/ExpStationsDTO.java → src/main/java/com/mmc/pms/model/other/dto/ExpStationsDTO.java

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

src/main/java/com/mmc/pms/model/dto/KdnExpDTO.java → src/main/java/com/mmc/pms/model/other/dto/KdnExpDTO.java

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

src/main/java/com/mmc/pms/model/dto/ModelDTO.java → src/main/java/com/mmc/pms/model/other/dto/ModelDTO.java

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

src/main/java/com/mmc/pms/model/dto/RefundLogDTO.java → src/main/java/com/mmc/pms/model/other/dto/RefundLogDTO.java

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

src/main/java/com/mmc/pms/model/dto/RepoAddressDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoAddressDTO.java

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

src/main/java/com/mmc/pms/model/dto/RepoCashDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoCashDTO.java

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

src/main/java/com/mmc/pms/model/dto/RepoInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoInfoDTO.java

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

src/main/java/com/mmc/pms/model/dto/RoleInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/RoleInfoDTO.java

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

src/main/java/com/mmc/pms/model/qo/GoodsInfoQO.java

 package com.mmc.pms.model.qo;
 
-import com.mmc.pms.model.vo.Freeze;
+import com.mmc.pms.model.group.Freeze;
 import com.mmc.pms.page.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -38,39 +38,39 @@ public class GoodsInfoQO {
   @ApiModelProperty(value = "状态 0:下架（仓库中）1:上架")
   private Integer status;*/
 
-  @ApiModelProperty(name = "districtId", value = "地域id", example = "1", required = false)
-  private Integer districtId;
+    @ApiModelProperty(name = "districtId", value = "地域id", example = "1", required = false)
+    private Integer districtId;
 
-  @ApiModelProperty(name = "产品类目id", value = "产品类目id", example = "1", required = false)
-  private Integer productCategoryId;
+    @ApiModelProperty(name = "产品类目id", value = "产品类目id", example = "1", required = false)
+    private Integer productCategoryId;
 
-  @ApiModelProperty(name = "brandId", value = "品牌id", example = "1", required = false)
-  private Integer brandId;
+    @ApiModelProperty(name = "brandId", value = "品牌id", example = "1", required = false)
+    private Integer brandId;
 
-  @ApiModelProperty(name = "partsId", value = "部件id", example = "1", required = false)
-  private Integer partsId;
+    @ApiModelProperty(name = "partsId", value = "部件id", example = "1", required = false)
+    private Integer partsId;
 
-  @ApiModelProperty(name = "modelId", value = "型号id", example = "1", required = false)
-  private Integer modelId;
+    @ApiModelProperty(name = "modelId", value = "型号id", example = "1", required = false)
+    private Integer modelId;
 
-  @ApiModelProperty(name = "qualityId", value = "成色id", example = "1", required = false)
-  private Integer qualityId;
+    @ApiModelProperty(name = "qualityId", value = "成色id", example = "1", required = false)
+    private Integer qualityId;
 
-  @ApiModelProperty(value = "页码", required = true)
-  @NotNull(
-      message = "页码不能为空",
-      groups = {Page.class, Freeze.class})
-  @Min(value = 1, groups = Page.class)
-  private Integer pageNo;
+    @ApiModelProperty(value = "页码", required = true)
+    @NotNull(
+            message = "页码不能为空",
+            groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageNo;
 
-  @ApiModelProperty(value = "每页显示数", required = true)
-  @NotNull(
-      message = "每页显示数不能为空",
-      groups = {Page.class, Freeze.class})
-  @Min(value = 1, groups = Page.class)
-  private Integer pageSize;
+    @ApiModelProperty(value = "每页显示数", required = true)
+    @NotNull(
+            message = "每页显示数不能为空",
+            groups = {Page.class, Freeze.class})
+    @Min(value = 1, groups = Page.class)
+    private Integer pageSize;
 
-  public void buildCurrentPage() {
-    this.pageNo = (pageNo - 1) * pageSize;
-  }
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
 }

src/main/java/com/mmc/pms/model/qo/IndustrySkuQO.java

 package com.mmc.pms.model.qo;
 
-import com.mmc.pms.model.vo.Freeze;
+import com.mmc.pms.model.group.Freeze;
 import com.mmc.pms.page.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/qo/ProductSkuQO.java

 package com.mmc.pms.model.qo;
 
-import com.mmc.pms.model.vo.Freeze;
+import com.mmc.pms.model.group.Freeze;
 import com.mmc.pms.page.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/dto/AppGoodsInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/AppGoodsInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,35 +18,35 @@ import java.io.Serializable;
 // @ApiModel(value = "com.mmc.csf.mall.dto.AppGoodsInfoDTO", description = "小程序商品信息DTO")
 public class AppGoodsInfoDTO implements Serializable {
 
-  private static final long serialVersionUID = 6104334488561632747L;
+    private static final long serialVersionUID = 6104334488561632747L;
 
-  @ApiModelProperty("商品id")
-  private Integer id;
+    @ApiModelProperty("商品id")
+    private Integer id;
 
-  @ApiModelProperty("商品名称")
-  private String goodsName;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
 
-  @ApiModelProperty("商品上架状态")
-  private Integer shelfStatus;
+    @ApiModelProperty("商品上架状态")
+    private Integer shelfStatus;
 
-  @ApiModelProperty("商品主图")
-  private String mainImg;
+    @ApiModelProperty("商品主图")
+    private String mainImg;
 
-  @ApiModelProperty("商品描述")
-  private String goodsDesc;
+    @ApiModelProperty("商品描述")
+    private String goodsDesc;
 
-  @ApiModelProperty("商品属性")
-  private Integer goodsAttr;
+    @ApiModelProperty("商品属性")
+    private Integer goodsAttr;
 
-  @ApiModelProperty("生态标签")
-  private String ecoLabel;
+    @ApiModelProperty("生态标签")
+    private String ecoLabel;
 
-  @ApiModelProperty("安全编码")
-  private String code;
+    @ApiModelProperty("安全编码")
+    private String code;
 
-  @ApiModelProperty("排序")
-  private Integer sort;
+    @ApiModelProperty("排序")
+    private Integer sort;
 
-  @ApiModelProperty("安全编码是否显示 0 否 1 是")
-  private Integer showCode;
+    @ApiModelProperty("安全编码是否显示 0 否 1 是")
+    private Integer showCode;
 }

src/main/java/com/mmc/pms/model/dto/AppGoodsInfoDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/AppGoodsInfoDetailDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,54 +17,52 @@ import java.util.List;
 @NoArgsConstructor
 @Accessors(chain = true)
 public class AppGoodsInfoDetailDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "pid")
-  private Integer pid;
+    @ApiModelProperty(value = "pid")
+    private Integer pid;
 
-  @ApiModelProperty(value = "商品名称")
-  private String goodsName;
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
 
-  @ApiModelProperty(value = "云享飞服务id")
-  private Integer shareFlyServiceId;
+    @ApiModelProperty(value = "云享飞服务id")
+    private Integer shareFlyServiceId;
 
-  @ApiModelProperty(value = "云仓配件id")
-  private Integer repoId;
+    @ApiModelProperty(value = "云仓配件id")
+    private Integer repoId;
 
-  @ApiModelProperty(value = "规格信息")
-  private List<GoodsSpecDTO> goodsSpec;
+    @ApiModelProperty(value = "规格信息")
+    private List<GoodsSpecDTO> goodsSpec;
 
-  @ApiModelProperty(value = "商品图片")
-  private List<GoodsImgDTO> images;
+    @ApiModelProperty(value = "商品图片")
+    private List<GoodsImgDTO> images;
 
-  @ApiModelProperty(value = "商品视频")
-  private String goodsVideo;
+    @ApiModelProperty(value = "商品视频")
+    private String goodsVideo;
 
-  @ApiModelProperty(value = "商品视频id")
-  private Integer goodsVideoId;
+    @ApiModelProperty(value = "商品视频id")
+    private Integer goodsVideoId;
 
-  @ApiModelProperty(value = "商品详情")
-  private GoodsDetailInfoDTO goodsDetail;
+    @ApiModelProperty(value = "商品详情")
+    private GoodsDetailInfoDTO goodsDetail;
 
-  @ApiModelProperty(value = "所属目录")
-  private Integer sortTypeId;
+    @ApiModelProperty(value = "所属目录")
+    private Integer sortTypeId;
 
-  @ApiModelProperty(value = "一级分类id")
-  private Integer masterTypeId;
+    @ApiModelProperty(value = "一级分类id")
+    private Integer masterTypeId;
 
-  @ApiModelProperty(value = "二级分类id")
-  private Integer slaveTypeId;
+    @ApiModelProperty(value = "二级分类id")
+    private Integer slaveTypeId;
 
-  @ApiModelProperty(value = "商品标签")
-  private String tag;
+    @ApiModelProperty(value = "商品标签")
+    private String tag;
 
-  @ApiModelProperty(value = "商品状态 0:下架 1:上架")
-  private Integer shelfStatus;
+    @ApiModelProperty(value = "商品状态 0:下架 1:上架")
+    private Integer shelfStatus;
 
-  @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
-  private List<GoodsOtherServiceDTO> otherService;
+    @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
+    private List<GoodsOtherServiceDTO> otherService;
 
-  @ApiModelProperty(value = "常见问题")
-  private List<GoodsQaDTO> question;
 }

src/main/java/com/mmc/pms/model/dto/BrandInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/BrandInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/pms/model/dto/GoodsDetailInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsDetailInfoDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,15 +17,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsDetailInfoDTO", description = "商品详细信息DTO")
 public class GoodsDetailInfoDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "描述")
-  private String goodsDesc;
+    @ApiModelProperty(value = "描述")
+    private String goodsDesc;
 
-  @ApiModelProperty(value = "富文本")
-  private String content;
+    @ApiModelProperty(value = "富文本")
+    private String content;
 
-  @ApiModelProperty(value = "商品备注")
-  private String remark;
+    @ApiModelProperty(value = "商品备注")
+    private String remark;
 }

src/main/java/com/mmc/pms/model/dto/GoodsImgDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsImgDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,12 +17,12 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsImgDTO", description = "商品图片信息DTO")
 public class GoodsImgDTO implements Serializable {
-  @ApiModelProperty(value = "图片id")
-  private Integer id;
+    @ApiModelProperty(value = "图片id")
+    private Integer id;
 
-  @ApiModelProperty(value = "图片路径")
-  private String imgUrl;
+    @ApiModelProperty(value = "图片路径")
+    private String imgUrl;
 
-  @ApiModelProperty(value = "图片类型 : 0:主图 1:副图")
-  private Integer imgType;
+    @ApiModelProperty(value = "图片类型 : 0:主图 1:副图")
+    private Integer imgType;
 }

src/main/java/com/mmc/pms/model/dto/GoodsInfoListDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsInfoListDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,36 +18,36 @@ import java.util.Date;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsInfoListDTO", description = "商品列表信息DTO")
 public class GoodsInfoListDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "商品名称")
-  private String goodsName;
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "状态 : 0:下架 1：上架")
-  private Integer status;
+    @ApiModelProperty(value = "状态 : 0:下架 1：上架")
+    private Integer status;
 
-  @ApiModelProperty(value = "商品主图")
-  private String imgUrl;
+    @ApiModelProperty(value = "商品主图")
+    private String imgUrl;
 
-  @ApiModelProperty(value = "一级分类名称")
-  private String goodsOneLevelTypeName;
+    @ApiModelProperty(value = "一级分类名称")
+    private String goodsOneLevelTypeName;
 
-  @ApiModelProperty(value = "二级分类名称")
-  private String goodsTwoLevelTypeName;
+    @ApiModelProperty(value = "二级分类名称")
+    private String goodsTwoLevelTypeName;
 
-  @ApiModelProperty(value = "目录名字")
-  private String directoryName;
+    @ApiModelProperty(value = "目录名字")
+    private String directoryName;
 
-  @ApiModelProperty(value = "目录id")
-  private Integer directoryId;
+    @ApiModelProperty(value = "目录id")
+    private Integer directoryId;
 
-  @ApiModelProperty(value = "是否有优惠券 0表示没有 有就返回数字")
-  private Integer isCoupons;
+    @ApiModelProperty(value = "是否有优惠券 0表示没有 有就返回数字")
+    private Integer isCoupons;
 
-  @ApiModelProperty(value = "描述")
-  private String goodsDesc;
+    @ApiModelProperty(value = "描述")
+    private String goodsDesc;
 }

src/main/java/com/mmc/pms/model/dto/GoodsOtherServiceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsOtherServiceDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,12 +17,12 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsOtherServiceDTO", description = "其他服务信息DTO")
 public class GoodsOtherServiceDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "其他服务id")
-  private Integer saleServiceId;
+    @ApiModelProperty(value = "其他服务id")
+    private Integer saleServiceId;
 
-  @ApiModelProperty(value = "其他服务名称")
-  private String serviceName;
+    @ApiModelProperty(value = "其他服务名称")
+    private String serviceName;
 }

src/main/java/com/mmc/pms/model/dto/GoodsServiceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsServiceDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,10 +16,10 @@ import java.io.Serializable;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsServiceDTO", description = "商品服务DTO")
 public class GoodsServiceDTO implements Serializable {
-  private static final long serialVersionUID = -3178549723714411915L;
-  private Integer id;
-  private Integer saleServiceId;
-  private Integer goodsInfoId;
-  private String serviceName;
-  private String remark;
+    private static final long serialVersionUID = -3178549723714411915L;
+    private Integer id;
+    private Integer saleServiceId;
+    private Integer goodsInfoId;
+    private String serviceName;
+    private String remark;
 }

src/main/java/com/mmc/pms/model/dto/GoodsSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsSpecDTO.java

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

src/main/java/com/mmc/pms/model/dto/GoodsTypeDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsTypeDetailDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,23 +18,23 @@ import java.util.List;
 @AllArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.GoodsTypeDetailDTO", description = "分类详情DTO")
 public class GoodsTypeDetailDTO implements Serializable {
-  private static final long serialVersionUID = 4405239380837705419L;
+    private static final long serialVersionUID = 4405239380837705419L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "分类名称")
-  private String groupName;
+    @ApiModelProperty(value = "分类名称")
+    private String groupName;
 
-  @ApiModelProperty(value = "描述")
-  private String description;
+    @ApiModelProperty(value = "描述")
+    private String description;
 
-  @ApiModelProperty(value = "icon图标")
-  private String icon;
+    @ApiModelProperty(value = "icon图标")
+    private String icon;
 
-  @ApiModelProperty(value = "总条数")
-  private Integer totalCount;
+    @ApiModelProperty(value = "总条数")
+    private Integer totalCount;
 
-  @ApiModelProperty(value = "商品对象")
-  private List<TypeGoodsInfoDTO> goodsInfo;
+    @ApiModelProperty(value = "商品对象")
+    private List<TypeGoodsInfoDTO> goodsInfo;
 }

src/main/java/com/mmc/pms/model/dto/IndustrySkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySkuDTO.java

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

src/main/java/com/mmc/pms/model/dto/IndustrySpecCPQVO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecCPQVO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
-import com.mmc.pms.model.vo.SpecPriceVO;
+import com.mmc.pms.model.sale.vo.SpecPriceVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/dto/IndustrySpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -33,4 +33,6 @@ public class IndustrySpecDTO implements Serializable {
     private List<ProductInventoryVO> productInventoryList;
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
+    @ApiModelProperty(value = "价格配置")
+    private List<IndustrySpecPriceDTO> priceList;
 }

src/main/java/com/mmc/pms/model/dto/IndustrySpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecPriceDTO.java

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

src/main/java/com/mmc/pms/model/dto/MallGoodsDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallGoodsDetailDTO.java

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

src/main/java/com/mmc/pms/model/dto/MallGoodsShopCarDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallGoodsShopCarDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

src/main/java/com/mmc/pms/model/dto/MallIndustrySpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallIndustrySpecDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,26 +18,26 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 public class MallIndustrySpecDTO implements Serializable {
-  private static final long serialVersionUID = 5476956071052692714L;
+    private static final long serialVersionUID = 5476956071052692714L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "行业规格id")
-  private Integer industrySpecId;
+    @ApiModelProperty(value = "行业规格id")
+    private Integer industrySpecId;
 
-  @ApiModelProperty(value = "行业skuId")
-  private Integer industrySkuId;
+    @ApiModelProperty(value = "行业skuId")
+    private Integer industrySkuId;
 
-  @ApiModelProperty(value = "规格名称")
-  private String specName;
+    @ApiModelProperty(value = "规格名称")
+    private String specName;
 
-  @ApiModelProperty(value = "规格图片")
-  private String specImage;
+    @ApiModelProperty(value = "规格图片")
+    private String specImage;
 
-  @ApiModelProperty(value = "产品清单")
-  private List<ProductInventoryVO> productInventoryList;
+    @ApiModelProperty(value = "产品清单")
+    private List<ProductInventoryVO> productInventoryList;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

src/main/java/com/mmc/pms/model/dto/MallProductSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallProductSpecDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
-import com.mmc.pms.model.vo.ProductSpecCPQVO;
+import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,32 +20,32 @@ import java.util.Date;
 @Builder
 @Accessors(chain = true)
 public class MallProductSpecDTO implements Serializable {
-  private static final long serialVersionUID = -2681122778843398310L;
+    private static final long serialVersionUID = -2681122778843398310L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "产品规格id")
-  private Integer productSpec;
+    @ApiModelProperty(value = "产品规格id")
+    private Integer productSpec;
 
-  @ApiModelProperty(value = "productSkuId")
-  private Integer productSkuId;
+    @ApiModelProperty(value = "productSkuId")
+    private Integer productSkuId;
 
-  @ApiModelProperty(value = "规格名称")
-  private String specName;
+    @ApiModelProperty(value = "规格名称")
+    private String specName;
 
-  @ApiModelProperty(value = "规格图片")
-  private String specImage;
+    @ApiModelProperty(value = "规格图片")
+    private String specImage;
 
-  @ApiModelProperty(value = "料号")
-  private String partNo;
+    @ApiModelProperty(value = "料号")
+    private String partNo;
 
-  @ApiModelProperty(value = "版本描述")
-  private String versionDesc;
+    @ApiModelProperty(value = "版本描述")
+    private String versionDesc;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "价格配置信息")
-  private ProductSpecCPQVO productSpecCPQVO;
+    @ApiModelProperty(value = "价格配置信息")
+    private ProductSpecCPQVO productSpecCPQVO;
 }

src/main/java/com/mmc/pms/model/dto/MallProductSpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallProductSpecPriceDTO.java

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

src/main/java/com/mmc/pms/model/dto/MallSkuInfoSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallSkuInfoSpecDTO.java

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

src/main/java/com/mmc/pms/model/dto/MallUserDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallUserDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,134 +18,134 @@ import java.util.Date;
 @NoArgsConstructor
 // @ApiModel(value = "com.mmc.csf.mall.dto.MallUserDTO", description = "用户信息DTO")
 public class MallUserDTO implements Serializable {
-  private static final long serialVersionUID = -2968237190830435082L;
+    private static final long serialVersionUID = -2968237190830435082L;
 
-  @ApiModelProperty("id")
-  private Integer id;
+    @ApiModelProperty("id")
+    private Integer id;
 
-  @ApiModelProperty("uid")
-  private String uid;
+    @ApiModelProperty("uid")
+    private String uid;
 
-  @ApiModelProperty("个人认证名字")
-  private String userName;
+    @ApiModelProperty("个人认证名字")
+    private String userName;
 
-  @ApiModelProperty("联系电话")
-  private String phoneNum;
+    @ApiModelProperty("联系电话")
+    private String phoneNum;
 
-  @ApiModelProperty("小程序openid")
-  private String openId;
+    @ApiModelProperty("小程序openid")
+    private String openId;
 
-  @ApiModelProperty("微信unionid")
-  private String unionId;
+    @ApiModelProperty("微信unionid")
+    private String unionId;
 
-  @ApiModelProperty("微信昵称")
-  private String nickName;
+    @ApiModelProperty("微信昵称")
+    private String nickName;
 
-  @ApiModelProperty("头像")
-  private String headerImg;
+    @ApiModelProperty("头像")
+    private String headerImg;
 
-  @ApiModelProperty("经度")
-  private Double lon;
+    @ApiModelProperty("经度")
+    private Double lon;
 
-  @ApiModelProperty("纬度")
-  private Double lat;
+    @ApiModelProperty("纬度")
+    private Double lat;
 
-  @ApiModelProperty("注册端口")
-  private String ports;
+    @ApiModelProperty("注册端口")
+    private String ports;
 
-  @ApiModelProperty("备注")
-  private String remark;
+    @ApiModelProperty("备注")
+    private String remark;
 
-  @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
-  private Integer source;
+    @ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
+    private Integer source;
 
-  @ApiModelProperty("渠道等级状态")
-  private Integer channelAuthStatus;
+    @ApiModelProperty("渠道等级状态")
+    private Integer channelAuthStatus;
 
-  @ApiModelProperty("渠道等级标签")
-  private Integer channelClass;
+    @ApiModelProperty("渠道等级标签")
+    private Integer channelClass;
 
-  @ApiModelProperty("渠道等级名称")
-  private String tagName;
+    @ApiModelProperty("渠道等级名称")
+    private String tagName;
 
-  @ApiModelProperty("注册时间")
-  private Date createTime;
+    @ApiModelProperty("注册时间")
+    private Date createTime;
 
-  @ApiModelProperty("更新时间")
-  private Date updateTime;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
 
-  @ApiModelProperty(value = "实名认证状态（0未通过，1通过）")
-  private Integer realAuthStatus;
+    @ApiModelProperty(value = "实名认证状态（0未通过，1通过）")
+    private Integer realAuthStatus;
 
-  @ApiModelProperty(value = "企业认证状态（0未通过，1通过）")
-  private Integer entAuthStatus;
+    @ApiModelProperty(value = "企业认证状态（0未通过，1通过）")
+    private Integer entAuthStatus;
 
-  @ApiModelProperty("企业名称")
-  private String entName;
+    @ApiModelProperty("企业名称")
+    private String entName;
 
-  @ApiModelProperty("法大大电子签章认证状态(0未通过，1通过)")
-  private Integer entVerifyStatus;
+    @ApiModelProperty("法大大电子签章认证状态(0未通过，1通过)")
+    private Integer entVerifyStatus;
 
-  @ApiModelProperty("实名认证时间")
-  private Date realAuthTime;
+    @ApiModelProperty("实名认证时间")
+    private Date realAuthTime;
 
-  @ApiModelProperty("企业认证时间")
-  private Date entAuthTime;
+    @ApiModelProperty("企业认证时间")
+    private Date entAuthTime;
 
-  @ApiModelProperty("电子签章认证时间")
-  private Date entVerifyTime;
+    @ApiModelProperty("电子签章认证时间")
+    private Date entVerifyTime;
 
-  @ApiModelProperty(value = "上级推荐人id")
-  private Integer upReferralId;
+    @ApiModelProperty(value = "上级推荐人id")
+    private Integer upReferralId;
 
-  @ApiModelProperty(value = "上级推荐人的uid(name)")
-  private String upReferralUidAndName;
+    @ApiModelProperty(value = "上级推荐人的uid(name)")
+    private String upReferralUidAndName;
 
-  @ApiModelProperty(value = "推荐伙伴数量")
-  private Integer lowerReferralCount;
+    @ApiModelProperty(value = "推荐伙伴数量")
+    private Integer lowerReferralCount;
 
-  @ApiModelProperty("相关运营id")
-  private Integer operateId;
+    @ApiModelProperty("相关运营id")
+    private Integer operateId;
 
-  @ApiModelProperty("相关运营Name")
-  private String operateName;
+    @ApiModelProperty("相关运营Name")
+    private String operateName;
 
-  @ApiModelProperty("相关销售id")
-  private Integer saleId;
+    @ApiModelProperty("相关销售id")
+    private Integer saleId;
 
-  @ApiModelProperty("相关销售Name")
-  private String saleName;
+    @ApiModelProperty("相关销售Name")
+    private String saleName;
 
-  @ApiModelProperty("小程序相关运营id")
-  private Integer mallOperator;
+    @ApiModelProperty("小程序相关运营id")
+    private Integer mallOperator;
 
-  @ApiModelProperty("小程序相关运营名字")
-  private String mallOperatorName;
+    @ApiModelProperty("小程序相关运营名字")
+    private String mallOperatorName;
 
-  @ApiModelProperty("小程序相关运营uid")
-  private String mallOperatorUID;
+    @ApiModelProperty("小程序相关运营uid")
+    private String mallOperatorUID;
 
-  @ApiModelProperty("小程序相关销售id")
-  private Integer mallSaleManager;
+    @ApiModelProperty("小程序相关销售id")
+    private Integer mallSaleManager;
 
-  @ApiModelProperty("小程序相关销售uid")
-  private String mallSaleManagerUID;
+    @ApiModelProperty("小程序相关销售uid")
+    private String mallSaleManagerUID;
 
-  @ApiModelProperty("小程序相关销售名字")
-  private String mallSaleManagerName;
+    @ApiModelProperty("小程序相关销售名字")
+    private String mallSaleManagerName;
 
-  @ApiModelProperty("上级渠道名称")
-  private String superiorChannelName;
+    @ApiModelProperty("上级渠道名称")
+    private String superiorChannelName;
 
-  @ApiModelProperty(value = "开户银行")
-  private String accountBank;
+    @ApiModelProperty(value = "开户银行")
+    private String accountBank;
 
-  @ApiModelProperty(value = "开户姓名")
-  private String accountName;
+    @ApiModelProperty(value = "开户姓名")
+    private String accountName;
 
-  @ApiModelProperty(value = "银行卡号")
-  private String bankCardNumber;
+    @ApiModelProperty(value = "银行卡号")
+    private String bankCardNumber;
 
-  @ApiModelProperty(value = "支行")
-  private String branch;
+    @ApiModelProperty(value = "支行")
+    private String branch;
 }

src/main/java/com/mmc/pms/model/dto/ProductCategoryDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductCategoryDTO.java

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

src/main/java/com/mmc/pms/model/dto/ProductInventoryVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductInventoryVO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
-import com.mmc.pms.model.vo.GoodsProductSkuVO;
+import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/dto/ProductSkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSkuDTO.java

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

src/main/java/com/mmc/pms/model/dto/ProductSkuVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSkuVO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
-import com.mmc.pms.model.vo.Create;
-import com.mmc.pms.model.vo.Update;
+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/dto/ProductSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecDTO.java

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

src/main/java/com/mmc/pms/model/dto/ProductSpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecPriceDTO.java

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

src/main/java/com/mmc/pms/model/dto/ProductSpecVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecVO.java

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

src/main/java/com/mmc/pms/model/dto/RemoveSkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/RemoveSkuDTO.java

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

src/main/java/com/mmc/pms/model/dto/SkuAndSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuAndSpecDTO.java

-package com.mmc.pms.model.dto;
+package com.mmc.pms.model.sale.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/mmc/pms/model/dto/SkuInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuInfoDTO.java

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

src/main/java/com/mmc/pms/model/dto/SkuPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuPriceDTO.java

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

src/main/java/com/mmc/pms/model/dto/SkuUnitDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuUnitDTO.java

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

src/main/java/com/mmc/pms/model/dto/TypeGoodsInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/TypeGoodsInfoDTO.java

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

src/main/java/com/mmc/pms/model/vo/GoodsAddVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsAddVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.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/GoodsDetailVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsDetailVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.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/GoodsImgVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsImgVO.java

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

src/main/java/com/mmc/pms/model/vo/GoodsProdSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsProdSpecVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.vo;
 
-import com.mmc.pms.model.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.dto.ProductSpecVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/vo/GoodsProductSkuVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsProductSkuVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.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;
@@ -27,6 +29,8 @@ public class GoodsProductSkuVO implements Serializable {
     @NotNull(message = "产品类型不能为空", groups = {Update.class, Create.class})
     @ApiModelProperty(value = "产品类型")
     private Integer goodsTypeId;
+    @ApiModelProperty()
+    private String categoryName;
     @ApiModelProperty(value = "型号")
     private String model;
     @ApiModelProperty(value = "产品品牌")

src/main/java/com/mmc/pms/model/vo/GoodsSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsSpecVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.vo;
 
-import com.mmc.pms.model.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.dto.ProductSpecVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/mmc/pms/model/vo/IndustrySkuVO.java → src/main/java/com/mmc/pms/model/sale/vo/IndustrySkuVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.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.Builder;

src/main/java/com/mmc/pms/model/vo/IndustrySpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/IndustrySpecVO.java

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

src/main/java/com/mmc/pms/model/vo/MallProductSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/MallProductSpecVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,11 +18,11 @@ import java.io.Serializable;
 @Builder
 @Accessors
 public class MallProductSpecVO implements Serializable {
-  private static final long serialVersionUID = -2681122778843398310L;
+    private static final long serialVersionUID = -2681122778843398310L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "产品或行业规格id")
-  private Integer mallSpecId;
+    @ApiModelProperty(value = "产品或行业规格id")
+    private Integer mallSpecId;
 }

src/main/java/com/mmc/pms/model/vo/ProductSpecCPQVO.java → src/main/java/com/mmc/pms/model/sale/vo/ProductSpecCPQVO.java

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

src/main/java/com/mmc/pms/model/vo/QueryClassifyVO.java → src/main/java/com/mmc/pms/model/sale/vo/QueryClassifyVO.java

-package com.mmc.pms.model.vo;
+package com.mmc.pms.model.sale.vo;
 
+import com.mmc.pms.model.group.Create;
+import com.mmc.pms.model.group.Freeze;
+import com.mmc.pms.model.group.Update;
 import com.mmc.pms.page.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/mmc/pms/model/vo/SpecPriceVO.java → src/main/java/com/mmc/pms/model/sale/vo/SpecPriceVO.java

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

src/main/java/com/mmc/pms/service/CategoriesService.java

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-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 com.mmc.pms.page.PageResult;
 
 /**
@@ -15,7 +15,7 @@ public interface CategoriesService {
 
     ResultBody addOrEditDirectory(DirectoryInfoVO param);
 
-    PageResult directoryList(Integer pageNo, Integer pageSize);
+    PageResult directoryList(Integer pageNo, Integer pageSize, Integer type);
 
     ResultBody removeDirectory(Integer id);
 
@@ -28,4 +28,10 @@ public interface CategoriesService {
     PageResult getClassificationList(QueryClassifyVO queryClassifyVO);
 
     ResultBody getClassifyDetails(Integer id);
+
+    ResultBody queryRelevantBusiness(Integer id, Integer type);
+
+    ResultBody deleteRelevantBusiness(Integer id);
+
+    ResultBody getDirectoryList(Integer type);
 }

src/main/java/com/mmc/pms/service/GoodsInfoService.java

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
+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.GoodsAddVO;
+import com.mmc.pms.model.sale.dto.MallGoodsShopCarDTO;
+import com.mmc.pms.model.sale.dto.MallProductSpecPriceDTO;
+import com.mmc.pms.model.sale.vo.GoodsAddVO;
 
 import java.util.List;
 

src/main/java/com/mmc/pms/service/Impl/BrandManageServiceImpl.java

@@ -5,7 +5,7 @@ import com.mmc.pms.common.ResultEnum;
 import com.mmc.pms.dao.BrandManageDao;
 import com.mmc.pms.dao.ProductDao;
 import com.mmc.pms.entity.BrandInfoDO;
-import com.mmc.pms.model.dto.BrandInfoDTO;
+import com.mmc.pms.model.sale.dto.BrandInfoDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.BrandManageService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/mmc/pms/service/Impl/CategoriesServiceImpl.java

@@ -3,19 +3,24 @@ package com.mmc.pms.service.Impl;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
 import com.mmc.pms.dao.CategoriesDao;
+import com.mmc.pms.dao.GoodsInfoDao;
 import com.mmc.pms.entity.Categories;
 import com.mmc.pms.entity.Directory;
-import com.mmc.pms.model.dto.ClassifyInfoDTO;
-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.entity.GoodsInfo;
+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.sale.vo.QueryClassifyVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.CategoriesService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +36,8 @@ import java.util.stream.Collectors;
 public class CategoriesServiceImpl implements CategoriesService {
     @Autowired
     private CategoriesDao categoriesDao;
+    @Resource
+    private GoodsInfoDao goodsInfoDao;
 
     @Override
     public ResultBody addOrEditDirectory(DirectoryInfoVO param) {
@@ -42,18 +49,22 @@ public class CategoriesServiceImpl implements CategoriesService {
         if (param.getId() == null) {
             categoriesDao.insertDirectory(directory);
         } else {
+            int count = categoriesDao.selectDirectoryById(param.getId());
+            if (count > 0) {
+                return ResultBody.error("默认目录不可修改！");
+            }
             categoriesDao.updateDirectory(directory);
         }
         return ResultBody.success();
     }
 
     @Override
-    public PageResult directoryList(Integer pageNo, Integer pageSize) {
+    public PageResult directoryList(Integer pageNo, Integer pageSize, Integer type) {
         int count = categoriesDao.countDirectoryList();
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, count);
         }
-        List<Directory> directoryList = categoriesDao.directoryList((pageNo - 1) * pageSize, pageSize);
+        List<Directory> directoryList = categoriesDao.directoryList((pageNo - 1) * pageSize, pageSize, type);
         List<DirectoryInfoVO> list = directoryList.stream().map(Directory::buildDirectoryInfoVO).collect(Collectors.toList());
         return PageResult.buildPage(pageNo, pageSize, count, list);
     }
@@ -162,6 +173,39 @@ public class CategoriesServiceImpl implements CategoriesService {
         return ResultBody.success(goodsGroup == null ? null : goodsGroup.buildClassifyDetailsDTO()
         );
     }
+
+    @Override
+    public ResultBody queryRelevantBusiness(Integer id, Integer type) {
+        RelevantBusinessVO relevantBusinessVO = new RelevantBusinessVO();
+        switch (type) {
+            case 0:
+                List<GoodsInfo> goodsInfo = goodsInfoDao.ListGoodsInfoByCategoryId(id);
+                if (CollectionUtils.isNotEmpty(goodsInfo)) {
+                    relevantBusinessVO.setRelevanceGoodsInfoVOs(goodsInfo.stream().map(GoodsInfo::buildRelevanceGoodsInfoVO).collect(Collectors.toList()));
+                    return ResultBody.success(relevantBusinessVO);
+                }
+                break;
+            default:
+                return ResultBody.error("输入类型有误！");
+        }
+        return ResultBody.success();
+    }
+
+    @Override
+    public ResultBody getDirectoryList(Integer type) {
+        List<Directory> directoryList = categoriesDao.getDirectoryList(type);
+        List<DirectoryInfoVO> list = directoryList.stream().map(Directory::buildDirectoryInfoVO).collect(Collectors.toList());
+        return ResultBody.success(list);
+    }
+
+
+    @Override
+    public ResultBody deleteRelevantBusiness(Integer id) {
+        int count = categoriesDao.deleteById(id);
+        return ResultBody.success();
+    }
+
+
 }
 
 

src/main/java/com/mmc/pms/service/Impl/GoodsInfoServiceImpl.java

@@ -6,10 +6,13 @@ import com.mmc.pms.dao.GoodsInfoDao;
 import com.mmc.pms.dao.IndustrySpecDao;
 import com.mmc.pms.dao.ProductDao;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
+import com.mmc.pms.model.order.dto.OrderGoodsProdDetailDTO;
 import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
 import com.mmc.pms.model.qo.ProductSpecPriceQO;
-import com.mmc.pms.model.vo.*;
+import com.mmc.pms.model.sale.dto.*;
+import com.mmc.pms.model.sale.vo.*;
 import com.mmc.pms.service.GoodsInfoService;
 import com.mmc.pms.util.CodeUtil;
 import com.mmc.pms.util.TDateUtil;
@@ -712,9 +715,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
         //还需配置商品规格金额， 单个商品skuSpecAmount， 全部小sku金额
         List<Integer> goodsIds = orderGoodsProdDTOList.stream().map(OrderGoodsProdDTO::getGoodsInfoId).collect(Collectors.toList());
         // 拼装商品服务
-        List<GoodsServiceDTO> services = goodsInfoDao.listGoodsService(goodsIds).stream().map(d -> {
-            return d.buildGoodsServiceDTO();
-        }).collect(Collectors.toList());
+        List<GoodsServiceDTO> services = goodsInfoDao.listGoodsService(goodsIds).stream().map(d -> d.buildGoodsServiceDTO()).collect(Collectors.toList());
         Map<Integer, List<GoodsServiceDTO>> mapGoodsService = org.springframework.util.CollectionUtils.isEmpty(services) ? null
                 : services.stream()
                 .collect(Collectors.groupingBy(GoodsServiceDTO::getGoodsInfoId));

src/main/java/com/mmc/pms/service/Impl/IndustrySpecServiceImpl.java

@@ -6,16 +6,22 @@ import com.mmc.pms.dao.BrandManageDao;
 import com.mmc.pms.dao.IndustrySpecDao;
 import com.mmc.pms.dao.ProductDao;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.sale.dto.ProductInventoryVO;
+import com.mmc.pms.model.sale.dto.ProductSpecVO;
+import com.mmc.pms.model.sale.dto.RemoveSkuDTO;
 import com.mmc.pms.model.qo.IndustrySkuQO;
-import com.mmc.pms.model.vo.GoodsProductSkuVO;
-import com.mmc.pms.model.vo.IndustrySkuVO;
-import com.mmc.pms.model.vo.IndustrySpecVO;
+import com.mmc.pms.model.sale.dto.IndustrySpecCPQVO;
+import com.mmc.pms.model.sale.dto.IndustrySpecDTO;
+import com.mmc.pms.model.sale.dto.IndustrySpecPriceDTO;
+import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
+import com.mmc.pms.model.sale.vo.IndustrySkuVO;
+import com.mmc.pms.model.sale.vo.IndustrySpecVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.IndustrySpecService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -213,6 +219,7 @@ public class IndustrySpecServiceImpl implements IndustrySpecService {
                 for (ProductSkuDO e : productSkuList) {
                     GoodsProductSkuVO goodsProductSkuVO = new GoodsProductSkuVO();
                     goodsProductSkuVO.setId(d.getId());
+                    goodsProductSkuVO.setCategoryName(e.getCategoryName());
                     goodsProductSkuVO.setProductName(e.getProductName());
                     for (BrandInfoDO b : brandInfoList) {
                         if (e.getBrandInfoId().equals(b.getId())) {
@@ -294,7 +301,17 @@ public class IndustrySpecServiceImpl implements IndustrySpecService {
             return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count));
         }
         List<IndustrySpecDO> industrySpecList = industrySpecDao.listPageIndustrySpec((pageNo - 1) * pageSize, pageSize, industrySkuId, keyword);
-        List<IndustrySpecDTO> list = industrySpecList.stream().map(IndustrySpecDO::buildIndustrySpecDTO).collect(Collectors.toList());
+        List<Integer> specIds = industrySpecList.stream().map(IndustrySpecDO::getId).collect(Collectors.toList());
+        // 根据规格id批量查询价格信息
+        List<IndustrySpecPriceDO> industrySpecPrice = industrySpecDao.getIndustrySpecPriceList(specIds);
+        Map<Integer, List<IndustrySpecPriceDO>> priceMap = industrySpecPrice.stream().collect(Collectors.groupingBy(IndustrySpecPriceDO::getIndustrySpecId));
+        List<IndustrySpecDTO> list = industrySpecList.stream().map(d -> {
+            IndustrySpecDTO industrySpecDTO = d.buildIndustrySpecDTO();
+            if (!CollectionUtils.isEmpty(priceMap.get(d.getId()))) {
+                industrySpecDTO.setPriceList(priceMap.get(d.getId()).stream().map(IndustrySpecPriceDO::buildIndustrySpecPriceDTO).collect(Collectors.toList()));
+            }
+            return industrySpecDTO;
+        }).collect(Collectors.toList());
         return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count, list));
     }
 

src/main/java/com/mmc/pms/service/Impl/MiniProgramProductMallServiceImpl.java

@@ -5,9 +5,9 @@ import com.mmc.pms.common.ResultEnum;
 import com.mmc.pms.dao.MiniProgramProductMallDao;
 import com.mmc.pms.dao.WebDeviceDao;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.*;
 import com.mmc.pms.model.qo.GoodsInfoQO;
-import com.mmc.pms.model.vo.GoodsProductSkuVO;
+import com.mmc.pms.model.sale.dto.*;
+import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.MiniProgramProductMallService;
 import org.springframework.beans.BeanUtils;
@@ -59,10 +59,6 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall
         // 获取商品详情信息
         GoodsDetailDO goodsDetailDO = goodsInfoDao.getGoodsDetailByGoodsId(goodsId);
         appGoodsInfoDetailDTO.setGoodsDetail(goodsDetailDO.buildGoodsDetailInfoDTO());
-        // 获取常见问题信息
-        List<GoodsQaDO> goodsQaDO = goodsInfoDao.listGoodsQaInfoByGoodsId(goodsId);
-        appGoodsInfoDetailDTO.setQuestion(
-                goodsQaDO.stream().map(GoodsQaDO::buildGoodsQaDTO).collect(Collectors.toList()));
         // 获取其他服务信息
         List<GoodsServiceDO> goodsServiceDO = goodsInfoDao.listGoodsServiceByGoodsId(goodsId);
         appGoodsInfoDetailDTO.setOtherService(

src/main/java/com/mmc/pms/service/Impl/ProductServiceImpl.java

@@ -5,10 +5,10 @@ import com.mmc.pms.common.ResultEnum;
 import com.mmc.pms.dao.IndustrySpecDao;
 import com.mmc.pms.dao.ProductDao;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.lease.vo.PriceAcquisition;
 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.*;
+import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.ProductSkuService;
 import org.jetbrains.annotations.NotNull;

src/main/java/com/mmc/pms/service/Impl/WebAndMiniProgramCategoryServiceImpl.java

+package com.mmc.pms.service.Impl;
+
+import com.mmc.pms.service.WebAndMiniProgramCategoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author LW
+ * @date 2023/6/7 13:51
+ * 概要：
+ */
+@Service
+public class WebAndMiniProgramCategoryServiceImpl implements WebAndMiniProgramCategoryService {
+    
+
+}

src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java

@@ -3,9 +3,13 @@ package com.mmc.pms.service.Impl;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.dao.WebDeviceDao;
 import com.mmc.pms.entity.*;
-import com.mmc.pms.model.dto.*;
+import com.mmc.pms.model.lease.dto.*;
+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.model.sale.dto.SkuInfoDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,172 +24,174 @@ import java.util.stream.Collectors;
 @Service
 public class WebDeviceServiceImpl implements WebDeviceService {
 
-  @Autowired WebDeviceDao webDeviceDao;
-
-  @Override
-  public ResultBody listSecondDistrict() {
-    List<DistrictDO> list = webDeviceDao.listSecondDistrict();
-    List<DistrictInfoDTO> dtoList =
-        list.stream()
-            .map(
-                d -> {
-                  return d.builderDistrictInfoDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(dtoList);
-  }
-
-  @Override
-  public ResultBody category() {
-    List<DeviceCategory> category = webDeviceDao.category();
-    List<DeviceCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.deviceCategory();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody brand() {
-    List<Brand> brand = webDeviceDao.brand();
-    List<BrandDTO> collect =
-        brand.stream()
-            .map(
-                t -> {
-                  return t.brandDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody deviceBrand() {
-    List<Brand> brand = webDeviceDao.deviceBrand();
-    List<BrandDTO> collect =
-            brand.stream()
-                    .map(
-                            t -> {
-                              return t.brandDTO();
-                            })
-                    .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody model() {
-    List<Model> model = webDeviceDao.model();
-    List<ModelDTO> collect =
-        model.stream()
-            .map(
-                t -> {
-                  return t.modelDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody deviceModel() {
-    List<Model> model = webDeviceDao.deviceModel();
-    List<ModelDTO> collect =
-            model.stream()
-                    .map(
-                            t -> {
-                              return t.modelDTO();
-                            })
-                    .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody deviceList(
-      Integer districtId, Integer categoryId, Integer brandId, Integer modelId) {
-    List<DeviceListDO> deviceList =
-        webDeviceDao.deviceList(districtId, categoryId, brandId, modelId);
-    List<DeviceListDTO> collect =
-        deviceList.stream()
-            .map(
-                t -> {
-                  return t.deviceListDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-
-  @Override
-  public ResultBody update(LeaseVo param) {
-    InventoryDO inventory = webDeviceDao.findInventory(param.getInventoryId());
-    Integer residueCount = inventory.getResidueCount();
-    Integer count = residueCount - param.getInventoryUsage();
-    param.setInventoryUsage(count);
-    int update = webDeviceDao.update(param);
-    return ResultBody.success(update);
-  }
-
-  @Override
-  public ResultBody detail(Integer id) {
-    List<WareInfoDO> list = webDeviceDao.detail(id);
-    List<WareInfoItemDTO> pageList =
-        list.stream()
-            .map(
-                d -> {
-                  return d.buildWareInfoItemDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(pageList);
-  }
-
-  @Override
-  public ResultBody listWareInfoPage(WareInfoQO param) {
-    int count = webDeviceDao.countListWareInfoPage(param);
-    if (count == 0) {
-      return ResultBody.success(
-          PageResult.buildPage(param.getPageNo(), param.getPageSize(), count));
+    @Autowired
+    WebDeviceDao webDeviceDao;
+
+    @Override
+    public ResultBody listSecondDistrict() {
+        List<DistrictDO> list = webDeviceDao.listSecondDistrict();
+        List<DistrictInfoDTO> dtoList =
+                list.stream()
+                        .map(
+                                d -> {
+                                    return d.builderDistrictInfoDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(dtoList);
     }
-    int pageNo = param.getPageNo();
-    param.buildCurrentPage();
-    List<WareInfoDO> list = webDeviceDao.listWareInfoPage(param);
-    List<WareInfoItemDTO> pageList =
-        list.stream()
-            .map(
-                d -> {
-                  return d.buildWareInfoItemDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, pageList));
-  }
-
-  @Override
-  public WareInfoDTO getWareInfoById(Integer id) {
-    WareInfoDO wareInfoDO = webDeviceDao.getWareInfoById(id);
-    WareDetailDO wareDetailDO = webDeviceDao.getWareDetailById(id);
-    if (wareInfoDO != null) {
-      wareInfoDO.setWareDetailContent(wareDetailDO.getContent());
+
+    @Override
+    public ResultBody category() {
+        List<DeviceCategory> category = webDeviceDao.category();
+        List<DeviceCategoryDTO> collect =
+                category.stream()
+                        .map(
+                                t -> {
+                                    return t.deviceCategory();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody brand() {
+        List<Brand> brand = webDeviceDao.brand();
+        List<BrandDTO> collect =
+                brand.stream()
+                        .map(
+                                t -> {
+                                    return t.brandDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody deviceBrand() {
+        List<Brand> brand = webDeviceDao.deviceBrand();
+        List<BrandDTO> collect =
+                brand.stream()
+                        .map(
+                                t -> {
+                                    return t.brandDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody model() {
+        List<Model> model = webDeviceDao.model();
+        List<ModelDTO> collect =
+                model.stream()
+                        .map(
+                                t -> {
+                                    return t.modelDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody deviceModel() {
+        List<Model> model = webDeviceDao.deviceModel();
+        List<ModelDTO> collect =
+                model.stream()
+                        .map(
+                                t -> {
+                                    return t.modelDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody deviceList(
+            Integer districtId, Integer categoryId, Integer brandId, Integer modelId) {
+        List<DeviceListDO> deviceList =
+                webDeviceDao.deviceList(districtId, categoryId, brandId, modelId);
+        List<DeviceListDTO> collect =
+                deviceList.stream()
+                        .map(
+                                t -> {
+                                    return t.deviceListDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public ResultBody update(LeaseVo param) {
+        InventoryDO inventory = webDeviceDao.findInventory(param.getInventoryId());
+        Integer residueCount = inventory.getResidueCount();
+        Integer count = residueCount - param.getInventoryUsage();
+        param.setInventoryUsage(count);
+        int update = webDeviceDao.update(param);
+        return ResultBody.success(update);
+    }
+
+    @Override
+    public ResultBody detail(Integer id) {
+        List<WareInfoDO> list = webDeviceDao.detail(id);
+        List<WareInfoItemDTO> pageList =
+                list.stream()
+                        .map(
+                                d -> {
+                                    return d.buildWareInfoItemDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(pageList);
+    }
+
+    @Override
+    public ResultBody listWareInfoPage(WareInfoQO param) {
+        int count = webDeviceDao.countListWareInfoPage(param);
+        if (count == 0) {
+            return ResultBody.success(
+                    PageResult.buildPage(param.getPageNo(), param.getPageSize(), count));
+        }
+        int pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        List<WareInfoDO> list = webDeviceDao.listWareInfoPage(param);
+        List<WareInfoItemDTO> pageList =
+                list.stream()
+                        .map(
+                                d -> {
+                                    return d.buildWareInfoItemDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, pageList));
+    }
+
+    @Override
+    public WareInfoDTO getWareInfoById(Integer id) {
+        WareInfoDO wareInfoDO = webDeviceDao.getWareInfoById(id);
+        WareDetailDO wareDetailDO = webDeviceDao.getWareDetailById(id);
+        if (wareInfoDO != null) {
+            wareInfoDO.setWareDetailContent(wareDetailDO.getContent());
+        }
+        return wareInfoDO == null ? null : wareInfoDO.buildWareInfoDTO();
+    }
+
+    @Override
+    public ResultBody<AdDTO> ad() {
+        List<AdDO> ad = webDeviceDao.ad();
+        List<AdDTO> collect =
+                ad.stream()
+                        .map(
+                                t -> {
+                                    return t.adDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
+    public List<SkuInfoDTO> listWareSkuById(Integer id) {
+        List<SkuInfoDO> skuInfoDOS = webDeviceDao.listSkuInfo(id);
+        return skuInfoDOS.isEmpty() ? null : skuInfoDOS.stream().map(d -> {
+            return d.buildSkuInfoDTO();
+        }).collect(Collectors.toList());
     }
-    return wareInfoDO == null ? null : wareInfoDO.buildWareInfoDTO();
-  }
-
-  @Override
-  public ResultBody<AdDTO> ad() {
-    List<AdDO> ad = webDeviceDao.ad();
-    List<AdDTO> collect =
-            ad.stream()
-                    .map(
-                            t -> {
-                              return t.adDTO();
-                            })
-                    .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
-  @Override
-  public List<SkuInfoDTO> listWareSkuById(Integer id) {
-    List<SkuInfoDO> skuInfoDOS = webDeviceDao.listSkuInfo(id);
-    return skuInfoDOS.isEmpty() ? null : skuInfoDOS.stream().map(d -> {
-      return d.buildSkuInfoDTO();
-    }).collect(Collectors.toList());
-  }
 
 }

src/main/java/com/mmc/pms/service/Impl/WebProductMallServiceImpl.java

@@ -5,10 +5,10 @@ import com.mmc.pms.dao.WebProductMallDao;
 import com.mmc.pms.entity.AdDO;
 import com.mmc.pms.entity.GoodsInfoDO;
 import com.mmc.pms.entity.ProductCategory;
-import com.mmc.pms.model.dto.AdDTO;
-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.GoodsInfoListDTO;
 import com.mmc.pms.page.PageResult;
 import com.mmc.pms.service.WebProductMallService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,66 +23,67 @@ import java.util.stream.Collectors;
 @Service
 public class WebProductMallServiceImpl implements WebProductMallService {
 
-  @Autowired private WebProductMallDao webProductMallDao;
+    @Autowired
+    private WebProductMallDao webProductMallDao;
 
-  @Override
-  public ResultBody productCategory() {
-    List<ProductCategory> category = webProductMallDao.productCategory();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
+    @Override
+    public ResultBody productCategory() {
+        List<ProductCategory> category = webProductMallDao.productCategory();
+        List<ProductCategoryDTO> collect =
+                category.stream()
+                        .map(
+                                t -> {
+                                    return t.productCategoryDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
 
-  @Override
-  public ResultBody productParts() {
-    List<ProductCategory> category = webProductMallDao.productParts();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
+    @Override
+    public ResultBody productParts() {
+        List<ProductCategory> category = webProductMallDao.productParts();
+        List<ProductCategoryDTO> collect =
+                category.stream()
+                        .map(
+                                t -> {
+                                    return t.productCategoryDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
 
-  @Override
-  public ResultBody productQuality() {
-    List<ProductCategory> category = webProductMallDao.productQuality();
-    List<ProductCategoryDTO> collect =
-        category.stream()
-            .map(
-                t -> {
-                  return t.productCategoryDTO();
-                })
-            .collect(Collectors.toList());
-    return ResultBody.success(collect);
-  }
+    @Override
+    public ResultBody productQuality() {
+        List<ProductCategory> category = webProductMallDao.productQuality();
+        List<ProductCategoryDTO> collect =
+                category.stream()
+                        .map(
+                                t -> {
+                                    return t.productCategoryDTO();
+                                })
+                        .collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
 
-  @Override
-  public PageResult listPageGoodsInfo(GoodsInfoQO param) {
-    int count = webProductMallDao.countListGoodsInfo(param);
-    if (count == 0) {
-      return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
+    @Override
+    public PageResult listPageGoodsInfo(GoodsInfoQO param) {
+        int count = webProductMallDao.countListGoodsInfo(param);
+        if (count == 0) {
+            return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
+        }
+        Integer pageNo = param.getPageNo();
+        param.buildCurrentPage();
+        List<GoodsInfoDO> goodsInfo = webProductMallDao.listGoodsInfo(param);
+        goodsInfo.stream()
+                .forEach(
+                        t -> {
+                            Integer product = webProductMallDao.findProduct(t.getId());
+                            t.setIsCoupons(product);
+                        });
+        List<GoodsInfoListDTO> pageList =
+                goodsInfo.stream().map(GoodsInfoDO::buildGoodsInfoListDTO).collect(Collectors.toList());
+        return PageResult.buildPage(pageNo, param.getPageSize(), count, pageList);
     }
-    Integer pageNo = param.getPageNo();
-    param.buildCurrentPage();
-    List<GoodsInfoDO> goodsInfo = webProductMallDao.listGoodsInfo(param);
-    goodsInfo.stream()
-        .forEach(
-            t -> {
-              Integer product = webProductMallDao.findProduct(t.getId());
-              t.setIsCoupons(product);
-            });
-    List<GoodsInfoListDTO> pageList =
-        goodsInfo.stream().map(GoodsInfoDO::buildGoodsInfoListDTO).collect(Collectors.toList());
-    return PageResult.buildPage(pageNo, param.getPageSize(), count, pageList);
-  }
 
     @Override
     public ResultBody<AdDTO> ad() {

src/main/java/com/mmc/pms/service/IndustrySpecService.java

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-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.model.sale.dto.IndustrySpecCPQVO;
+import com.mmc.pms.model.sale.vo.IndustrySkuVO;
+import com.mmc.pms.model.sale.vo.IndustrySpecVO;
 
 /**
  * @Author LW

src/main/java/com/mmc/pms/service/ProductSkuService.java

@@ -2,11 +2,11 @@ package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.entity.ProductSpecPriceDO;
-import com.mmc.pms.model.dto.ProductSkuVO;
-import com.mmc.pms.model.dto.ProductSpecVO;
+import com.mmc.pms.model.lease.vo.PriceAcquisition;
 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.ProductSpecVO;
+import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/com/mmc/pms/service/WebAndMiniProgramCategoryService.java

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

src/main/java/com/mmc/pms/service/WebDeviceService.java

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.AdDTO;
-import com.mmc.pms.model.dto.ModelDTO;
-import com.mmc.pms.model.dto.SkuInfoDTO;
-import com.mmc.pms.model.dto.WareInfoDTO;
+import com.mmc.pms.model.lease.dto.WareInfoDTO;
+import com.mmc.pms.model.lease.vo.LeaseVo;
+import com.mmc.pms.model.other.dto.AdDTO;
 import com.mmc.pms.model.qo.WareInfoQO;
-import com.mmc.pms.model.vo.LeaseVo;
-import  com.mmc.pms.model.dto.SkuInfoDTO;
+import com.mmc.pms.model.sale.dto.SkuInfoDTO;
 
 import java.util.List;
 
@@ -15,29 +13,29 @@ import java.util.List;
  * @Author small @Date 2023/5/15 14:28 @Version 1.0
  */
 public interface WebDeviceService {
-  ResultBody listSecondDistrict();
+    ResultBody listSecondDistrict();
 
-  ResultBody category();
+    ResultBody category();
 
-  ResultBody brand();
+    ResultBody brand();
 
-  ResultBody deviceBrand();
+    ResultBody deviceBrand();
 
-  ResultBody model();
+    ResultBody model();
 
-  ResultBody deviceModel();
+    ResultBody deviceModel();
 
-  ResultBody deviceList(Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
+    ResultBody deviceList(Integer districtId, Integer categoryId, Integer brandId, Integer modelId);
 
-  ResultBody update(LeaseVo param);
+    ResultBody update(LeaseVo param);
 
-  ResultBody detail(Integer id);
+    ResultBody detail(Integer id);
 
-  ResultBody listWareInfoPage(WareInfoQO param);
+    ResultBody listWareInfoPage(WareInfoQO param);
 
-  WareInfoDTO getWareInfoById(Integer id);
+    WareInfoDTO getWareInfoById(Integer id);
 
     ResultBody<AdDTO> ad();
 
-  List<SkuInfoDTO> listWareSkuById(Integer id);
+    List<SkuInfoDTO> listWareSkuById(Integer id);
 }

src/main/java/com/mmc/pms/service/WebProductMallService.java

 package com.mmc.pms.service;
 
 import com.mmc.pms.common.ResultBody;
-import com.mmc.pms.model.dto.AdDTO;
+import com.mmc.pms.model.other.dto.AdDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.page.PageResult;
 

src/main/resources/mapper/CategoriesDao.xml

@@ -25,9 +25,9 @@
         is_deleted
     </sql>
     <insert id="insertDirectory">
-        insert into directory(directory_name, relevance,
+        insert into directory(directory_name, pid,
                               `type`)
-        values (#{directoryName}, #{relevance}, #{type})
+        values (#{directoryName}, #{pid}, #{type})
     </insert>
     <insert id="insertClassification">
         insert into categories (parent_id,
@@ -42,7 +42,7 @@
     <update id="updateDirectory">
         update directory
         set directory_name = #{directoryName},
-            relevance      = #{relevance},
+            pid            = #{pid},
             `type`         = #{type}
         where id = #{id}
     </update>
@@ -75,7 +75,7 @@
     <select id="countUpdateDirectoryName" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM directory
         WHERE directory_name = #{directoryName} and is_deleted = 0 and `type` = #{type}
-        <if test="id!=null and id!=''">
+        <if test="id!=null">
             and id <![CDATA[<>]]> #{id}
         </if>
     </select>
@@ -85,13 +85,22 @@
         where is_deleted = 0
     </select>
     <select id="directoryList" resultType="com.mmc.pms.entity.Directory">
-        select id,
-               directory_name,
-               relevance,
-               `type`,
-               create_time
-        from directory
-        where is_deleted = 0
+        SELECT d.id,
+        d.directory_name,
+        d.pid,
+        d.`type`,
+        d.create_time,
+        dt.directory_name relevanceName
+        FROM `directory` d
+        LEFT JOIN `directory` dt ON dt.id = d.pid
+        <where>
+            d.is_deleted = 0
+            <if test="type != null">
+                and d.type = #{type}
+            </if>
+        </where>
+        ORDER BY create_time DESC
+        limit #{pageNo}, #{pageSize}
     </select>
     <select id="countDirectory" resultType="java.lang.Integer">
         SELECT count(*)
@@ -153,4 +162,28 @@
           AND directory_id = #{directoryId}
           AND `type` = #{type}
     </select>
+    <select id="selectDirectoryById" resultType="java.lang.Integer">
+        select count(*)
+        from directory
+        where id = #{id}
+          and is_default = 0
+    </select>
+    <select id="getDirectoryList" resultType="com.mmc.pms.entity.Directory">
+        SELECT d.id,
+               d.directory_name,
+               d.pid,
+               d.`type`,
+               d.create_time
+        FROM `directory` d
+        WHERE d.is_deleted = 0
+            AND d.type = #{type}
+           OR d.type = 0
+            AND d.pid IS NULL
+        ORDER BY create_time DESC
+    </select>
+    <update id="deleteById">
+        UPDATE `categories`
+        SET `is_deleted` = 1
+        WHERE `id` = #{id};
+    </update>
 </mapper>

src/main/resources/mapper/GoodsInfoDao.xml

@@ -397,4 +397,14 @@
         </foreach>
         )
     </select>
+    <select id="ListGoodsInfoByCategoryId" resultType="com.mmc.pms.entity.GoodsInfo">
+        SELECT gi.id,
+               gi.goods_name,
+               gi.shelf_status,
+               im.img_url mainImg
+        FROM goods_info gi
+                 INNER JOIN goods_img im ON gi.id = im.goods_info_id
+            AND im.img_type = 0
+        WHERE gi.category_by_one = #{id}
+    </select>
 </mapper>

src/main/resources/mapper/IndustrySpecDao.xml

@@ -7,11 +7,13 @@
         insert into industry_sku (solution_name, categories_id, description)
         values (#{solutionName}, #{categoriesId}, #{description})
     </insert>
-    <insert id="insertIndustrySpec">
+    <insert id="insertIndustrySpec" parameterType="com.mmc.pms.entity.IndustrySpecDO"
+            useGeneratedKeys="true" keyProperty="id">
         insert into industry_spec (industry_sku_id, spec_name, spec_image)
         values (#{industrySkuId}, #{specName}, #{specImage})
     </insert>
-    <insert id="insertIndustryProductInventory">
+    <insert id="insertIndustryProductInventory" parameterType="com.mmc.pms.entity.IndustryProductInventoryDO"
+            useGeneratedKeys="true" keyProperty="id">
         insert into industry_product_inventory (industry_spec_id, product_id, is_selected)
         values (#{industrySpecId}, #{productSkuId}, #{selected})
     </insert>
@@ -213,7 +215,7 @@
         WHERE id = #{id}
           AND is_deleted = 0
     </select>
-    <select id="getIndustryProductInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO">
+    <select id="getIndustryProductInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
         SELECT id,
                industry_spec_id industrySpecId,
                product_id       productSkuId,
@@ -283,7 +285,7 @@
             #{d}
         </foreach>)
     </select>
-    <select id="listIndustryProdInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO">
+    <select id="listIndustryProdInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
         SELECT
         id,
         industry_spec_id industrySpecId,
@@ -356,4 +358,17 @@
         </foreach>
         )
     </select>
+    <select id="getIndustrySpecPriceList" resultType="com.mmc.pms.entity.IndustrySpecPriceDO">
+        SELECT
+        id,
+        industry_spec_id industrySpecId,
+        tag_info_id tagInfoId,
+        price
+        FROM
+        industry_spec_price
+        WHERE industry_spec_id in (
+        <foreach collection="list" separator="," index="index" item="d">
+            #{d}
+        </foreach>)
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/MiniProgramProductMallDao.xml

@@ -315,7 +315,7 @@
         ORDER BY sort ASC
     </select>
 
-    <select id="getIndustryProductInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO">
+    <select id="getIndustryProductInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
         SELECT id,
                industry_spec_id industrySpecId,
                product_id       productSkuId,

src/main/resources/mapper/ProductDao.xml

@@ -213,7 +213,7 @@
     </select>
     <select id="listProductSpec" resultType="com.mmc.pms.entity.ProductSpecDO">
         select id,
-               product_id,
+               product_id productSkuId,
                spec_name,
                spec_image,
                part_no,
@@ -227,13 +227,15 @@
         SELECT ps.id,
         ps.product_name productName,
         ps.model,
-        ps.product_brand productBrand,
+        ps.categories_id,
         ps.brand_info_id brandInfoId,
         ps.create_time createTime,
         c.id categoriesId,
-        c.type_name categoryName
+        c.name categoryName,
+        bi.brand_name brandName
         FROM product ps
-        INNER JOIN categories c ON ps.goods_type_id = c.id
+        INNER JOIN categories c ON ps.categories_id = c.id
+        LEFT JOIN brand_info bi ON ps.brand_info_id = bi.id
         where ps.id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
@@ -359,7 +361,7 @@
         </foreach>
         )
     </select>
-    <select id="feignGetUnitPrice" resultType="com.mmc.pms.model.dto.ProductSpecPriceDTO">
+    <select id="feignGetUnitPrice" resultType="com.mmc.pms.model.sale.dto.ProductSpecPriceDTO">
         select price
         from product_spec_price
         where product_spec_id = #{id}
@@ -399,7 +401,7 @@
         </foreach>
         )
     </select>
-    <select id="listProdGoodsSkuInfo" resultType="com.mmc.pms.model.dto.OrderGoodsProdDTO">
+    <select id="listProdGoodsSkuInfo" resultType="com.mmc.pms.model.order.dto.OrderGoodsProdDTO">
         SELECT
         gi.id as goods_info_id,gi.goods_name,gi.goods_no,gi.directory_id,
         gimg.img_url as mainImg,

src/main/resources/mapper/WebAndMiniProgramCategoryDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mmc.pms.dao.WebAndMiniProgramCategoryDao">
+
+</mapper>
\ No newline at end of file