Merge branch 'develop' of github.com:sharefly-iuav/pms into develop

kustomization/mysql-external.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: mysql #此名字随便起
+  namespace: default  #在固定的命名空间下
+spec:
+  type: ExternalName
+  externalName: rm-wz9dd796t4j1giz6t.mysql.rds.aliyuncs.com
+  ports:
+    - port: 3306
+
+###  ExternalName类型的服务创建后，pod可以通过my-mysql-external.default.svc.cluster.local域名连接到外部服务，
+####  或者通过my-mysql-external。当需要指向其他外部服务时，只需要修改spec.externalName的值即可。
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 0d859e2f696547afc10400b3f8d18beb47e8e6e3
+  newTag: 581f9d969edde40480c9dd33aa87cad6205992a1

kustomization/overlays/prod/increase_replicas.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: pms-deployment
+spec:
+  replicas: 1
+#  template:
+#    spec:
+#      nodeName: master

kustomization/overlays/prod/kustomization.yaml

@@ -9,6 +9,7 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
+- path: ./increase_replicas.yaml
 - path: ./configMap.yaml
 - path: ./service-patch.yaml
   target:

pom.xml

@@ -68,9 +68,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.24</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>2.0.32</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
         </dependency>
         <!--<dependency>
             <groupId>cn.hutool</groupId>
@@ -102,7 +107,11 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>3.0.2</version>
         </dependency>
-
+        <!--  <dependency>
+              <groupId>com.taobao.arthas</groupId>
+              <artifactId>arthas-spring-boot-starter</artifactId>
+              <version>3.6.3</version>
+          </dependency>-->
         <dependency>
             <groupId>com.deepoove</groupId>
             <artifactId>poi-tl</artifactId>

src/main/java/com/mmc/pms/common/FlyerAccountType.java

+package com.mmc.pms.common;
+
+/**
+ * @Author small @Date 2023/5/25 9:58 @Version 1.0
+ */
+public enum FlyerAccountType {
+  YK(0, "游客"),
+  PT(1, "普通用户"),
+  GR(2, "个人飞手"),
+  JG(3, "飞手机构");
+
+  FlyerAccountType(Integer code, String status) {
+    this.code = code;
+    this.status = status;
+  }
+
+  private Integer code;
+  private String status;
+
+  public Integer getCode() {
+    return code;
+  }
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  public String getStatus() {
+    return status;
+  }
+
+  public void setStatus(String status) {
+    this.status = status;
+  }
+}

src/main/java/com/mmc/pms/common/Page.java

+package com.mmc.pms.common;
+
+/**
+ * @Author small @Date 2023/5/25 9:52 @Version 1.0
+ */
+public interface Page {}

src/main/java/com/mmc/pms/common/ResultBody.java

 package com.mmc.pms.common;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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.service.BrandManageService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author LW
+ * @date 2023/3/14 13:22
+ * 概要：
+ */
+@RestController
+@RequestMapping("/brand")
+@Api(tags = {"品牌管理-相关接口"})
+public class BackstageBrandManageController {
+
+    @Autowired
+    private BrandManageService brandManageService;
+
+    @ApiOperation(value = "新增品牌")
+    @GetMapping("addBrandInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addBrandInfo(@ApiParam(value = "品牌名称") @RequestParam String brandName) {
+        return brandManageService.addBrandInfo(brandName);
+    }
+
+    @ApiOperation(value = "品牌列表")
+    @GetMapping("listBrandInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = BrandInfoDTO.class)})
+    public ResultBody listBrandInfo(@RequestParam Integer pageNo, @RequestParam Integer pageSize) {
+        return ResultBody.success(brandManageService.listBrandInfo(pageNo, pageSize));
+    }
+
+//    @ApiOperation(value = "删除品牌")
+//    @GetMapping("deleteBrandInfo")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+//    public ResultBody deleteBrandInfo(Integer id) {
+//        return brandManageService.deleteBrandInfo(id);
+//    }
+
+    @ApiOperation(value = "编辑品牌")
+    @GetMapping("editBrandInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody editBrandInfo(Integer id, String brandName) {
+        return brandManageService.editBrandInfo(id, brandName);
+    }
+
+}

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.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.*;
+
+/**
+ * @Author lw @Date 2023/5/15 13:24 @Version 1.0
+ */
+@Api(tags = {"后台-分类管理-接口"})
+@RestController
+@RequestMapping("/classify")
+public class BackstageCategoriesController {
+    @Autowired
+    private CategoriesService categoriesService;
+
+    @ApiOperation(value = "新增or修改目录")
+    @PostMapping("addOrEditDirectory")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addOrEditDirectory(@RequestBody DirectoryInfoVO param) {
+        return categoriesService.addOrEditDirectory(param);
+    }
+
+    @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));
+    }
+
+    @ApiOperation(value = "删除目录")
+    @GetMapping("removeDirectory")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody removeDirectory(@ApiParam(value = "id") @RequestParam(value = "id") Integer id) {
+        return categoriesService.removeDirectory(id);
+    }
+
+    @ApiOperation(value = "分类新增")
+    @PostMapping("addClassification")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addClassification(@Validated(Create.class) @RequestBody ClassifyInfoVO classifyInfoVO) {
+        return categoriesService.addClassification(classifyInfoVO);
+    }
+
+
+    @ApiOperation(value = "分类修改")
+    @PostMapping("updateClassification")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody updateClassification(@Validated(Update.class) @RequestBody ClassifyInfoVO classifyInfoVO) {
+        return categoriesService.updateClassification(classifyInfoVO);
+    }
+
+    @ApiOperation(value = "分类信息-排序")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("exchangeSortType")
+    public ResultBody exchangeSortType(@ApiParam(value = "第一个分类id", required = true) @RequestParam(value = "firstId") Integer firstId,
+                                       @ApiParam(value = "第二个分类id", required = true) @RequestParam(value = "secondId") Integer secondId) {
+        return categoriesService.exchangeSortType(firstId, secondId);
+    }
+
+    @ApiOperation(value = "分类信息-列表")
+    @PostMapping("getClassificationList")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyInfoDTO.class)})
+    public ResultBody getClassificationList(@RequestBody QueryClassifyVO queryClassifyVO) {
+        return ResultBody.success(categoriesService.getClassificationList(queryClassifyVO));
+    }
+
+
+    @ApiOperation(value = "分类详情")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyDetailsDTO.class)})
+    @GetMapping("getClassifyDetails")
+    public ResultBody getClassifyDetails(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id) {
+        return categoriesService.getClassifyDetails(id);
+    }
+}

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.vo.Create;
+import com.mmc.pms.model.vo.GoodsAddVO;
+import com.mmc.pms.model.vo.Update;
+import com.mmc.pms.service.GoodsInfoService;
+import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author LW
+ * @date 2023/3/14 13:22
+ * 概要：
+ */
+@RestController
+@RequestMapping("/goods")
+@Api(tags = {"商品管理-相关接口"})
+public class BackstageGoodsManageController {
+    @Resource
+    private GoodsInfoService goodsInfoService;
+
+    @ApiOperation(value = "新增(租赁/销售)商品")
+    @PostMapping("addGoodsInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addGoods(@ApiParam("商品信息VO") @Validated(Create.class) @RequestBody GoodsAddVO goodsAddVO) {
+        return goodsInfoService.addGoods(goodsAddVO);
+    }
+
+    @ApiOperation(value = "修改(租赁/销售)商品")
+    @PostMapping("editGoodsInfo")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody editGoodsInfo(@ApiParam("商品信息VO") @Validated(Update.class) @RequestBody GoodsAddVO goodsAddVO) {
+        return goodsInfoService.editGoodsInfo(goodsAddVO);
+    }
+}

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.qo.ProductSkuQO;
+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.service.ProductSkuService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author LW
+ * @date 2022/9/22 10:28
+ * 概要：
+ */
+@RestController
+@RequestMapping("/product/spec/")
+@Api(tags = {"产品管理模块-相关接口"})
+public class BackstageProductSpecController {
+    @Autowired
+    private ProductSkuService productSkuService;
+
+    @ApiOperation(value = "新增产品sku")
+    @PostMapping("addProductSku")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addProductSku(@Validated(Create.class) @ApiParam("产品skuVO") @RequestBody ProductSkuVO param) {
+        return productSkuService.addProductSku(param);
+    }
+
+    @ApiOperation(value = "产品sku详情")
+    @GetMapping("getProductSkuDetail")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSkuDTO.class)})
+    public ResultBody getProductSkuDetail(@ApiParam("id") @RequestParam(value = "id") Integer id) {
+        return productSkuService.getProductSkuDetail(id);
+    }
+
+    @ApiOperation(value = "编辑产品sku")
+    @PostMapping("editProductSku")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody editProductSku(@Validated(Update.class) @ApiParam("产品skuVO") @RequestBody ProductSkuVO param) {
+        return productSkuService.editProductSku(param);
+    }
+
+    @ApiOperation(value = "产品sku分页列表")
+    @PostMapping("listPageProductSku")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSkuDTO.class)})
+    public ResultBody listPageProductSku(@ApiParam("条件参数") @RequestBody ProductSkuQO productSkuQO) {
+        return productSkuService.listPageProductSku(productSkuQO);
+    }
+
+    //    @ApiOperation(value = "产品sku管理---删除产品sku")
+//    @GetMapping("removeProductSku")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+//    public ResultBody removeProductSku(@ApiParam("id") @RequestParam(value = "id") Integer id) {
+//        return productSpecService.removeProductSku(id);
+//    }
+//
+    @ApiOperation(value = "新增or修改产品规格")
+    @PostMapping("addOrEditProductSpec")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody addOrEditProductSpec(@Validated({Create.class, Update.class}) @ApiParam("产品规格VO") @RequestBody ProductSpecVO param) {
+        return productSkuService.addOrEditProductSpec(param);
+    }
+
+    @ApiOperation(value = "产品规格编辑回显")
+    @GetMapping("getProductSpecDetail")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecDTO.class)})
+    public ResultBody getProductSpecDetail(@ApiParam("id") @RequestParam(value = "id") Integer id) {
+        return productSkuService.getProductSpecDetail(id);
+    }
+
+    @ApiOperation(value = "产品规格分页列表")
+    @GetMapping("listPageProductSpec")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecDTO.class)})
+    public ResultBody listPageProductSpec(@ApiParam(value = "页码") @RequestParam(value = "pageNo") Integer pageNo,
+                                          @ApiParam(value = "每页显示数") @RequestParam(value = "pageSize") Integer pageSize,
+                                          @ApiParam(value = "产品skuId") @RequestParam(value = "productSkuId") Integer productSkuId) {
+        return productSkuService.listPageProductSpec(pageNo, pageSize, productSkuId);
+    }
+
+    @ApiOperation(value = "产品规格管理-价格配置")
+    @PostMapping("productSpecCPQ")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody productSpecCPQ(@RequestBody ProductSpecCPQVO productSpecCPQVO) {
+        return productSkuService.productSpecCPQ(productSpecCPQVO);
+    }
+
+
+    @ApiOperation(value = "价格配置信息的修改")
+    @PostMapping("updateProductSpecCPQ")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody updateProductSpecCPQ(@RequestBody ProductSpecCPQVO productSpecCPQVO) {
+        return productSkuService.updateProductSpecCPQ(productSpecCPQVO);
+    }
+
+    @ApiOperation(value = "产品规格管理---获取价格配置信息")
+    @PostMapping("getProductSpecCPQ")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecPriceDTO.class)})
+    public ResultBody getProductSpecCPQ(@RequestBody ProductSpecCPQVO productSpecCPQVO) {
+        return productSkuService.getProductSpecCPQ(productSpecCPQVO);
+    }
+
+    //
+//    @ApiOperation(value = "价格配置信息--恢复全局默认设置")
+//    @GetMapping("getDefaultSettings")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ProductSpecPriceDTO.class)})
+//    public ResultBody getDefaultSettings(@ApiParam(value = "规格id") @RequestParam(value = "productSpecId") Integer productSpecId) {
+//        return productSpecService.getDefaultSettings(productSpecId);
+//    }
+//
+//    @ApiOperation(value = "产品规格管理---删除规格")
+//    @GetMapping("removeProductSpec")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RemoveSkuDTO.class)})
+//    public ResultBody removeProductSpec(@ApiParam("id") @RequestParam(value = "id") Integer id) {
+//        return productSpecService.removeProductSpec(id);
+//    }
+//
+//    @ApiOperation(value = "feign根据渠道等级获取单价信息")
+//    @GetMapping("feignGetUnitPriceByTag")
+//    @ApiIgnore
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK",response = ProductSpecPriceDTO.class)})
+//    public ProductSpecPriceDTO feignGetUnitPriceByTag(@RequestParam(value = "specId")Integer specId,
+//                                                      @RequestParam(value = "tagId")Integer tagId) {
+//        return productSpecService.feignGetUnitPriceByTag(specId,tagId);
+//    }
+}

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

+package com.mmc.pms.dao;
+
+
+import com.mmc.pms.entity.BrandInfoDO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @Author LW
+ * @date 2023/3/14 13:27
+ * 概要：
+ */
+@Mapper
+public interface BrandManageDao {
+
+    /**
+     * 插入品牌信息
+     *
+     * @param brandInfoDO 品牌信息
+     * @return int
+     */
+    void insertBrandInfo(BrandInfoDO brandInfoDO);
+
+    /**
+     * 数品牌信息名字
+     * 品牌信息名字计数
+     *
+     * @param brandName 品牌名称
+     * @param id        id
+     * @return int
+     */
+    int countBrandInfoByName(Integer id, String brandName);
+
+    /**
+     * 通过id删除品牌信息
+     *
+     * @param id id
+     */
+    void removeBrandInfoById(Integer id);
+
+    /**
+     * 品牌信息id列表
+     *
+     * @param ids id
+     * @return {@link List}<{@link BrandInfoDO}>
+     */
+    List<BrandInfoDO> listBrandInfoByIds(@Param("ids") Set<Integer> ids);
+
+    /**
+     * 品牌列表信息
+     *
+     * @param itemIndex 项指数
+     * @param pageSize  页面大小
+     * @return {@link List}<{@link BrandInfoDO}>
+     */
+    List<BrandInfoDO> listBrandInfo(Integer itemIndex, Integer pageSize);
+
+    /**
+     * 数品牌信息
+     *
+     * @return int
+     */
+    int countBrandInfo();
+
+    /**
+     * 更新品牌信息
+     *
+     * @param brandInfoDO 品牌信息做
+     */
+    void updateBrandInfo(BrandInfoDO brandInfoDO);
+}

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

+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 org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author 23214
+ * @description 针对表【categories(通用分类表)】的数据库操作Mapper
+ * @createDate 2023-05-24 10:29:28
+ * @Entity com.mmc.pms.entity.Categories
+ */
+@Mapper
+public interface CategoriesDao {
+
+    int countUpdateDirectoryName(DirectoryInfoVO param);
+
+    void insertDirectory(Directory directory);
+
+    void updateDirectory(Directory directory);
+
+    int countDirectoryList();
+
+    List<Directory> directoryList(int i, Integer pageSize);
+
+    int countDirectory(Integer id);
+
+    void removeDirectory(Integer id);
+
+    int countClassificationByName(ClassifyInfoVO classifyInfoVO);
+
+    int getCountCategoriesByPid(Integer pid, Integer type);
+
+    void insertClassification(Categories categories);
+
+    void updateClassification(ClassifyInfoVO classifyInfoVO);
+
+    Categories getGoodsGroupById(Integer id);
+
+    int updateTypeSort(Integer firstId, Integer sort);
+
+    List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO);
+
+    int countListClassification(QueryClassifyVO queryClassifyVO);
+}
+
+
+
+

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 org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author 23214
+ * @description 针对表【goods_info(商品基本信息)】的数据库操作Mapper
+ * @createDate 2023-05-27 14:08:45
+ * @Entity com.mmc.pms.entity.GoodsInfo
+ */
+@Mapper
+public interface GoodsInfoDao {
+
+    int countGoodsInfoByName(GoodsAddVO goodsAddVO);
+
+    void insertGoodsInfo(GoodsInfo goodsInfo);
+
+    int countGoodsInfo();
+
+    void insertGoodsImgInfo(List<GoodsImgDO> list);
+
+    void insertVideoInfo(GoodsVideoDO goodsVideoDO);
+
+    void insertGoodsDetail(GoodsDetailDO goodsDetailDO);
+
+    void insertGoodsService(List<GoodsServiceDO> otherList);
+
+    int countGoodsInfoById(Integer id);
+
+    void updateGoodsInfo(GoodsInfo goodsInfo);
+
+    void updateGoodsDetail(GoodsDetailDO goodsDetailDO);
+
+    List<GoodsImgDO> listGoodsInfoByGoodsId(Integer id);
+
+    void deleteImgByIds(List<Integer> deleteIds);
+
+    void deleteGoodsVideoById(Integer id);
+
+    void deleteGoodsServiceByGoodsId(Integer id);
+}
+
+
+
+

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

+package com.mmc.pms.dao;
+
+import com.mmc.pms.entity.MallProdSkuInfoDO;
+import com.mmc.pms.entity.ProductSkuDO;
+import com.mmc.pms.entity.ProductSpecDO;
+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.qo.ProductSkuQO;
+import com.mmc.pms.model.vo.ProductSpecCPQVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author 23214
+ * @description 针对表【product_sku(产品sku表)】的数据库操作Mapper
+ * @createDate 2023-05-25 14:55:56
+ * @Entity com.mmc.pms.entity.ProductSku
+ */
+@Mapper
+public interface ProductSkuDao {
+
+    int countSkuName(ProductSkuVO param);
+
+    int insertProductSku(ProductSkuDO productSkuDO);
+
+    int countSkuIsExist(Integer id);
+
+    ProductSkuDO getProductSkuDetail(Integer id);
+
+    int updateProductSku(ProductSkuDO productSkuDO);
+
+    int countListPageProductSku(ProductSkuQO productSkuQO);
+
+    List<ProductSkuDO> listPageProductSku(ProductSkuQO productSkuQO);
+
+    int countSpecName(ProductSpecVO param);
+
+    int insertProductSpec(ProductSpecDO productSpecDO);
+
+    int updateProductSpec(ProductSpecDO productSpecDO);
+
+    int countSpecIsExist(Integer id);
+
+    ProductSpecDO getProductSpecDetail(Integer id);
+
+    int countListPageProductSpec(Integer productSkuId);
+
+    List<ProductSpecDO> listPageProductSpec(int i, Integer pageSize, Integer productSkuId);
+
+    int batchInsertSpecPrice(List<ProductSpecPriceDO> list);
+
+
+    void batchInsertLeaseSpecPrice(List<ProductSpecPriceDO> list);
+
+    void removeProductSpecCPQ(ProductSpecCPQVO productSpecCPQVO);
+
+    List<ProductSpecPriceDO> getProductSpecPrice(ProductSpecCPQVO productSpecCPQVO);
+
+    void insertMallProdSkuInfo(MallProdSkuInfoDO mallProdSkuInfoDO);
+}
+
+
+
+

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

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.BrandInfoDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author LW
+ * @date 2022/6/20 16:33
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BrandInfoDO implements Serializable {
+
+    private static final long serialVersionUID = 2832084701380349536L;
+    private Integer id;
+    private String brandName;
+    private Date createTime;
+    private Date updateTime;
+    private Integer delete;
+
+    public BrandInfoDO(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public BrandInfoDTO buildBrandInfoDTO() {
+        return BrandInfoDTO.builder().id(id).brandName(brandName).createTime(createTime).build();
+    }
+}

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 lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lw
+ * @TableName categories
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Categories implements Serializable {
+    private Integer id;
+
+    private Integer parentId;
+
+    private String name;
+
+    private String icon;
+
+    private String description;
+
+    private Integer sort;
+
+    private Integer type;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer deleted;
+    private Integer directoryId;
+    private String remark;
+
+    public Categories(ClassifyInfoVO classifyInfoVO) {
+        this.id = classifyInfoVO.getId();
+        this.parentId = classifyInfoVO.getPid();
+        this.name = classifyInfoVO.getClassifyName();
+        this.icon = classifyInfoVO.getIcon();
+        this.description = classifyInfoVO.getDescription();
+        this.type = classifyInfoVO.getType();
+        this.directoryId = classifyInfoVO.getDirectoryId();
+        this.remark = classifyInfoVO.getRemark();
+    }
+
+    public ClassifyInfoDTO buildClassifyInfoDTO() {
+        return ClassifyInfoDTO.builder().id(id).description(description)
+                .icon(icon).pid(parentId).classifyName(name)
+                .remark(remark).createTime(createTime)
+                .directoryId(directoryId).type(type).build();
+    }
+
+
+    public ClassifyDetailsDTO buildClassifyDetailsDTO() {
+        return ClassifyDetailsDTO.builder().id(id).description(description)
+                .icon(icon).classifyName(name)
+                .remark(remark).build();
+    }
+}
\ No newline at end of file

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

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.vo.DirectoryInfoVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 目录管理表(Directory)实体类
+ *
+ * @author makejava
+ * @since 2023-05-24 14:58:31
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Directory implements Serializable {
+    private static final long serialVersionUID = 713939370607409336L;
+    /**
+     * 主键id
+     */
+    private Integer id;
+    /**
+     * 目录名称
+     */
+    private String directoryName;
+    /**
+     * 其他目录关联id
+     */
+    private Integer relevance;
+    /**
+     * 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录）
+     */
+    private Integer type;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+    /**
+     * 是否删除
+     */
+    private Integer deleted;
+
+    public Directory(DirectoryInfoVO param) {
+        this.id = param.getId();
+        this.directoryName = param.getDirectoryName();
+        this.relevance = param.getRelevance();
+        this.type = param.getType();
+    }
+
+    public DirectoryInfoVO buildDirectoryInfoVO() {
+        return DirectoryInfoVO.builder().id(id).directoryName(directoryName).relevance(relevance).type(type).build();
+    }
+}
+

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

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.vo.GoodsAddVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author 23214
+ * @TableName goods_info
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoodsInfo implements Serializable {
+    private Integer id;
+
+    private Integer pid;
+
+    private String goodsNo;
+
+    private String goodsName;
+
+    private Integer directoryId;
+
+    private Integer addGoodsUserId;
+
+    private Integer categoryByOne;
+
+    private Integer categoryByTwo;
+
+    private String ecoLabel;
+
+    private Integer shelfStatus;
+
+    private Integer showCode;
+
+    private Integer sort;
+
+    private Date createTime;
+
+    private Integer goodsType;
+
+    private Date updateTime;
+
+    private Integer deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public GoodsInfo(GoodsAddVO goodsAddVO) {
+        this.id = goodsAddVO.getId();
+        this.goodsName = goodsAddVO.getGoodsName();
+        this.shelfStatus = goodsAddVO.getShelfStatus();
+        this.categoryByOne = goodsAddVO.getCategoryByOne();
+        this.categoryByTwo = goodsAddVO.getCategoryByTwo();
+        this.directoryId = goodsAddVO.getDirectoryId();
+        this.ecoLabel = goodsAddVO.getTag();
+        this.goodsType = goodsAddVO.getGoodsType();
+    }
+}
\ No newline at end of file

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

@@ -71,6 +71,7 @@ public class GoodsInfoDO implements Serializable {
         .imgUrl(this.mainImg)
         .directoryId(this.sortTypeId)
         .directoryName(this.directoryName)
+         .goodsDesc(this.goodsDesc)
         .goodsOneLevelTypeName(this.goodsMasterType.getTypeName())
         .goodsTwoLevelTypeName(this.goodsSlaveType.getTypeName())
         .isCoupons(this.isCoupons)

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

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.vo.GoodsGroupVO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -17,28 +16,30 @@ import java.util.Date;
 @NoArgsConstructor
 @Builder
 public class GoodsTypeDO implements Serializable {
-  private Integer id;
-  private Integer pid;
-  private Integer sortTypeId;
-  private String typeName;
-  private String description;
-  private Integer sort;
-  private String icon;
-  private String remark;
-  private Integer deleted;
-  private Date updateTime;
-  private Date createTime;
+    private Integer id;
+    private Integer pid;
+    private Integer sortTypeId;
+    private String typeName;
+    private String description;
+    private Integer sort;
+    private String icon;
+    private String remark;
+    private Integer deleted;
+    private Date updateTime;
+    private Date createTime;
 
-  /** 辅助字段-start */
-  private GoodsTypeDO slaveType;
+    /**
+     * 辅助字段-start
+     */
+    private GoodsTypeDO slaveType;
 
-  /** 辅助字段-end */
-  public GoodsTypeDO(GoodsGroupVO goodsGroupVO) {
-    this.sortTypeId = goodsGroupVO.getSortTypeId();
-    this.typeName = goodsGroupVO.getGroupName();
-    this.pid = goodsGroupVO.getPid();
-    this.description = goodsGroupVO.getDescription();
-    this.icon = goodsGroupVO.getIcon();
-    this.remark = goodsGroupVO.getRemark();
-  }
+    /** 辅助字段-end */
+//  public GoodsTypeDO(ClassifyInfoVO goodsGroupVO) {
+//    this.sortTypeId = goodsGroupVO.getSortTypeId();
+//    this.typeName = goodsGroupVO.getGroupName();
+//    this.pid = goodsGroupVO.getPid();
+//    this.description = goodsGroupVO.getDescription();
+//    this.icon = goodsGroupVO.getIcon();
+//    this.remark = goodsGroupVO.getRemark();
+//  }
 }

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

@@ -18,51 +18,56 @@ import java.util.Date;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class MallProdSkuInfoDO implements Serializable {
-  private static final long serialVersionUID = 3667714765929443857L;
-  private Integer id;
-  private Integer goodsInfoId;
-  private Integer prodSkuId;
-  private String prodSkuSpecName;
-  private Integer goodsTypeId;
-  private Integer chooseType;
-  private Integer must;
-  private Integer skuUnitId;
-  private Integer deleted;
-  private Date createTime;
-  private Date updateTime;
-  private Integer flag;
+    private static final long serialVersionUID = 3667714765929443857L;
+    private Integer id;
+    private Integer goodsInfoId;
+    private Integer prodSkuId;
+    private String prodSkuSpecName;
+    private Integer categoryId;
+    private Integer chooseType;
+    private Integer must;
+    private Integer skuUnitId;
+    private Integer deleted;
+    private Date createTime;
+    private Date updateTime;
+    private Integer flag;
+    private String productSpecIdList;
+    private String beforeUpdateSpec;
+    /**
+     * 辅助字段 start
+     */
+    private String typeName;
 
-  /** 辅助字段 start */
-  private String typeName;
+    private String unitName;
+    private String productSkuName;
+    private Integer brandInfoId;
 
-  private String unitName;
-  private String productSkuName;
-  private Integer brandInfoId;
+    /**
+     * 辅助字段 end
+     */
+    public MallProdSkuInfoDO(GoodsSpecVO goodsSpecVO) {
+        this.categoryId = goodsSpecVO.getGoodsTypeId();
+        this.prodSkuSpecName = goodsSpecVO.getGoodsSpecName();
+        this.chooseType = goodsSpecVO.getChooseType();
+        this.skuUnitId = goodsSpecVO.getSkuUnitId();
+        this.must = goodsSpecVO.getMust();
+        this.flag = goodsSpecVO.getFlag();
+    }
 
-  /** 辅助字段 end */
-  public MallProdSkuInfoDO(GoodsSpecVO goodsSpecVO) {
-    this.goodsTypeId = goodsSpecVO.getGoodsTypeId();
-    this.prodSkuSpecName = goodsSpecVO.getGoodsSpecName();
-    this.chooseType = goodsSpecVO.getChooseType();
-    this.skuUnitId = goodsSpecVO.getSkuUnitId();
-    this.must = goodsSpecVO.getMust();
-    this.flag = goodsSpecVO.getFlag();
-  }
-
-  public GoodsSpecDTO buildGoodsSpecDTO() {
-    return GoodsSpecDTO.builder()
-        .id(this.id)
-        .goodsSpecName(this.prodSkuSpecName)
-        .goodsTypeId(this.goodsTypeId)
-        .chooseType(this.chooseType)
-        .skuUnitId(skuUnitId)
-        .unitName(this.unitName)
-        .skuId(this.prodSkuId)
-        .typeName(this.typeName)
-        .must(must)
-        .skuName(this.productSkuName)
-        .brandInfoId(brandInfoId)
-        .flag(flag)
-        .build();
-  }
+    public GoodsSpecDTO buildGoodsSpecDTO() {
+        return GoodsSpecDTO.builder()
+                .id(this.id)
+                .goodsSpecName(this.prodSkuSpecName)
+                .goodsTypeId(this.categoryId)
+                .chooseType(this.chooseType)
+                .skuUnitId(skuUnitId)
+                .unitName(this.unitName)
+                .skuId(this.prodSkuId)
+                .typeName(this.typeName)
+                .must(must)
+                .skuName(this.productSkuName)
+                .brandInfoId(brandInfoId)
+                .flag(flag)
+                .build();
+    }
 }

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 lombok.AllArgsConstructor;
+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:05 @Version 1.0
+ */
+@Data
+@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;
+
+  /**
+   * 辅助字段
+   *
+   * @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 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 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:05 @Version 1.0
+ */
+@Builder
+@Data
+@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 String renRepoName;
+  private String renRepoAddr;
+  private String renRepoPhone;
+
+  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 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/ProductSkuDO.java

 package com.mmc.pms.entity;
 
-import com.mmc.pms.model.dto.GoodsProductSkuDTO;
-import com.mmc.pms.model.dto.GoodsProductSkuVO;
+import com.mmc.pms.model.dto.ProductSkuDTO;
+import com.mmc.pms.model.dto.ProductSkuVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,46 +18,48 @@ import java.util.Date;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class ProductSkuDO implements Serializable {
-  private static final long serialVersionUID = -2830786012593215477L;
-  private Integer id;
-  private String productName;
-  private Integer goodsTypeId;
-  private String model;
-  private String productBrand;
-  private Date createTime;
-  private Date updateTime;
-  private Integer brandInfoId;
-  private Integer deleted;
-  private Integer sortTypeId;
-  private Integer customize;
-
-  /** 辅助字段 begin */
-  private String typeName;
-
-  private String sortName;
-
-  /** 辅助字段 end */
-  public ProductSkuDO(GoodsProductSkuVO param) {
-    this.id = param.getId();
-    this.goodsTypeId = param.getGoodsTypeId();
-    this.model = param.getModel();
-    this.productName = param.getProductName();
-    this.brandInfoId = param.getProductBrandId();
-    this.sortTypeId = param.getDirectoryId();
-  }
-
-  public GoodsProductSkuDTO buildGoodsProductSkuDTO() {
-    return GoodsProductSkuDTO.builder()
-        .id(this.id)
-        .productName(this.productName)
-        .goodsTypeId(this.goodsTypeId)
-        .model(this.model)
-        .productBrand(this.productBrand)
-        .productBrandId(brandInfoId)
-        .createTime(this.createTime)
-        .typeName(this.typeName)
-        .directoryId(sortTypeId)
-        .directoryName(this.sortName)
-        .build();
-  }
+    private static final long serialVersionUID = -2830786012593215477L;
+    private Integer id;
+    private String productName;
+    private Integer categoriesId;
+    private String model;
+    private Date createTime;
+    private Date updateTime;
+    private Integer brandInfoId;
+    private Integer deleted;
+    private Integer customize;
+    private Integer directoryId;
+
+    /**
+     * 辅助字段 begin
+     */
+    private String categoryName;
+
+    private String directoryName;
+
+    private String brandName;
+
+    /**
+     * 辅助字段 end
+     */
+    public ProductSkuDO(ProductSkuVO param) {
+        this.id = param.getId();
+        this.categoriesId = param.getCategoryId();
+        this.model = param.getModel();
+        this.productName = param.getProductName();
+        this.brandInfoId = param.getProductBrandId();
+        this.directoryId = param.getDirectoryId();
+    }
+
+    public ProductSkuDTO buildProductSkuDTO() {
+        return ProductSkuDTO.builder()
+                .id(this.id)
+                .productName(this.productName)
+                .model(this.model)
+                .productBrand(this.brandName)
+                .createTime(this.createTime)
+                .categoryName(this.categoryName)
+                .directoryName(directoryName)
+                .build();
+    }
 }

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

@@ -19,46 +19,46 @@ import java.util.Date;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class ProductSpecDO implements Serializable {
-  private static final long serialVersionUID = -5476701567447257133L;
-  private Integer id;
-  private Integer productSkuId;
-  private String specName;
-  private String specImage;
-  private String partNo;
-  private String versionDesc;
-  private Date createTime;
-  private Date updateTime;
-  private Integer deleted;
+    private static final long serialVersionUID = -5476701567447257133L;
+    private Integer id;
+    private Integer productSkuId;
+    private String specName;
+    private String specImage;
+    private String partNo;
+    private String versionDesc;
+    private Date createTime;
+    private Date updateTime;
+    private Integer deleted;
 
-  public ProductSpecDO(ProductSpecVO param) {
-    this.id = param.getId();
-    this.productSkuId = param.getProductSkuId();
-    this.specName = param.getSpecName();
-    this.specImage = param.getSpecImage();
-    this.partNo = param.getPartNo();
-    this.versionDesc = param.getVersionDesc();
-  }
+    public ProductSpecDO(ProductSpecVO param) {
+        this.id = param.getId();
+        this.productSkuId = param.getProductSkuId();
+        this.specName = param.getSpecName();
+        this.specImage = param.getSpecImage();
+        this.partNo = param.getPartNo();
+        this.versionDesc = param.getVersionDesc();
+    }
 
-  public ProductSpecDTO buildProductSpecDTO() {
-    return ProductSpecDTO.builder()
-        .id(this.id)
-        .productSkuId(this.productSkuId)
-        .specName(this.specName)
-        .specImage(this.specImage)
-        .partNo(this.partNo)
-        .versionDesc(this.versionDesc)
-        .createTime(this.createTime)
-        .build();
-  }
+    public ProductSpecDTO buildProductSpecDTO() {
+        return ProductSpecDTO.builder()
+                .id(this.id)
+                .productSkuId(this.productSkuId)
+                .specName(this.specName)
+                .specImage(this.specImage)
+                .partNo(this.partNo)
+                .versionDesc(this.versionDesc)
+                .createTime(this.createTime)
+                .build();
+    }
 
-  public MallProductSpecDTO buildMallProductSpecDTO() {
-    return MallProductSpecDTO.builder()
-        .productSpec(this.id)
-        .productSkuId(this.productSkuId)
-        .specName(this.specName)
-        .specImage(this.specImage)
-        .partNo(this.partNo)
-        .versionDesc(this.versionDesc)
-        .build();
-  }
+    public MallProductSpecDTO buildMallProductSpecDTO() {
+        return MallProductSpecDTO.builder()
+                .productSpec(this.id)
+                .productSkuId(this.productSkuId)
+                .specName(this.specName)
+                .specImage(this.specImage)
+                .partNo(this.partNo)
+                .versionDesc(this.versionDesc)
+                .build();
+    }
 }

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

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.ProductSpecPriceDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 产品规格价格配置表(ProductSpecPriceDO)实体类
+ *
+ * @author makejava
+ * @since 2023-05-25 17:51:18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductSpecPriceDO implements Serializable {
+    private static final long serialVersionUID = 270307563560175486L;
+
+    private Integer id;
+    /**
+     * 产品规格id
+     */
+    private Integer productSpecId;
+    /**
+     * 渠道等级id
+     */
+    private Integer cooperationTag;
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    private Integer type;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer leaseTerm;
+
+    public ProductSpecPriceDTO buildProductSpecPriceDTO() {
+        return ProductSpecPriceDTO.builder().id(this.id)
+                .cooperationTag(this.cooperationTag)
+                .price(this.price).createTime(this.createTime)
+                .leaseTerm(this.leaseTerm).build();
+    }
+}
+

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

+package com.mmc.pms.entity;
+
+import com.mmc.pms.model.dto.RepoCashDTO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * @Author small @Date 2023/5/25 9:48 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RepoCashDO implements Serializable {
+  private static final long serialVersionUID = -7930603317037474755L;
+  private Integer id;
+  private Integer repoAccountId;
+  private String uid;
+  private String accountName;
+  private Integer orderInfoId;
+  private String orderNo;
+  private Integer skuInfoId;
+  private String skuTitle;
+  private Integer wareInfoId;
+  private String wareNo;
+  private String wareTitle;
+  private String payNo;
+  private Integer payMethod;
+  private BigDecimal amtPaid;
+  private BigDecimal cashAmt;
+  private Date payTime;
+  private String refundNo;
+  private String voucher;
+  private String remark;
+  private Integer createUser;
+  private Date createTime;
+  private Integer updateUser;
+  private Date updateTime;
+
+  public RepoCashDTO buildRepoCashDTO() {
+    return RepoCashDTO.builder()
+        .id(this.id)
+        .repoAccountId(this.repoAccountId)
+        .uid(this.uid)
+        .accountName(this.accountName)
+        .orderInfoId(this.orderInfoId)
+        .orderNo(this.orderNo)
+        .skuInfoId(this.skuInfoId)
+        .skuTitle(this.skuTitle)
+        .wareInfoId(this.wareInfoId)
+        .wareNo(this.wareNo)
+        .wareTitle(this.wareTitle)
+        .payNo(this.payNo)
+        .payMethod(this.payMethod)
+        .amtPaid(this.amtPaid)
+        .refundNo(this.refundNo)
+        .createUser(this.createUser)
+        .voucher(StringUtils.isBlank(this.voucher) ? null : Arrays.asList(this.voucher.split(",")))
+        .cashAmt(this.cashAmt)
+        .payTime(this.payTime)
+        .remark(this.remark)
+        .build();
+  }
+}

src/main/java/com/mmc/pms/json/JsonUtil.java

+package com.mmc.pms.json;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import java.io.*;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/23 13:50 @Version 1.0
+ */
+public class JsonUtil {
+
+  public static void main(String[] args) {
+    String array = "[1,24,23]";
+    List<Integer> list = JSONArray.parseArray(array, Integer.class);
+    System.out.println(list.get(2));
+  }
+
+  /**
+   * 把Java对象转换成json字符串
+   *
+   * @param object 待转化为JSON字符串的Java对象
+   * @return json 串 or null
+   */
+  public static String parseObjToJson(Object object) {
+    String string = null;
+    try {
+      string = JSONObject.toJSONString(object);
+    } catch (Exception e) {
+      // LOGGER.error(e.getMessage());
+    }
+    return string;
+  }
+
+  /**
+   * 将Json字符串信息转换成对应的Java对象
+   *
+   * @param json json字符串对象
+   * @param c 对应的类型
+   */
+  public static <T> T parseJsonToObj(String json, Class<T> c) {
+    try {
+      JSONObject jsonObject = JSON.parseObject(json);
+      return JSON.toJavaObject(jsonObject, c);
+    } catch (Exception e) {
+      // LOGGER.error(e.getMessage());
+    }
+    return null;
+  }
+
+  /**
+   * 读取json文件
+   *
+   * @param fileName
+   * @return
+   */
+  public static String readJsonFile(String fileName) {
+    String jsonStr = "";
+    try {
+      File jsonFile = new File(fileName);
+      FileReader fileReader = new FileReader(jsonFile);
+      Reader reader = new InputStreamReader(new FileInputStream(jsonFile), "utf-8");
+      int ch = 0;
+      StringBuffer sb = new StringBuffer();
+      while ((ch = reader.read()) != -1) {
+        sb.append((char) ch);
+      }
+      fileReader.close();
+      reader.close();
+      jsonStr = sb.toString();
+      return jsonStr;
+    } catch (IOException e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  /**
+   * 将JSON数据格式化并保存到文件中
+   *
+   * @param jsonData 需要输出的json数
+   * @param filePath 输出的文件地址
+   * @return
+   */
+  public static boolean createJsonFile(Object jsonData, String filePath) {
+    String content =
+        JSON.toJSONString(
+            jsonData,
+            SerializerFeature.PrettyFormat,
+            SerializerFeature.WriteMapNullValue,
+            SerializerFeature.WriteDateUseDateFormat);
+    // 标记文件生成是否成功
+    boolean flag = true;
+    // 生成json格式文件
+    try {
+      // 保证创建一个新文件
+      File file = new File(filePath);
+      if (!file.getParentFile().exists()) { // 如果父目录不存在，创建父目录
+        file.getParentFile().mkdirs();
+      }
+      if (file.exists()) { // 如果已存在,删除旧文件
+        file.delete();
+      }
+      file.createNewFile();
+      // 将格式化后的字符串写入文件
+      Writer write = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
+      write.write(content);
+      write.flush();
+      write.close();
+    } catch (Exception e) {
+      flag = false;
+      e.printStackTrace();
+    }
+    return flag;
+  }
+}

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/BrandInfoDTO.java

+package com.mmc.pms.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author LW
+ * @date 2022/6/20 16:33
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BrandInfoDTO implements Serializable {
+    private static final long serialVersionUID = 2845503394350034900L;
+    private Integer id;
+    private String brandName;
+    private Date createTime;
+
+}

src/main/java/com/mmc/pms/model/dto/ClassifyDetailsDTO.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 LW
+ * @date 2022/3/22 15:50
+ * 概要：一级分类信息DTO
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClassifyDetailsDTO implements Serializable {
+    private static final long serialVersionUID = -1682216002629752311L;
+    @ApiModelProperty(value = "分类id")
+    private Integer id;
+
+    @ApiModelProperty(value = "分类名称")
+    private String classifyName;
+
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "icon图标")
+    private String icon;
+
+    @ApiModelProperty(value = "小程序底部备注")
+    private String remark;
+}

src/main/java/com/mmc/pms/model/dto/ClassifyInfoDTO.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;
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2022/3/22 15:50
+ * 概要：一级分类信息DTO
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClassifyInfoDTO implements Serializable {
+    private static final long serialVersionUID = -1682216002629752311L;
+    @ApiModelProperty(value = "分类id")
+    private Integer id;
+
+    @ApiModelProperty(value = "所属目录id")
+    private Integer directoryId;
+
+    @ApiModelProperty(value = "分类名称")
+    private String classifyName;
+
+    @ApiModelProperty(value = "pid:一级分类的pid是0 二级分类pid是一级分类id")
+    private Integer pid;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "icon图标")
+    private String icon;
+
+    @ApiModelProperty(value = "小程序底部备注")
+    private String remark;
+
+    @ApiModelProperty(value = "分类所属模块id(0：通用分类 1：作业服务分类 2：设备租赁分类 3：飞手培训分类 4：产品商城分类)")
+    private Integer type;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "二级分类信息")
+    private List<ClassifyInfoDTO> children;
+}

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/ExpStationsDTO.java

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author small @Date 2023/5/25 9:47 @Version 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.ExpStationsDTO", description = "物流信息DTO")
+public class ExpStationsDTO implements Serializable {
+  private static final long serialVersionUID = 8737447241343561076L;
+
+  @ApiModelProperty(value = "物流状态：查字典")
+  private String Action;
+
+  @ApiModelProperty(value = "描述")
+  private String AcceptStation;
+
+  @ApiModelProperty(value = "时间")
+  private String AcceptTime;
+
+  @ApiModelProperty(value = "所在城市")
+  private String Location;
+}

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/GoodsInfoDO.java

-package com.mmc.pms.model.dto;
-
-import com.mmc.pms.entity.GoodsConfigExportDO;
-import com.mmc.pms.entity.GoodsTypeDO;
-import com.mmc.pms.entity.GoodsVideoDO;
-import com.mmc.pms.model.vo.CategoryParamAndValueVO;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Author small @Date 2023/5/16 13:41 @Version 1.0
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@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;
-
-  /** 辅助字段-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;
-}

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

@@ -47,4 +47,7 @@ public class GoodsInfoListDTO implements Serializable {
 
   @ApiModelProperty(value = "是否有优惠券 0表示没有 有就返回数字")
   private Integer isCoupons;
+
+  @ApiModelProperty(value = "描述")
+  private String goodsDesc;
 }

src/main/java/com/mmc/pms/model/dto/KdnExpDTO.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:47 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.KdnExpDTO", description = "物流信息DTO")
+public class KdnExpDTO implements Serializable {
+  private static final long serialVersionUID = 4129710329541565557L;
+
+  @ApiModelProperty(value = "物流状态：查字典")
+  private String StateEx;
+
+  @ApiModelProperty(value = "快递公司编码：查字典")
+  private String ShipperCode;
+
+  @ApiModelProperty(value = "物流单号")
+  private String LogisticCode;
+
+  @ApiModelProperty(value = "快递流转信息")
+  private List<ExpStationsDTO> Traces;
+}

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

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

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

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

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

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

+package com.mmc.pms.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @Author small @Date 2023/5/25 10:13 @Version 1.0
+ */
+@Data
+// @ApiModel(value = "OrderTaskSonDTO", description = "云享飞订单-子任务表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderTaskSonDTO implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private Integer id;
+
+  @ApiModelProperty(value = "0为主任务")
+  private Integer parentId;
+
+  @ApiModelProperty(value = "客户ID")
+  private Integer userAccountId;
+
+  @ApiModelProperty(value = "运营人员ID（负责这个order的运营人员id")
+  private Integer userOperateId;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "订单名称")
+  private String orderName;
+
+  @ApiModelProperty(value = "订单总金额")
+  private BigDecimal orderAmt;
+
+  @ApiModelProperty(value = "订单金额中的现金金额")
+  private BigDecimal cashAmt;
+
+  @ApiModelProperty(value = "订单金额中的信用金额")
+  private BigDecimal creditAmt;
+
+  @ApiModelProperty(value = "任务飞行地址")
+  private String taskAddress;
+
+  @ApiModelProperty(value = "基本信息")
+  private String basicInfo;
+
+  @ApiModelProperty(value = "服务开始时间")
+  private LocalDateTime startTime;
+
+  @ApiModelProperty(value = "服务结束时间")
+  private LocalDateTime endTime;
+
+  @ApiModelProperty(value = "实际服务开始时间")
+  private LocalDateTime acStartTime;
+
+  @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未评价 1已评价")
+  private Integer evaluateStatus;
+
+  private LocalDateTime createTime;
+
+  private LocalDateTime updateTime;
+
+  @ApiModelProperty(value = "服务项ID")
+  private Integer inspectionId;
+
+  @ApiModelProperty(value = "服务名称")
+  private String inspectionName;
+
+  @ApiModelProperty(value = "最近一次操作信息")
+  private String lastMsg;
+
+  @ApiModelProperty(value = "任务地址经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "任务地址纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "订单关闭原因")
+  private String shutReason;
+
+  @ApiModelProperty(value = "是否营销数据（假数据）：0:否 1:是")
+  private Boolean isDummy;
+
+  @ApiModelProperty(value = "平台备注")
+  private String pfRemark;
+
+  @ApiModelProperty(value = "飞手类型（0个人飞手 1飞手机构）")
+  private Integer flyerType;
+
+  @ApiModelProperty(value = "任务飞手人数")
+  private Integer flyerNum;
+
+  @ApiModelProperty(value = "0:隐藏 1:显示(隐藏后飞手端不显示，不参与抢单)")
+  private Integer display;
+
+  @ApiModelProperty(value = "飞手评价：0未评价 1已评价")
+  private Integer flyerEval;
+
+  @ApiModelProperty(value = "是否进行过催单 0：未通知 1：已通知")
+  private Integer isUrge;
+
+  @ApiModelProperty(value = "订单类型：0普通订单，1推荐订单，2加急单")
+  private Integer orderType;
+
+  @ApiModelProperty(value = "需求确认备注")
+  private String cmdRemark;
+
+  @ApiModelProperty(value = "飞手抢单开始时间")
+  private LocalDateTime flyerStartTime;
+
+  @ApiModelProperty(value = "飞手抢单结束时间")
+  private LocalDateTime flyerEndTime;
+
+  @ApiModelProperty(value = "推荐机构")
+  private Integer rcdCompanyId;
+}

src/main/java/com/mmc/pms/model/dto/OrderVcuDTO.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:46 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.OrderVcuDTO", description = "订单凭证DTO")
+public class OrderVcuDTO implements Serializable {
+  private static final long serialVersionUID = -7101242524092899210L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "订单ID")
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "0:发货 1:收货 2:归还 3:平台收货")
+  private Integer vcuType;
+
+  @ApiModelProperty(value = "设备状况:0无问题 1有问题")
+  private Integer vcuSatus;
+
+  @ApiModelProperty(value = "描述-备注")
+  private String remark;
+
+  @ApiModelProperty(value = "图片集合")
+  private List<String> imgs;
+
+  @ApiModelProperty(value = "视频")
+  private String videoUrl;
+}

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

 package com.mmc.pms.model.dto;
 
+import com.mmc.pms.model.vo.GoodsProductSkuVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,17 +16,17 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class ProductInventoryVO implements Serializable {
-  private static final long serialVersionUID = -2224789550998518979L;
+    private static final long serialVersionUID = -2224789550998518979L;
 
-  @ApiModelProperty(value = "是否指定 不指定0 指定1")
-  private Integer select;
+    @ApiModelProperty(value = "是否指定 不指定0 指定1")
+    private Integer select;
 
-  @ApiModelProperty(value = "产品sku")
-  private GoodsProductSkuVO productSku;
+    @ApiModelProperty(value = "产品sku")
+    private GoodsProductSkuVO productSku;
 
-  @ApiModelProperty(value = "productSkuId")
-  private Integer productSkuId;
+    @ApiModelProperty(value = "productSkuId")
+    private Integer productSkuId;
 
-  @ApiModelProperty(value = "产品规格")
-  private List<ProductSpecVO> productSpecList;
+    @ApiModelProperty(value = "产品规格")
+    private List<ProductSpecVO> productSpecList;
 }

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

@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author small @Date 2023/5/16 16:29 @Version 1.0
@@ -17,39 +16,36 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class GoodsProductSkuDTO implements Serializable {
-  private static final long serialVersionUID = -2681122778843398310L;
+public class ProductSkuDTO implements Serializable {
+    private static final long serialVersionUID = -2681122778843398310L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "产品名称")
-  private String productName;
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
 
-  @ApiModelProperty(value = "产品类型id")
-  private Integer goodsTypeId;
+    @ApiModelProperty(value = "产品类型id")
+    private Integer categoriesId;
 
-  @ApiModelProperty(value = "产品类型名称")
-  private String typeName;
+    @ApiModelProperty(value = "产品类型名称")
+    private String categoryName;
 
-  @ApiModelProperty(value = "型号")
-  private String model;
+    @ApiModelProperty(value = "型号")
+    private String model;
 
-  @ApiModelProperty(value = "产品品牌")
-  private String productBrand;
+    @ApiModelProperty(value = "产品品牌")
+    private String productBrand;
 
-  @ApiModelProperty(value = "产品品牌id")
-  private Integer productBrandId;
+    @ApiModelProperty(value = "产品品牌id")
+    private Integer productBrandId;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "目录id")
-  private Integer directoryId;
+    @ApiModelProperty(value = "目录id")
+    private Integer directoryId;
 
-  @ApiModelProperty(value = "目录名称")
-  private String directoryName;
-
-  @ApiModelProperty(value = "产品规格信息对象")
-  private List<ProductSpecDTO> productSpecList;
+    @ApiModelProperty(value = "目录名称")
+    private String directoryName;
 }

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

@@ -16,36 +16,27 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class GoodsProductSkuVO implements Serializable {
-  private static final long serialVersionUID = -2681122778843398310L;
-
-  @ApiModelProperty(value = "id")
-  @NotNull(
-      message = "修改时id不能为空",
-      groups = {Update.class})
-  private Integer id;
-
-  @NotNull(
-      message = "产品名称不能为空",
-      groups = {Update.class, Create.class})
-  @ApiModelProperty(value = "产品名称")
-  private String productName;
-
-  @NotNull(
-      message = "产品类型不能为空",
-      groups = {Update.class, Create.class})
-  @ApiModelProperty(value = "产品类型")
-  private Integer goodsTypeId;
-
-  @ApiModelProperty(value = "型号")
-  private String model;
-
-  @ApiModelProperty(value = "产品品牌")
-  private String productBrand;
-
-  @ApiModelProperty(value = "品牌id")
-  private Integer productBrandId;
-
-  @ApiModelProperty(value = "目录id")
-  private Integer directoryId;
+public class ProductSkuVO implements Serializable {
+    private static final long serialVersionUID = -2681122778843398310L;
+
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "修改时id不能为空", groups = {Update.class})
+    private Integer id;
+
+    @NotNull(message = "产品名称不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @NotNull(message = "产品类型id不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "产品类型id")
+    private Integer categoryId;
+
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "品牌id")
+    private Integer productBrandId;
+
+    @ApiModelProperty(value = "目录id")
+    private Integer directoryId;
 }

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

@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author small @Date 2023/5/16 15:30 @Version 1.0
@@ -20,29 +19,26 @@ import java.util.List;
 @Builder
 @Accessors
 public class ProductSpecDTO 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 = "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 List<ProductSpecPriceDTO> priceList;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

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

@@ -18,18 +18,18 @@ import java.util.Date;
 @AllArgsConstructor
 @Builder
 public class ProductSpecPriceDTO implements Serializable {
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "规格id")
-  private Integer productSpecId;
+    @ApiModelProperty(value = "等级标签id")
+    private Integer cooperationTag;
 
-  @ApiModelProperty(value = "等级标签id")
-  private Integer tagInfoId;
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
 
-  @ApiModelProperty(value = "价格")
-  private BigDecimal price;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 
-  @ApiModelProperty(value = "创建时间")
-  private Date createTime;
+    @ApiModelProperty(value = "租赁期限 (0：1-7天，1：8-15天，2：16-30天，3：30天以上)")
+    private Integer leaseTerm;
 }

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

@@ -20,41 +20,29 @@ import java.io.Serializable;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class ProductSpecVO implements Serializable {
-  private static final long serialVersionUID = -2681122778843398310L;
-
-  @ApiModelProperty(value = "id")
-  @NotNull(
-      message = "修改时id不能为空",
-      groups = {Update.class})
-  private Integer id;
-
-  @ApiModelProperty(value = "productSkuId")
-  @NotNull(
-      message = "修改时productSkuId不能为空",
-      groups = {Create.class})
-  private Integer productSkuId;
-
-  @NotNull(
-      message = "规格名称不能为空",
-      groups = {Update.class, Create.class})
-  @ApiModelProperty(value = "规格名称")
-  private String specName;
-
-  @NotNull(
-      message = "规格图片不能为空",
-      groups = {Update.class, Create.class})
-  @ApiModelProperty(value = "规格图片")
-  private String specImage;
-
-  @NotNull(
-      message = "料号不能为空",
-      groups = {Update.class, Create.class})
-  @ApiModelProperty(value = "料号")
-  private String partNo;
-
-  @ApiModelProperty(value = "版本描述")
-  private String versionDesc;
-
-  @ApiModelProperty(value = "价格配置信息")
-  private ProductSpecCPQVO productSpecCPQVO;
+    private static final long serialVersionUID = -2681122778843398310L;
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "productSkuId")
+    @NotNull(message = "修改时productSkuId不能为空", groups = {Create.class})
+    private Integer productSkuId;
+
+    @NotNull(message = "规格名称不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "规格名称")
+    private String specName;
+
+    @NotNull(message = "规格图片不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "规格图片")
+    private String specImage;
+
+    @NotNull(message = "料号不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "料号")
+    private String partNo;
+
+    @ApiModelProperty(value = "版本描述")
+    private String versionDesc;
+    @ApiModelProperty(value = "价格配置信息")
+    private ProductSpecCPQVO productSpecCPQVO;
 }

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

+package com.mmc.pms.model.dto;
+
+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;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.RefundLogDTO", description = "退款logDTO")
+public class RefundLogDTO implements Serializable {
+  private static final long serialVersionUID = 6524395508534109389L;
+
+  @ApiModelProperty(value = "内容")
+  private String msg;
+
+  @ApiModelProperty(value = "账号")
+  private String opAccount;
+
+  @ApiModelProperty(value = "名称")
+  private String opName;
+
+  @ApiModelProperty(value = "创建/发送时间")
+  private Date createTime;
+}

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/RepoAddressDTO.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:06 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RepoAddressDTO", description = "云仓地址信息DTO")
+public class RepoAddressDTO implements Serializable {
+  private static final long serialVersionUID = 610413683850745833L;
+
+  @ApiModelProperty(value = "id")
+  private Integer id;
+
+  @ApiModelProperty(value = "用户id")
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "姓名")
+  private String realName;
+
+  @ApiModelProperty(value = "电话")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "地区")
+  private String region;
+
+  @ApiModelProperty(value = "详细地址")
+  private String detailAddress;
+
+  @ApiModelProperty(value = "使用类型")
+  private Integer type;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+}

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

+package com.mmc.pms.model.dto;
+
+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.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author small @Date 2023/5/25 9:49 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "com.mmc.csf.model.dto.RepoBannerDTO", description = "现金流水DTO")
+public class RepoCashDTO implements Serializable {
+  private static final long serialVersionUID = 4569221850373256579L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "用户ID", hidden = true)
+  private Integer repoAccountId;
+
+  @ApiModelProperty(value = "用户UID", hidden = true)
+  private String uid;
+
+  @ApiModelProperty(value = "用户名", hidden = true)
+  private String accountName;
+
+  @ApiModelProperty(value = "订单ID", hidden = true)
+  private Integer orderInfoId;
+
+  @ApiModelProperty(value = "订单编号")
+  private String orderNo;
+
+  @ApiModelProperty(value = "skuID", hidden = true)
+  private Integer skuInfoId;
+
+  @ApiModelProperty(value = "sku标题", hidden = true)
+  private String skuTitle;
+
+  @ApiModelProperty(value = "商品ID", hidden = true)
+  private Integer wareInfoId;
+
+  @ApiModelProperty(value = "商品编号", hidden = true)
+  private String wareNo;
+
+  @ApiModelProperty(value = "商品标题")
+  private String wareTitle;
+
+  @ApiModelProperty(value = "流水编号")
+  private String payNo;
+
+  @ApiModelProperty(value = "流水类型:查字典")
+  private Integer payMethod;
+
+  @ApiModelProperty(value = "变动金额")
+  private BigDecimal amtPaid;
+
+  @ApiModelProperty(value = "当前余额")
+  private BigDecimal cashAmt;
+
+  @ApiModelProperty(value = "支付时间")
+  private Date payTime;
+
+  @ApiModelProperty(value = "退款流水编号")
+  private String refundNo;
+
+  @ApiModelProperty(value = "凭证")
+  private List<String> voucher;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+
+  @ApiModelProperty(value = "操作人账号")
+  private String opNo;
+
+  @ApiModelProperty(value = "操作人姓名")
+  private String opName;
+
+  private Integer createUser;
+}

src/main/java/com/mmc/pms/model/dto/RepoInfoDTO.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:07 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RepoInfoDTO", description = "仓库/门店DTO")
+public class RepoInfoDTO implements Serializable {
+  private static final long serialVersionUID = 8002261035352227237L;
+
+  @ApiModelProperty(value = "ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "仓库名称")
+  private String repoName;
+
+  @ApiModelProperty(value = "仓库编号")
+  private String repoNo;
+
+  @ApiModelProperty(value = "仓库地址")
+  private String repoAddress;
+
+  @ApiModelProperty(value = "经度")
+  private BigDecimal lon;
+
+  @ApiModelProperty(value = "纬度")
+  private BigDecimal lat;
+
+  @ApiModelProperty(value = "仓库营业时间")
+  private String repoBusinessHours;
+
+  @ApiModelProperty(value = "管理员Id")
+  private Integer userAccountId;
+
+  @ApiModelProperty(value = "管理员账号")
+  private String accountNo;
+
+  @ApiModelProperty(value = "管理员姓名")
+  private String userName;
+
+  @ApiModelProperty(value = "管理员手机号")
+  private String phoneNum;
+
+  @ApiModelProperty(value = "仓库库存")
+  private Integer repoInventory;
+
+  @ApiModelProperty(value = "是否删除")
+  private Integer deleted;
+
+  @ApiModelProperty(value = "生成时间")
+  private Date createTime;
+
+  @ApiModelProperty(value = "更新时间")
+  private Date updateTime;
+
+  @ApiModelProperty(value = "设备个数")
+  private Integer deviceNum;
+}

src/main/java/com/mmc/pms/model/dto/RoleInfoDTO.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:57 @Version 1.0
+ */
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+// @ApiModel(value = "com.mmc.csf.model.dto.RoleInfoDTO", description = "角色信息DTO")
+public class RoleInfoDTO implements Serializable {
+  private static final long serialVersionUID = -4791023169682602298L;
+
+  @ApiModelProperty(value = "角色ID")
+  private Integer id;
+
+  @ApiModelProperty(value = "角色编号")
+  private String roleNo;
+
+  @ApiModelProperty(value = "角色名称")
+  private String roleName;
+
+  @ApiModelProperty(value = "是否为管理角色:0否 1是")
+  private Integer admin; // 是否为管理角色
+
+  @ApiModelProperty(value = "是否为运营角色:0否 1是")
+  private Integer operate;
+
+  @ApiModelProperty(value = "是否为系统角色:0否 1是")
+  private Integer system;
+
+  @ApiModelProperty(value = "是否为PMC发货角色:0否 1是")
+  private Integer pmc; // PMC发货角色
+
+  @ApiModelProperty(value = "是否可用:0否 1是")
+  private Integer roleStatus;
+
+  @ApiModelProperty(value = "备注")
+  private String remark;
+}

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/qo/ProductSkuQO.java

+package com.mmc.pms.model.qo;
+
+import com.mmc.pms.model.vo.Freeze;
+import com.mmc.pms.page.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2022/9/26 11:13
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductSkuQO implements Serializable {
+    private static final long serialVersionUID = 7548828456935084794L;
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+    @ApiModelProperty(value = "产品类型")
+    private Integer categoryId;
+    @ApiModelProperty(value = "产品目录")
+    private Integer directoryId;
+    @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;
+
+    public void buildCurrentPage() {
+        this.pageNo = (pageNo - 1) * pageSize;
+    }
+}

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

+package com.mmc.pms.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author LW
+ * @date 2023/5/24 11:08
+ * 概要：
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CategoriesInfoVO {
+    private Integer id;
+    private String name;
+    private String icon;
+}

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

@@ -15,50 +15,36 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.vo.GoodsGroupVO", description = "商品分类")
-public class GoodsGroupVO implements Serializable {
-  @ApiModelProperty(value = "id")
-  @NotNull(
-      message = "id不能为空",
-      groups = {Update.class})
-  private Integer id;
-
-  @ApiModelProperty(value = "分类类型id")
-  @NotNull(
-      message = "分类类型id不能为空",
-      groups = {Update.class, Create.class})
-  private Integer sortTypeId;
-
-  @ApiModelProperty(value = "分类名称", required = true)
-  @Size(
-      max = 15,
-      message = "分类名称不能超过15个字",
-      groups = {Update.class, Create.class})
-  @NotNull(
-      message = "分类名称不能为空",
-      groups = {Update.class, Create.class})
-  private String groupName;
-
-  @ApiModelProperty(value = "pid:一级分类的pid是0 二级分类pid是一级分类id", required = true)
-  @NotNull(
-      message = "pid不能为空",
-      groups = {Create.class, Update.class})
-  private Integer pid;
-
-  @ApiModelProperty(value = "描述")
-  @Size(
-      max = 70,
-      message = "分类描述不能超过70个字",
-      groups = {Update.class, Create.class})
-  private String description;
-
-  @ApiModelProperty(value = "icon图标")
-  private String icon;
-
-  @ApiModelProperty(value = "小程序底部备注")
-  @Size(
-      max = 150,
-      message = "小程序底部备注不能超过150个字",
-      groups = {Update.class, Create.class})
-  private String remark;
+public class ClassifyInfoVO implements Serializable {
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "id不能为空", groups = {Update.class})
+    private Integer id;
+
+    @ApiModelProperty(value = "所属目录id")
+    @NotNull(message = "所属目录id不能为空", groups = {Update.class, Create.class})
+    private Integer directoryId;
+
+    @ApiModelProperty(value = "分类名称", required = true)
+    @Size(max = 15, message = "分类名称不能超过15个字", groups = {Update.class, Create.class})
+    @NotNull(message = "分类名称不能为空", groups = {Update.class, Create.class})
+    private String classifyName;
+
+    @ApiModelProperty(value = "pid:一级分类的pid是0 二级分类pid是一级分类id", required = true)
+    @NotNull(message = "pid不能为空", groups = {Create.class, Update.class})
+    private Integer pid;
+
+    @ApiModelProperty(value = "描述")
+    @Size(max = 70, message = "分类描述不能超过70个字", groups = {Update.class, Create.class})
+    private String description;
+
+    @ApiModelProperty(value = "icon图标")
+    private String icon;
+
+    @ApiModelProperty(value = "小程序底部备注")
+    @Size(max = 150, message = "小程序底部备注不能超过150个字", groups = {Update.class, Create.class})
+    private String remark;
+
+    @ApiModelProperty(value = "分类所属模块id(0：通用分类 1：作业服务分类 2：设备租赁分类 3：飞手培训分类 4：产品商城分类)")
+    @NotNull(message = "分类所属模块id不能为空", groups = {Update.class, Create.class})
+    private Integer type;
 }

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

+package com.mmc.pms.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * @Author LW
+ * @date 2023/5/24 11:06
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class DirectoryInfoVO {
+    @ApiModelProperty(value = "目录id")
+    private Integer id;
+    @ApiModelProperty(value = "目录名称")
+    private String directoryName;
+    @ApiModelProperty(value = "关联目录的id")
+    private Integer relevance;
+    @ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）")
+    private Integer type;
+}

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

+package com.mmc.pms.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2022/10/14 11:30
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoodsAddVO implements Serializable {
+    private static final long serialVersionUID = 7041502536618388167L;
+    @ApiModelProperty(value = "商品类型：0：销售商品 1:租赁商品")
+    @NotNull(message = "新增商品类型不能为空", groups = {Create.class})
+    private Integer goodsType;
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "修改时id不能为空", groups = {Update.class})
+    private Integer id;
+    @ApiModelProperty(value = "商品图片")
+    @NotEmpty(message = "主图不能为空", groups = {Update.class, Create.class})
+    private List<GoodsImgVO> images;
+    @ApiModelProperty(value = "商品视频")
+    private String goodsVideo;
+    @ApiModelProperty(value = "商品名称")
+    @NotNull(message = "商品名称不能为空", groups = {Update.class, Create.class})
+    private String goodsName;
+    @ApiModelProperty(value = "商品详情")
+    private GoodsDetailVO goodsDetailVO;
+    @ApiModelProperty(value = "所属目录")
+    @NotNull(message = "所属目录不能为空", groups = {Update.class, Create.class})
+    private Integer directoryId;
+    @ApiModelProperty(value = "一级分类id")
+    @NotNull(message = "分类不能为空", groups = {Update.class, Create.class})
+    private Integer categoryByOne;
+    @ApiModelProperty(value = "二级分类id")
+    private Integer categoryByTwo;
+    @ApiModelProperty(value = "商品标签")
+    private String tag;
+    @ApiModelProperty(value = "商品状态 0:下架 1:上架")
+    private Integer shelfStatus;
+    @ApiModelProperty(value = "规格信息")
+    private List<GoodsProdSpecVO> productSpec;
+    @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
+    private List<Integer> otherService;
+}

src/main/java/com/mmc/pms/model/vo/GoodsDetailVO.java

@@ -14,24 +14,17 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.vo.GoodsDetailVO", description = "商品详情")
 public class GoodsDetailVO implements Serializable {
-  private static final long serialVersionUID = -3842207843504795301L;
+    private static final long serialVersionUID = -3842207843504795301L;
 
-  @ApiModelProperty(value = "商品描述 ：70字内")
-  @Size(
-      max = 250,
-      message = "商品描述不能超过250个字符",
-      groups = {Create.class, Update.class})
-  private String goodsDesc;
+    @ApiModelProperty(value = "商品描述 ：70字内")
+    @Size(max = 250, message = "商品描述不能超过250个字符", groups = {Create.class, Update.class})
+    private String goodsDesc;
 
-  @ApiModelProperty(value = "产品介绍")
-  private String productDesc;
+    @ApiModelProperty(value = "产品介绍")
+    private String productDesc;
 
-  @ApiModelProperty(value = "商品备注：100字以内")
-  @Size(
-      max = 100,
-      message = "商品备注不能超过100个字符",
-      groups = {Create.class, Update.class})
-  private String remark;
+    @ApiModelProperty(value = "商品备注：100字以内")
+    @Size(max = 100, message = "商品备注不能超过100个字符", groups = {Create.class, Update.class})
+    private String remark;
 }

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

+package com.mmc.pms.model.vo;
+
+import com.mmc.pms.model.dto.ProductSpecVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author LW
+ * @date 2023/5/29 9:58
+ * 概要：
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GoodsProdSpecVO implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "规格名称")
+    private String goodsSpecName;
+
+    @ApiModelProperty(value = "产品类型id")
+    private Integer categoryId;
+
+
+    @ApiModelProperty(value = "产品:自定义时此字段可不用填写")
+    private Integer skuId;
+    @ApiModelProperty(value = "规格来源  0:获取 1：自定义")
+    private Integer flag;
+
+    @ApiModelProperty(value = "产品名称（自定义的时候才需要传值）")
+    private String productName;
+
+    @ApiModelProperty(value = "选项来源")
+    private List<Integer> specIds;
+
+    @ApiModelProperty(value = "选择方式")
+    private Integer chooseType;
+
+    @ApiModelProperty(value = "规格单位")
+    private Integer skuUnitId;
+
+    @ApiModelProperty(value = "是否必选")
+    private Integer must;
+
+    @ApiModelProperty(value = "自定义规格的信息填充")
+    private List<ProductSpecVO> customizeInfo;
+
+    @ApiModelProperty(value = "删除的自定义规格id")
+    private List<Integer> delProductSpecId;
+}

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

+package com.mmc.pms.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author LW
+ * @date 2022/9/23 10:33
+ * 概要：
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoodsProductSkuVO implements Serializable {
+    private static final long serialVersionUID = -2681122778843398310L;
+    @ApiModelProperty(value = "id")
+    @NotNull(message = "修改时id不能为空", groups = {Update.class})
+    private Integer id;
+    @NotNull(message = "产品名称不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+    @NotNull(message = "产品类型不能为空", groups = {Update.class, Create.class})
+    @ApiModelProperty(value = "产品类型")
+    private Integer goodsTypeId;
+    @ApiModelProperty(value = "型号")
+    private String model;
+    @ApiModelProperty(value = "产品品牌")
+    private String productBrand;
+    @ApiModelProperty(value = "品牌id")
+    private Integer productBrandId;
+    @ApiModelProperty(value = "目录id")
+    private Integer directoryId;
+}

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

@@ -16,41 +16,41 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 public class GoodsSpecVO implements Serializable {
-  private static final long serialVersionUID = -8681372139970849591L;
+    private static final long serialVersionUID = -8681372139970849591L;
 
-  @ApiModelProperty(value = "id")
-  private Integer id;
+    @ApiModelProperty(value = "id")
+    private Integer id;
 
-  @ApiModelProperty(value = "规格名称")
-  private String goodsSpecName;
+    @ApiModelProperty(value = "规格名称")
+    private String goodsSpecName;
 
-  @ApiModelProperty(value = "产品类型")
-  private Integer goodsTypeId;
+    @ApiModelProperty(value = "产品类型")
+    private Integer goodsTypeId;
 
-  @ApiModelProperty(value = "产品:自定义时此字段可不用填写")
-  private Integer skuId;
+    @ApiModelProperty(value = "产品:自定义时此字段可不用填写")
+    private Integer skuId;
 
-  @ApiModelProperty(value = "规格来源  0:获取 1：自定义")
-  private Integer flag;
+    @ApiModelProperty(value = "规格来源  0:获取 1：自定义")
+    private Integer flag;
 
-  @ApiModelProperty(value = "产品名称（自定义的时候才需要传值）")
-  private String productName;
+    @ApiModelProperty(value = "产品名称（自定义的时候才需要传值）")
+    private String productName;
 
-  @ApiModelProperty(value = "选项来源")
-  private List<MallProductSpecVO> specIds;
+    @ApiModelProperty(value = "选项来源")
+    private List<MallProductSpecVO> specIds;
 
-  @ApiModelProperty(value = "选择方式")
-  private Integer chooseType;
+    @ApiModelProperty(value = "选择方式")
+    private Integer chooseType;
 
-  @ApiModelProperty(value = "规格单位")
-  private Integer skuUnitId;
+    @ApiModelProperty(value = "规格单位")
+    private Integer skuUnitId;
 
-  @ApiModelProperty(value = "是否必选")
-  private Integer must;
+    @ApiModelProperty(value = "是否必选")
+    private Integer must;
 
-  @ApiModelProperty(value = "自定义的信息填充")
-  private List<ProductSpecVO> customizeInfo;
+    @ApiModelProperty(value = "自定义的信息填充")
+    private List<ProductSpecVO> customizeInfo;
 
-  @ApiModelProperty(value = "删除的自定义规格id")
-  private List<Integer> delProductSpecId;
+    @ApiModelProperty(value = "删除的自定义规格id")
+    private List<Integer> delProductSpecId;
 }

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

+package com.mmc.pms.model.vo;
+
+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:08 @Version 1.0
+ */
+@Builder
+@Data
+@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;
+}