Skip to content

P
pms
提交 2808dd4c 作者: xiaowang
操作

维护

上级 5e0dbfdd
正在显示 包含 713 行增加 和 1320 行删除
src/main/java/com/mmc/pms/controller/BackstageBrandManageController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.BrandInfoDTO; import com.mmc.pms.model.sale.dto.BrandInfoDTO;
import com.mmc.pms.service.BrandManageService; import com.mmc.pms.service.BrandManageService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/mmc/pms/controller/BackstageCategoriesController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.ClassifyDetailsDTO; import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
import com.mmc.pms.model.dto.ClassifyInfoDTO; import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
import com.mmc.pms.model.vo.*; import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
import com.mmc.pms.model.categories.vo.RelevantBusinessVO;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.sale.vo.QueryClassifyVO;
import com.mmc.pms.service.CategoriesService; import com.mmc.pms.service.CategoriesService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.Min;
/** /**
* @Author lw @Date 2023/5/15 13:24 @Version 1.0 * @Author lw @Date 2023/5/15 13:24 @Version 1.0
*/ */
...@@ -30,8 +37,8 @@ public class BackstageCategoriesController { ...@@ -30,8 +37,8 @@ public class BackstageCategoriesController {
@ApiOperation(value = "目录列表") @ApiOperation(value = "目录列表")
@GetMapping("directoryList") @GetMapping("directoryList")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = DirectoryInfoVO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DirectoryInfoVO.class)})
public ResultBody directoryList(@RequestParam Integer pageNo, @RequestParam Integer pageSize) { public ResultBody directoryList(@RequestParam Integer pageNo, @RequestParam Integer pageSize, @RequestParam(required = false) Integer type) {
return ResultBody.success(categoriesService.directoryList(pageNo, pageSize)); return ResultBody.success(categoriesService.directoryList(pageNo, pageSize, type));
} }
@ApiOperation(value = "删除目录") @ApiOperation(value = "删除目录")
...@@ -64,6 +71,7 @@ public class BackstageCategoriesController { ...@@ -64,6 +71,7 @@ public class BackstageCategoriesController {
return categoriesService.exchangeSortType(firstId, secondId); return categoriesService.exchangeSortType(firstId, secondId);
} }
@ApiOperation(value = "分类信息-列表") @ApiOperation(value = "分类信息-列表")
@PostMapping("getClassificationList") @PostMapping("getClassificationList")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyInfoDTO.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyInfoDTO.class)})
...@@ -78,4 +86,27 @@ public class BackstageCategoriesController { ...@@ -78,4 +86,27 @@ public class BackstageCategoriesController {
public ResultBody getClassifyDetails(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id) { public ResultBody getClassifyDetails(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id) {
return categoriesService.getClassifyDetails(id); return categoriesService.getClassifyDetails(id);
} }
@ApiOperation(value = "分类详情")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
@GetMapping("queryRelevantBusiness")
public ResultBody queryRelevantBusiness(@ApiParam(value = "分类id", required = true) @RequestParam(value = "id") Integer id,
@ApiParam(value = "业务类型", required = true) @Min(value = 0) @RequestParam(value = "type") Integer type) {
return categoriesService.queryRelevantBusiness(id, type);
}
@ApiOperation(value = "分类删除")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
@GetMapping("deleteRelevantBusiness")
public ResultBody deleteRelevantBusiness(@ApiParam(value = "分类id", required = true) @Min(value = 1) @RequestParam(value = "id") Integer id) {
return categoriesService.deleteRelevantBusiness(id);
}
@ApiOperation(value = "目录列表不含分页")
@GetMapping("getDirectoryList")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = DirectoryInfoVO.class)})
public ResultBody getDirectoryList(Integer type) {
return categoriesService.getDirectoryList(type);
}
} }
src/main/java/com/mmc/pms/controller/BackstageGoodsManageController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
import com.mmc.pms.model.qo.MallOrderGoodsInfoQO; import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
import com.mmc.pms.model.qo.ProductSpecPriceQO; import com.mmc.pms.model.qo.ProductSpecPriceQO;
import com.mmc.pms.model.vo.Create; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.vo.GoodsAddVO; import com.mmc.pms.model.sale.vo.GoodsAddVO;
import com.mmc.pms.model.vo.Update;
import com.mmc.pms.service.GoodsInfoService; import com.mmc.pms.service.GoodsInfoService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
......
src/main/java/com/mmc/pms/controller/BackstageIndustrySpecController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.qo.IndustrySkuQO; import com.mmc.pms.model.qo.IndustrySkuQO;
import com.mmc.pms.model.vo.Create; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.vo.IndustrySkuVO; import com.mmc.pms.model.sale.vo.IndustrySkuVO;
import com.mmc.pms.model.vo.IndustrySpecVO; import com.mmc.pms.model.sale.vo.IndustrySpecVO;
import com.mmc.pms.model.vo.Update;
import com.mmc.pms.service.IndustrySpecService; import com.mmc.pms.service.IndustrySpecService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/mmc/pms/controller/BackstageProductSpecController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.lease.vo.PriceAcquisition;
import com.mmc.pms.model.qo.ProductSkuQO; import com.mmc.pms.model.qo.ProductSkuQO;
import com.mmc.pms.model.vo.Create; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.vo.PriceAcquisition; import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import com.mmc.pms.model.vo.ProductSpecCPQVO;
import com.mmc.pms.model.vo.Update;
import com.mmc.pms.service.ProductSkuService; import com.mmc.pms.service.ProductSkuService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/mmc/pms/controller/MiniProgramDeviceController.java
...@@ -2,9 +2,15 @@ package com.mmc.pms.controller; ...@@ -2,9 +2,15 @@ package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.common.ResultEnum; import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.lease.dto.BrandDTO;
import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
import com.mmc.pms.model.lease.dto.WareInfoDTO;
import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
import com.mmc.pms.model.lease.vo.LeaseVo;
import com.mmc.pms.model.other.dto.DistrictInfoDTO;
import com.mmc.pms.model.other.dto.ModelDTO;
import com.mmc.pms.model.qo.WareInfoQO; import com.mmc.pms.model.qo.WareInfoQO;
import com.mmc.pms.model.vo.LeaseVo; import com.mmc.pms.model.sale.dto.SkuInfoDTO;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import com.mmc.pms.service.WebDeviceService; import com.mmc.pms.service.WebDeviceService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -22,7 +28,8 @@ import org.springframework.web.bind.annotation.*; ...@@ -22,7 +28,8 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/appDevice") @RequestMapping("/appDevice")
public class MiniProgramDeviceController { public class MiniProgramDeviceController {
@Autowired private WebDeviceService webDeviceService; @Autowired
private WebDeviceService webDeviceService;
@ApiOperation(value = "地域") @ApiOperation(value = "地域")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
...@@ -76,7 +83,7 @@ public class MiniProgramDeviceController { ...@@ -76,7 +83,7 @@ public class MiniProgramDeviceController {
} }
@ApiOperation(value = "获取设备sku") @ApiOperation(value = "获取设备sku")
@ApiResponses({ @ApiResponse(code = 200, message = "OK", response = SkuInfoDTO.class) }) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = SkuInfoDTO.class)})
@GetMapping("listWareSkuById") @GetMapping("listWareSkuById")
public ResultBody<SkuInfoDTO> listWareSkuById(@RequestParam Integer id) { public ResultBody<SkuInfoDTO> listWareSkuById(@RequestParam Integer id) {
return ResultBody.success(webDeviceService.listWareSkuById(id)); return ResultBody.success(webDeviceService.listWareSkuById(id));
......
src/main/java/com/mmc/pms/controller/MiniProgramProductMallController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.AppGoodsInfoDetailDTO;
import com.mmc.pms.model.dto.GoodsInfoListDTO;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.model.sale.dto.AppGoodsInfoDetailDTO;
import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
import com.mmc.pms.service.MiniProgramProductMallService; import com.mmc.pms.service.MiniProgramProductMallService;
import com.mmc.pms.service.WebProductMallService; import com.mmc.pms.service.WebProductMallService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
...@@ -18,9 +18,11 @@ import org.springframework.web.bind.annotation.*; ...@@ -18,9 +18,11 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/AppProductMall/") @RequestMapping("/AppProductMall/")
public class MiniProgramProductMallController { public class MiniProgramProductMallController {
@Autowired private WebProductMallService webProductMallService; @Autowired
private WebProductMallService webProductMallService;
@Autowired private MiniProgramProductMallService miniProgramProductMallService; @Autowired
private MiniProgramProductMallService miniProgramProductMallService;
@ApiOperation(value = "小程序-商品信息-分页") @ApiOperation(value = "小程序-商品信息-分页")
@PostMapping("listPageGoodsInfo") @PostMapping("listPageGoodsInfo")
......
src/main/java/com/mmc/pms/controller/WebAndMiniProgramCategoryController.java 0 → 100644
package com.mmc.pms.controller;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Author LW
* @date 2023/6/7 13:33
* 概要：
*/
@Api(tags = {"分类信息"})
@RestController
@RequestMapping("/category")
public class WebAndMiniProgramCategoryController {
// @ApiOperation(value = "web-分类信息")
// @PostMapping("queryCategoryByType")
// @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
// public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
// @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
// return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
// }
}
src/main/java/com/mmc/pms/controller/WebDeviceController.java
...@@ -2,9 +2,15 @@ package com.mmc.pms.controller; ...@@ -2,9 +2,15 @@ package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.common.ResultEnum; import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.lease.dto.BrandDTO;
import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
import com.mmc.pms.model.lease.dto.WareInfoDTO;
import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
import com.mmc.pms.model.lease.vo.LeaseVo;
import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.other.dto.DistrictInfoDTO;
import com.mmc.pms.model.other.dto.ModelDTO;
import com.mmc.pms.model.qo.WareInfoQO; import com.mmc.pms.model.qo.WareInfoQO;
import com.mmc.pms.model.vo.LeaseVo;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import com.mmc.pms.service.WebDeviceService; import com.mmc.pms.service.WebDeviceService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -23,7 +29,8 @@ import org.springframework.web.bind.annotation.*; ...@@ -23,7 +29,8 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/webDevice") @RequestMapping("/webDevice")
public class WebDeviceController { public class WebDeviceController {
@Autowired private WebDeviceService webDeviceService; @Autowired
private WebDeviceService webDeviceService;
@ApiOperation(value = "地域") @ApiOperation(value = "地域")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
......
src/main/java/com/mmc/pms/controller/WebProductMallController.java
package com.mmc.pms.controller; package com.mmc.pms.controller;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.dto.AppGoodsInfoDetailDTO; import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
import com.mmc.pms.model.dto.GoodsInfoListDTO;
import com.mmc.pms.model.dto.ProductCategoryDTO;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.model.sale.dto.AppGoodsInfoDetailDTO;
import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
import com.mmc.pms.service.MiniProgramProductMallService; import com.mmc.pms.service.MiniProgramProductMallService;
import com.mmc.pms.service.WebProductMallService; import com.mmc.pms.service.WebProductMallService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
...@@ -19,9 +19,11 @@ import org.springframework.web.bind.annotation.*; ...@@ -19,9 +19,11 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/webProductMall") @RequestMapping("/webProductMall")
public class WebProductMallController { public class WebProductMallController {
@Autowired private WebProductMallService webProductMallService; @Autowired
private WebProductMallService webProductMallService;
@Autowired private MiniProgramProductMallService miniProgramProductMallService; @Autowired
private MiniProgramProductMallService miniProgramProductMallService;
@ApiOperation("产品类目") @ApiOperation("产品类目")
@GetMapping("/category") @GetMapping("/category")
......
src/main/java/com/mmc/pms/dao/CategoriesDao.java
...@@ -2,9 +2,9 @@ package com.mmc.pms.dao; ...@@ -2,9 +2,9 @@ package com.mmc.pms.dao;
import com.mmc.pms.entity.Categories; import com.mmc.pms.entity.Categories;
import com.mmc.pms.entity.Directory; import com.mmc.pms.entity.Directory;
import com.mmc.pms.model.vo.ClassifyInfoVO; import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
import com.mmc.pms.model.vo.DirectoryInfoVO; import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
import com.mmc.pms.model.vo.QueryClassifyVO; import com.mmc.pms.model.sale.vo.QueryClassifyVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
...@@ -26,7 +26,7 @@ public interface CategoriesDao { ...@@ -26,7 +26,7 @@ public interface CategoriesDao {
int countDirectoryList(); int countDirectoryList();
List<Directory> directoryList(int i, Integer pageSize); List<Directory> directoryList(int pageNo, Integer pageSize, Integer type);
int countDirectory(Integer id); int countDirectory(Integer id);
...@@ -42,11 +42,17 @@ public interface CategoriesDao { ...@@ -42,11 +42,17 @@ public interface CategoriesDao {
Categories getGoodsGroupById(Integer id); Categories getGoodsGroupById(Integer id);
int updateTypeSort(Integer firstId, Integer sort); int updateTypeSort(Integer id, Integer sort);
List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO); List<Categories> selectAllClassification(QueryClassifyVO queryClassifyVO);
int countListClassification(QueryClassifyVO queryClassifyVO); int countListClassification(QueryClassifyVO queryClassifyVO);
int selectDirectoryById(Integer id);
int deleteById(Integer id);
List<Directory> getDirectoryList(Integer type);
} }
......
src/main/java/com/mmc/pms/dao/GoodsInfoDao.java
package com.mmc.pms.dao; package com.mmc.pms.dao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.vo.GoodsAddVO; import com.mmc.pms.model.sale.vo.GoodsAddVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -88,6 +88,8 @@ public interface GoodsInfoDao { ...@@ -88,6 +88,8 @@ public interface GoodsInfoDao {
List<Integer> listIndustrySpecIds(Set<Integer> mallIndstSkuSpecIds); List<Integer> listIndustrySpecIds(Set<Integer> mallIndstSkuSpecIds);
List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds); List<MallGoodsProductDO> listIndustryProductList(List<Integer> industrySpecIds);
List<GoodsInfo> ListGoodsInfoByCategoryId(Integer id);
} }
......
src/main/java/com/mmc/pms/dao/IndustrySpecDao.java
package com.mmc.pms.dao; package com.mmc.pms.dao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.IndustrySpecCPQVO;
import com.mmc.pms.model.qo.IndustrySkuQO; import com.mmc.pms.model.qo.IndustrySkuQO;
import com.mmc.pms.model.vo.IndustrySkuVO; import com.mmc.pms.model.sale.dto.IndustrySpecCPQVO;
import com.mmc.pms.model.vo.IndustrySpecVO; import com.mmc.pms.model.sale.vo.IndustrySkuVO;
import com.mmc.pms.service.Impl.IndustryProductInventoryDO; import com.mmc.pms.model.sale.vo.IndustrySpecVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -55,7 +54,7 @@ public interface IndustrySpecDao { ...@@ -55,7 +54,7 @@ public interface IndustrySpecDao {
int countListPageIndustrySpec(Integer id, String keyword); int countListPageIndustrySpec(Integer id, String keyword);
List<IndustrySpecDO> listPageIndustrySpec(int i, Integer pageSize, Integer industrySkuId, String keyword); List<IndustrySpecDO> listPageIndustrySpec(int pageNo, Integer pageSize, Integer industrySkuId, String keyword);
int batchInsertSpecPrice(List<IndustrySpecPriceDO> list); int batchInsertSpecPrice(List<IndustrySpecPriceDO> list);
...@@ -97,4 +96,6 @@ public interface IndustrySpecDao { ...@@ -97,4 +96,6 @@ public interface IndustrySpecDao {
List<MallIndustrySkuInfoSpecDO> getIndustrySkuInfoSpec(Integer goodsInfoId); List<MallIndustrySkuInfoSpecDO> getIndustrySkuInfoSpec(Integer goodsInfoId);
List<IndustrySpecPriceDO> listIndustrySpecPrice(Integer channelClass, List<Integer> industrySpecIds); List<IndustrySpecPriceDO> listIndustrySpecPrice(Integer channelClass, List<Integer> industrySpecIds);
List<IndustrySpecPriceDO> getIndustrySpecPriceList(List<Integer> specIds);
} }
src/main/java/com/mmc/pms/dao/MiniProgramProductMallDao.java
...@@ -2,7 +2,6 @@ package com.mmc.pms.dao; ...@@ -2,7 +2,6 @@ package com.mmc.pms.dao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.service.Impl.IndustryProductInventoryDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/pms/dao/ProductDao.java
package com.mmc.pms.dao; package com.mmc.pms.dao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.OrderGoodsProdDTO; import com.mmc.pms.model.lease.vo.PriceAcquisition;
import com.mmc.pms.model.dto.ProductSkuVO; import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
import com.mmc.pms.model.dto.ProductSpecPriceDTO;
import com.mmc.pms.model.dto.ProductSpecVO;
import com.mmc.pms.model.qo.MallOrderGoodsInfoQO; import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
import com.mmc.pms.model.qo.ProductSkuQO; import com.mmc.pms.model.qo.ProductSkuQO;
import com.mmc.pms.model.vo.PriceAcquisition; import com.mmc.pms.model.sale.dto.ProductSkuVO;
import com.mmc.pms.model.vo.ProductSpecCPQVO; import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
import com.mmc.pms.model.sale.dto.ProductSpecVO;
import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
......
src/main/java/com/mmc/pms/dao/WebAndMiniProgramCategoryDao.java 0 → 100644
package com.mmc.pms.dao;
/**
* @Author LW
* @date 2023/6/7 13:52
* 概要：
*/
public interface WebAndMiniProgramCategoryDao {
}
src/main/java/com/mmc/pms/dao/WebDeviceDao.java
package com.mmc.pms.dao; package com.mmc.pms.dao;
import com.mmc.pms.common.ResultBody;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.lease.vo.LeaseVo;
import com.mmc.pms.model.qo.WareInfoQO; import com.mmc.pms.model.qo.WareInfoQO;
import com.mmc.pms.model.vo.LeaseVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/pms/entity/AdDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.dto.DeviceCategoryDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/Brand.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.mmc.pms.model.dto.BrandDTO; import com.mmc.pms.model.lease.dto.BrandDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/BrandInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.BrandInfoDTO; import com.mmc.pms.model.sale.dto.BrandInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/Categories.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.ClassifyDetailsDTO; import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
import com.mmc.pms.model.dto.ClassifyInfoDTO; import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
import com.mmc.pms.model.vo.ClassifyInfoVO; import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/DeviceCategory.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.DeviceCategoryDTO; import com.mmc.pms.model.lease.dto.DeviceCategoryDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/DeviceListDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.DeviceListDTO; import com.mmc.pms.model.lease.dto.DeviceListDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/Directory.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.vo.DirectoryInfoVO; import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -30,7 +30,7 @@ public class Directory implements Serializable { ...@@ -30,7 +30,7 @@ public class Directory implements Serializable {
/** /**
* 其他目录关联id * 其他目录关联id
*/ */
private Integer relevance; private Integer pid;
/** /**
* 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录） * 类型：（0：通用目录 1：作业服务目录 2：设备目录 3：飞手目录 4：商城目录）
*/ */
...@@ -48,15 +48,17 @@ public class Directory implements Serializable { ...@@ -48,15 +48,17 @@ public class Directory implements Serializable {
*/ */
private Integer deleted; private Integer deleted;
private String relevanceName;
public Directory(DirectoryInfoVO param) { public Directory(DirectoryInfoVO param) {
this.id = param.getId(); this.id = param.getId();
this.directoryName = param.getDirectoryName(); this.directoryName = param.getDirectoryName();
this.relevance = param.getRelevance(); this.pid = param.getPid();
this.type = param.getType(); this.type = param.getType();
} }
public DirectoryInfoVO buildDirectoryInfoVO() { public DirectoryInfoVO buildDirectoryInfoVO() {
return DirectoryInfoVO.builder().id(id).directoryName(directoryName).relevance(relevance).type(type).build(); return DirectoryInfoVO.builder().id(id).directoryName(directoryName).pid(pid).relevanceName(relevanceName).type(type).build();
} }
} }
src/main/java/com/mmc/pms/entity/DistrictDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.DistrictInfoDTO; import com.mmc.pms.model.other.dto.DistrictInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/GoodsDetailDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsDetailInfoDTO; import com.mmc.pms.model.sale.dto.GoodsDetailInfoDTO;
import com.mmc.pms.model.vo.GoodsDetailVO; import com.mmc.pms.model.sale.vo.GoodsDetailVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/GoodsImgDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsImgDTO; import com.mmc.pms.model.sale.dto.GoodsImgDTO;
import com.mmc.pms.model.vo.GoodsImgVO; import com.mmc.pms.model.sale.vo.GoodsImgVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/GoodsInfo.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.vo.GoodsAddVO; import com.mmc.pms.model.categories.vo.RelevanceGoodsInfoVO;
import com.mmc.pms.model.sale.vo.GoodsAddVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -70,4 +71,8 @@ public class GoodsInfo implements Serializable { ...@@ -70,4 +71,8 @@ public class GoodsInfo implements Serializable {
public GoodsInfo(Integer id) { public GoodsInfo(Integer id) {
this.id = id; this.id = id;
} }
public RelevanceGoodsInfoVO buildRelevanceGoodsInfoVO() {
return RelevanceGoodsInfoVO.builder().id(id).goodsName(goodsName).shelf(shelfStatus).mainImage(mainImg).build();
}
} }
\ No newline at end of file
src/main/java/com/mmc/pms/entity/GoodsInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.AppGoodsInfoDTO; import com.mmc.pms.model.sale.dto.AppGoodsInfoDTO;
import com.mmc.pms.model.dto.GoodsInfoListDTO; import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
import com.mmc.pms.model.vo.CategoryParamAndValueVO; import com.mmc.pms.model.categories.vo.CategoryParamAndValueVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -45,7 +45,9 @@ public class GoodsInfoDO implements Serializable { ...@@ -45,7 +45,9 @@ public class GoodsInfoDO implements Serializable {
private Integer standardProduct; private Integer standardProduct;
private String tag; private String tag;
/** 辅助字段-start */ /**
* 辅助字段-start
*/
private String videoUrl; private String videoUrl;
private Integer goodsVideoId; private Integer goodsVideoId;
......
src/main/java/com/mmc/pms/entity/GoodsQaDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsQaDTO;
import com.mmc.pms.model.vo.GoodsQaVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -25,13 +23,4 @@ public class GoodsQaDO implements Serializable { ...@@ -25,13 +23,4 @@ public class GoodsQaDO implements Serializable {
private Integer deleted; private Integer deleted;
private Date updateTime; private Date updateTime;
private Date createTime; private Date createTime;
public GoodsQaDO(GoodsQaVO goodsQaVO) {
this.question = goodsQaVO.getQuestion();
this.answer = goodsQaVO.getAnswer();
}
public GoodsQaDTO buildGoodsQaDTO() {
return GoodsQaDTO.builder().id(this.id).answer(this.answer).question(this.question).build();
}
} }
src/main/java/com/mmc/pms/entity/GoodsServiceDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsOtherServiceDTO; import com.mmc.pms.model.sale.dto.GoodsOtherServiceDTO;
import com.mmc.pms.model.dto.GoodsServiceDTO; import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -24,11 +24,16 @@ public class GoodsServiceDO implements Serializable { ...@@ -24,11 +24,16 @@ public class GoodsServiceDO implements Serializable {
private Integer saleServiceId; private Integer saleServiceId;
private Date createTime; private Date createTime;
/** 辅助字段-start */ /**
* 辅助字段-start
*/
private String serviceName; private String serviceName;
private String remark; private String remark;
/** 辅助字段-end */
/**
* 辅助字段-end
*/
public GoodsServiceDTO buildGoodsServiceDTO() { public GoodsServiceDTO buildGoodsServiceDTO() {
return GoodsServiceDTO.builder() return GoodsServiceDTO.builder()
.id(this.id) .id(this.id)
......
src/main/java/com/mmc/pms/service/Impl/IndustryProductInventoryDO.java → src/main/java/com/mmc/pms/entity/IndustryProductInventoryDO.java
package com.mmc.pms.service.Impl; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.ProductInventoryVO; import com.mmc.pms.model.sale.dto.ProductInventoryVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/IndustrySku.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.IndustrySkuDTO; import com.mmc.pms.model.sale.dto.IndustrySkuDTO;
import com.mmc.pms.model.vo.IndustrySkuVO; import com.mmc.pms.model.sale.vo.IndustrySkuVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/IndustrySpecDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.IndustrySpecDTO; import com.mmc.pms.model.sale.dto.IndustrySpecDTO;
import com.mmc.pms.model.dto.MallIndustrySpecDTO; import com.mmc.pms.model.sale.dto.MallIndustrySpecDTO;
import com.mmc.pms.model.vo.IndustrySpecVO; import com.mmc.pms.model.sale.vo.IndustrySpecVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/IndustrySpecPriceDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.IndustrySpecPriceDTO; import com.mmc.pms.model.sale.dto.IndustrySpecPriceDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/MallGoodsInfoSimpleDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.OrderGoodsIndstDTO; import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/MallGoodsProductDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.OrderGoodsIndstProdListDTO; import com.mmc.pms.model.order.dto.OrderGoodsIndstProdListDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/MallGoodsSpecSimpleDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.OrderGoodsIndstDetailDTO; import com.mmc.pms.model.order.dto.OrderGoodsIndstDetailDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/MallIndustrySkuInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsSpecDTO; import com.mmc.pms.model.sale.dto.GoodsSpecDTO;
import com.mmc.pms.model.vo.GoodsProdSpecVO; import com.mmc.pms.model.sale.vo.GoodsProdSpecVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/MallProdInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.GoodsSpecDTO; import com.mmc.pms.model.sale.dto.GoodsSpecDTO;
import com.mmc.pms.model.vo.GoodsProdSpecVO; import com.mmc.pms.model.sale.vo.GoodsProdSpecVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/Model.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.mmc.pms.model.dto.ModelDTO; import com.mmc.pms.model.other.dto.ModelDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/OrderInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.OrderInfoDTO; import com.mmc.pms.model.order.dto.OrderInfoDTO;
import com.mmc.pms.model.vo.LeaseOrderVO; import com.mmc.pms.model.order.vo.LeaseOrderVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/OrderReceiptDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.OrderReceiptDTO; import com.mmc.pms.model.order.dto.OrderReceiptDTO;
import com.mmc.pms.model.vo.OrderReceiptVO; import com.mmc.pms.model.order.vo.OrderReceiptVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/ProductCategory.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.ProductCategoryDTO; import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/ProductSkuDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.ProductSkuDTO; import com.mmc.pms.model.sale.dto.ProductSkuDTO;
import com.mmc.pms.model.dto.ProductSkuVO; import com.mmc.pms.model.sale.dto.ProductSkuVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -58,6 +58,8 @@ public class ProductSkuDO implements Serializable { ...@@ -58,6 +58,8 @@ public class ProductSkuDO implements Serializable {
.model(this.model) .model(this.model)
.productBrand(this.brandName) .productBrand(this.brandName)
.createTime(this.createTime) .createTime(this.createTime)
.categoriesId(categoriesId)
.directoryId(directoryId)
.categoryName(this.categoryName) .categoryName(this.categoryName)
.directoryName(directoryName) .directoryName(directoryName)
.build(); .build();
......
src/main/java/com/mmc/pms/entity/ProductSpecDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.MallProductSpecDTO; import com.mmc.pms.model.sale.dto.ProductSpecDTO;
import com.mmc.pms.model.dto.ProductSpecDTO; import com.mmc.pms.model.sale.dto.ProductSpecVO;
import com.mmc.pms.model.dto.ProductSpecVO; import com.mmc.pms.model.sale.dto.MallProductSpecDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/ProductSpecPriceDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.ProductSpecPriceDTO; import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/RepoCashDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.RepoCashDTO; import com.mmc.pms.model.other.dto.RepoCashDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/entity/SkuInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.SkuInfoDTO; import com.mmc.pms.model.lease.vo.WareSkuInfoVO;
import com.mmc.pms.model.vo.WareSkuInfoVO; import com.mmc.pms.model.sale.dto.SkuInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -54,10 +54,10 @@ public class SkuInfoDO implements Serializable { ...@@ -54,10 +54,10 @@ public class SkuInfoDO implements Serializable {
this.stockNum = d.getStockNum(); this.stockNum = d.getStockNum();
} }
public SkuInfoDTO buildSkuInfoDTO(){ public SkuInfoDTO buildSkuInfoDTO() {
return SkuInfoDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuTitle(this.skuTitle).rentPrice(this.rentPrice).rentDeposit(this.rentDeposit) return SkuInfoDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuTitle(this.skuTitle).rentPrice(this.rentPrice).rentDeposit(this.rentDeposit)
.stockNum(this.stockNum).saleNum(this.saleNum).createTime(this.createTime).updateTime(this.updateTime) .stockNum(this.stockNum).saleNum(this.saleNum).createTime(this.createTime).updateTime(this.updateTime)
.skuPriceDTOList(CollectionUtils.isEmpty(this.skuPriceDOList) ? null : this.skuPriceDOList.stream().map(d->{ .skuPriceDTOList(CollectionUtils.isEmpty(this.skuPriceDOList) ? null : this.skuPriceDOList.stream().map(d -> {
return d.buildSkuPriceDTO(); return d.buildSkuPriceDTO();
}).collect(Collectors.toList())).build(); }).collect(Collectors.toList())).build();
} }
......
src/main/java/com/mmc/pms/entity/SkuPriceDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.SkuPriceDTO; import com.mmc.pms.model.lease.vo.WareSkuPriceVO;
import com.mmc.pms.model.vo.WareSkuPriceVO; import com.mmc.pms.model.sale.dto.SkuPriceDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -35,7 +35,7 @@ public class SkuPriceDO implements Serializable { ...@@ -35,7 +35,7 @@ public class SkuPriceDO implements Serializable {
this.maxDay = dd.getMaxDay(); this.maxDay = dd.getMaxDay();
} }
public SkuPriceDTO buildSkuPriceDTO(){ public SkuPriceDTO buildSkuPriceDTO() {
return SkuPriceDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuInfoId(this.skuInfoId).rentPrice(this.rentPrice).minDay(this.minDay) return SkuPriceDTO.builder().id(this.id).wareInfoId(this.wareInfoId).skuInfoId(this.skuInfoId).rentPrice(this.rentPrice).minDay(this.minDay)
.maxDay(this.maxDay).createTime(this.createTime).build(); .maxDay(this.maxDay).createTime(this.createTime).build();
} }
......
src/main/java/com/mmc/pms/entity/SkuUnitDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.SkuUnitDTO; import com.mmc.pms.model.sale.dto.SkuUnitDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/WareDetailDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.WareDetailDTO; import com.mmc.pms.model.lease.dto.WareDetailDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/WareImgDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.WareImgDTO; import com.mmc.pms.model.lease.dto.WareImgDTO;
import com.mmc.pms.model.vo.WareImgVO; import com.mmc.pms.model.lease.vo.WareImgVO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/entity/WareInfoDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.AppletWareInfoDTO; import com.mmc.pms.model.lease.dto.WareInfoDTO;
import com.mmc.pms.model.dto.WareInfoDTO; import com.mmc.pms.model.lease.dto.WareInfoItemDTO;
import com.mmc.pms.model.dto.WareInfoItemDTO; import com.mmc.pms.model.lease.dto.AppletWareInfoDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -43,7 +43,9 @@ public class WareInfoDO implements Serializable { ...@@ -43,7 +43,9 @@ public class WareInfoDO implements Serializable {
private Date updateTime; private Date updateTime;
private Integer pid; private Integer pid;
/** 辅助字段-start */ /**
* 辅助字段-start
*/
private List<WareImgDO> wareImgs; private List<WareImgDO> wareImgs;
// private List<WareVideoDO> wareVideos; // private List<WareVideoDO> wareVideos;
private WarePropDO warePropDO; private WarePropDO warePropDO;
...@@ -51,7 +53,9 @@ public class WareInfoDO implements Serializable { ...@@ -51,7 +53,9 @@ public class WareInfoDO implements Serializable {
// private WareDetailDO wareDetailDO; // private WareDetailDO wareDetailDO;
// private List<SkuInfoDO> skuInfoDOList; // private List<SkuInfoDO> skuInfoDOList;
/** 辅助字段-end */ /**
* 辅助字段-end
*/
public WareInfoDTO buildWareInfoDTO() { public WareInfoDTO buildWareInfoDTO() {
return WareInfoDTO.builder() return WareInfoDTO.builder()
.id(this.id) .id(this.id)
......
src/main/java/com/mmc/pms/entity/WarePropDO.java
package com.mmc.pms.entity; package com.mmc.pms.entity;
import com.mmc.pms.model.dto.WarePropDTO; import com.mmc.pms.model.lease.dto.WarePropDTO;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ClassifyDetailsDTO.java → src/main/java/com/mmc/pms/model/categories/dto/ClassifyDetailsDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.categories.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ClassifyInfoDTO.java → src/main/java/com/mmc/pms/model/categories/dto/ClassifyInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.categories.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/CategoriesInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/CategoriesInfoVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.categories.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/CategoryParamAndValueVO.java → src/main/java/com/mmc/pms/model/categories/vo/CategoryParamAndValueVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.categories.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/ClassifyInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/ClassifyInfoVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.categories.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/DirectoryInfoVO.java → src/main/java/com/mmc/pms/model/categories/vo/DirectoryInfoVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.categories.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -22,7 +22,9 @@ public class DirectoryInfoVO { ...@@ -22,7 +22,9 @@ public class DirectoryInfoVO {
@ApiModelProperty(value = "目录名称") @ApiModelProperty(value = "目录名称")
private String directoryName; private String directoryName;
@ApiModelProperty(value = "关联目录的id") @ApiModelProperty(value = "关联目录的id")
private Integer relevance; private Integer pid;
@ApiModelProperty(value = "关联目录名称")
private String relevanceName;
@ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）") @ApiModelProperty(value = "分类模块：（0：通用分类 1：作业服务分类 2：设备分类 3：飞手分类 4：商城分类）")
private Integer type; private Integer type;
} }
src/main/java/com/mmc/pms/model/vo/GoodsQaVO.java → src/main/java/com/mmc/pms/model/categories/vo/RelevanceCurriculumVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.categories.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -8,19 +8,21 @@ import lombok.NoArgsConstructor; ...@@ -8,19 +8,21 @@ import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Author small @Date 2023/5/16 15:23 @Version 1.0 * @Author LW
* @date 2023/6/7 16:14
* 概要：
*/ */
@Data @Data
@AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.model.vo.GoodsQaVO", description = "新增/修改参数类") @AllArgsConstructor
public class GoodsQaVO implements Serializable { public class RelevanceCurriculumVO implements Serializable {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Integer id; private Integer id;
@ApiModelProperty(value = "问题") @ApiModelProperty(value = "课程名称")
private String question; private String curriculumName;
// 课程图片
// 状态
@ApiModelProperty(value = "回答")
private String answer;
} }
src/main/java/com/mmc/pms/model/dto/GoodsQaDTO.java → src/main/java/com/mmc/pms/model/categories/vo/RelevanceGoodsInfoVO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.categories.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -9,20 +9,21 @@ import lombok.NoArgsConstructor; ...@@ -9,20 +9,21 @@ import lombok.NoArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
/** /**
* @Author small @Date 2023/5/16 15:02 @Version 1.0 * @Author LW
* @date 2023/6/7 16:03
* 概要：
*/ */
@Builder
@Data @Data
@AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsQaDTO", description = "常见问题DTO") @AllArgsConstructor
public class GoodsQaDTO implements Serializable { @Builder
public class RelevanceGoodsInfoVO implements Serializable {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private Integer id; private Integer id;
@ApiModelProperty(value = "商品名称")
@ApiModelProperty(value = "问题") private String goodsName;
private String question; @ApiModelProperty(value = "主图")
private String mainImage;
@ApiModelProperty(value = "回答") @ApiModelProperty(value = "状态 上架0 下架1")
private String answer; private Integer shelf;
} }
src/main/java/com/mmc/pms/model/categories/vo/RelevanceServiceInfoVO.java 0 → 100644
package com.mmc.pms.model.categories.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author LW
* @date 2023/6/7 16:08
* 概要：
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class RelevanceServiceInfoVO implements Serializable {
@ApiModelProperty(value = "id")
private Integer id;
@ApiModelProperty(value = "服务编号")
private String number;
@ApiModelProperty(value = "服务名称")
private String name;
@ApiModelProperty(value = "视频")
private String videoUrl;
@ApiModelProperty(value = "状态 上架0 下架1")
private Integer shelf;
}
src/main/java/com/mmc/pms/model/categories/vo/RelevantBusinessVO.java 0 → 100644
package com.mmc.pms.model.categories.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author LW
* @date 2023/6/7 16:54
* 概要：
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class RelevantBusinessVO {
private List<RelevanceCurriculumVO> relevanceCurriculumVOs;
private List<RelevanceGoodsInfoVO> relevanceGoodsInfoVOs;
private List<RelevanceServiceInfoVO> relevanceServiceInfoVOs;
}
src/main/java/com/mmc/pms/model/dto/BaseAccountDTO.java deleted 100644 → 0
package com.mmc.pms.model.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author small @Date 2023/5/25 9:55 @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.model.dto.BaseAccountDTO", description = "登录信息DTO")
public class BaseAccountDTO implements Serializable {
private static final long serialVersionUID = -2979712090903806216L;
private Integer id;
private String uid;
private String accountPhone;
private String accountNo;
private String accountName;
private String tokenPort;
@ApiModelProperty(value = "角色ID")
private Integer roleId;
@ApiModelProperty(value = "是否为管理角色:0否 1是")
private Integer admin; // 是否为管理角色
@ApiModelProperty(value = "是否为运营角色:0否 1是")
private Integer operate;
@ApiModelProperty(value = "是否PMC发货专员:0否 1是")
private Integer pmc;
@ApiModelProperty(value = "单位信息")
private CompanyCacheDTO companyInfo; // 单位信息
public BaseAccountDTO(UserAccountDTO user) {
this.id = user.getId();
this.accountNo = user.getAccountNo();
this.accountName = user.getUserName();
this.roleId = user.getRoleInfo() == null ? null : user.getRoleInfo().getId();
this.admin = user.getRoleInfo() == null ? null : user.getRoleInfo().getAdmin();
this.operate = user.getRoleInfo() == null ? null : user.getRoleInfo().getOperate();
this.pmc = user.getRoleInfo() == null ? null : user.getRoleInfo().getPmc();
}
public BaseAccountDTO(RepoAccountDTO account) {
this.id = account.getId();
this.accountName = account.getAccountName();
this.uid = account.getUid();
this.accountPhone = account.getPhoneNum();
}
public BaseAccountDTO(MallUserDTO account) {
this.id = account.getId();
this.accountName = account.getNickName();
this.uid = account.getUid();
this.accountPhone = account.getPhoneNum();
}
public BaseAccountDTO(FlyerAccountDTO account) {
this.id = account.getId();
this.accountName = account.getAccountName();
this.uid = account.getUid();
this.accountPhone = account.getPhoneNum();
}
/**
* 是否为科比特超级管理员单位(是:无单位资源限制 否:只能看当前和下级单位的资源)
*
* @return
*/
public boolean isManage() {
if (this.getCompanyInfo() == null) {
return false;
}
if (this.getCompanyInfo().getManage() == null) {
return false;
}
return this.getCompanyInfo().getManage() == 1;
}
/**
* 判断是否已授权
*
* @return
*/
// public boolean authorized() {
// if (StringUtils.isBlank(this.accountName) || StringUtils.isBlank(this.accountPhone)) {
// return false;
// }
// return true;
// }
}
src/main/java/com/mmc/pms/model/dto/CompanyCacheDTO.java deleted 100644 → 0
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 deleted 100644 → 0
package com.mmc.pms.model.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @Author small @Date 2023/5/25 9:56 @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.sharefly.dto.CompanySimpleDTO", description = "单位信息DTO")
public class CompanySimpleDTO implements Serializable {
private static final long serialVersionUID = 2541404541696571857L;
@ApiModelProperty(value = "单位ID")
private Integer id;
@ApiModelProperty(value = "单位名称")
private String company;
@ApiModelProperty(value = "账号类型:0合伙人 1员工")
private Integer userType;
@ApiModelProperty(value = "是否为管理单位：0否 1是", hidden = true)
private Integer manage;
@ApiModelProperty(value = "当前单位ID+子级单位ID的集合", hidden = true)
private List<Integer> companys;
}
src/main/java/com/mmc/pms/model/dto/FlyerAccountDTO.java deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
package com.mmc.pms.model.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Author small @Date 2023/5/25 9:59 @Version 1.0
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class FlyerScenesAuthDTO implements Serializable {
private static final long serialVersionUID = 66032902942031710L;
@ApiModelProperty("飞手id")
private Integer id;
@ApiModelProperty(value = "商务礼仪认证")
private Integer protocolAuth;
@ApiModelProperty(value = "电力巡检认证状态，0未认证，1通过，2未通过")
private Integer electricAuth;
@ApiModelProperty(value = "航空测绘认证状态，0未认证，1通过，2未通过", hidden = true)
@JsonIgnore
private Integer aviationAuth;
@ApiModelProperty(value = "应急保障认证状态，0未认证，1通过，2未通过", hidden = true)
@JsonIgnore
private Integer emergencyAuth;
@ApiModelProperty(value = "value = 监察巡检认证状态，0未认证，1通过，2未通过", hidden = true)
@JsonIgnore
private Integer superviseAuth;
@ApiModelProperty(value = "通用认证状态，0未认证，1通过，2未通过")
private Integer universalAuth;
@ApiModelProperty(value = "油气巡检认证状态，0未认证，1通过，2未通过")
private Integer oilGasAuth;
@ApiModelProperty(value = "演示认证状态，0未认证，1通过，2未通过")
private Integer demoAuth;
@ApiModelProperty(value = "航空测绘外业状态，0未认证，1通过，2未通过")
private Integer aviationOutAuth;
@ApiModelProperty(value = "航空测绘内业状态，0未认证，1通过，2未通过")
private Integer aviationInAuth;
@ApiModelProperty(value = "指挥车认证状态，0未认证，1通过，2未通过")
private Integer commandAuth;
@ApiModelProperty(value = "天目将软件认证状态，0未认证，1通过，2未通过")
private Integer tmjAuth;
}
src/main/java/com/mmc/pms/model/dto/RepoAccountDTO.java deleted 100644 → 0
package com.mmc.pms.model.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Set;
/**
* @Author small @Date 2023/5/25 9:57 @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.model.dto.RepoAccountDTO", description = "云仓账号信息DTO")
public class RepoAccountDTO implements Serializable {
private static final long serialVersionUID = 1433562781546856233L;
@ApiModelProperty(value = "用户id")
private Integer id;
@ApiModelProperty(value = "用户uid")
private String uid;
@ApiModelProperty(value = "账号名称")
private String accountName;
@ApiModelProperty(value = "账号类型")
private Integer accountType;
@ApiModelProperty(value = "联系电话")
private String phoneNum;
@ApiModelProperty(value = "实名认证状态")
private Integer realAuthStatus;
@ApiModelProperty(value = "企业认证状态")
private Integer entAuthStatus;
@ApiModelProperty(value = "渠道认证状态")
private Integer channelAuthStatus;
@ApiModelProperty(value = "渠道等级")
private Integer channelClass;
@ApiModelProperty(value = "常驻城市")
private String resAddress;
@ApiModelProperty(value = "昵称")
private String nickName;
@ApiModelProperty(value = "头像url")
private String headerImg;
@ApiModelProperty(value = "经度")
private BigDecimal lon;
@ApiModelProperty(value = "纬度")
private BigDecimal lat;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除状态，0未删除，1删除")
private Integer deleted;
@ApiModelProperty(value = "企业名称")
private String entName;
@ApiModelProperty(value = "用户名称")
private String userName;
@ApiModelProperty(value = "企业认证时间")
private Date entAuthTime;
@ApiModelProperty(value = "生成时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "现金余额")
private BigDecimal cashAmt;
private String unionId;
private String openId;
@ApiModelProperty(value = "多端用户，USER_PORT(云享飞)-FLYER_PORT(云飞手)-REPO_PORT(云仓)")
private Set<String> ports;
@ApiModelProperty(value = "用户推荐人数量")
private Integer rcdRepoTeamNum;
@ApiModelProperty(value = "推荐人Uid")
private String rcdUid;
@ApiModelProperty(value = "推荐人账户名称")
private String rcdAccountName;
@ApiModelProperty(value = "推荐人昵称")
private String rcdNickName;
@ApiModelProperty(value = "推荐人id")
private Integer rcdAccountId;
@ApiModelProperty(value = "是否销售")
private Integer sale;
@ApiModelProperty(value = "是否白名单")
private Integer white;
@ApiModelProperty(value = "用户来源：0自然流，1海报，2抖音，3公众号，4社群，5招投标，默认0")
private Integer source;
@ApiModelProperty(value = "推荐单位")
private String company;
@ApiModelProperty(value = "推荐单位ID", hidden = true)
private Integer rcdCompanyId;
}
src/main/java/com/mmc/pms/model/dto/TaskFlyerCostDTO.java deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
package com.mmc.pms.model.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author small @Date 2023/5/25 10:13 @Version 1.0
*/
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
// @ApiModel(value = "com.mmc.csf.model.dto.WagTermDetailDTO", description = "任务工资信息DTO")
public class WagTermDetailDTO implements Serializable {
private static final long serialVersionUID = 6088946395006027466L;
@ApiModelProperty(value = "ID")
private Integer id;
@ApiModelProperty(value = "工资日期")
private Date costDate;
@ApiModelProperty(value = "工资(元/日)")
private BigDecimal wagPrice;
@ApiModelProperty(value = "补贴(元/日)")
private BigDecimal sudyPrice;
@ApiModelProperty(value = "出差租房补贴(元/日)")
private BigDecimal rentHousePrice;
@ApiModelProperty(value = "出差交通补贴(元/日)")
private BigDecimal trafficPrice;
@ApiModelProperty(value = "高温补贴(元/日)")
private BigDecimal hotPrice;
@ApiModelProperty(value = "飞手人数")
private Integer flyerNum;
@ApiModelProperty(value = "支付比例")
private BigDecimal payPersent;
@ApiModelProperty(value = "应结工资")
private BigDecimal shouldPay;
@ApiModelProperty(value = "补贴合计-单价（不计算人数）")
private BigDecimal daySudyUnit;
public void defaultValue() {
if (this.wagPrice == null) {
this.wagPrice = BigDecimal.ZERO;
}
if (this.sudyPrice == null) {
this.sudyPrice = BigDecimal.ZERO;
}
if (this.rentHousePrice == null) {
this.rentHousePrice = BigDecimal.ZERO;
}
if (this.trafficPrice == null) {
this.trafficPrice = BigDecimal.ZERO;
}
if (this.wagPrice == null) {
this.wagPrice = BigDecimal.ZERO;
}
if (this.payPersent == null) {
this.payPersent = BigDecimal.ZERO;
}
if (this.flyerNum == null) {
this.flyerNum = 0;
}
}
}
src/main/java/com/mmc/pms/model/vo/Create.java → src/main/java/com/mmc/pms/model/group/Create.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.group;
/** /**
* @Author small @Date 2023/5/16 13:37 @Version 1.0 * @Author small @Date 2023/5/16 13:37 @Version 1.0
*/ */
public interface Create {} public interface Create {
}
src/main/java/com/mmc/pms/model/vo/Freeze.java → src/main/java/com/mmc/pms/model/group/Freeze.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.group;
/** /**
* @Author small @Date 2023/5/16 13:49 @Version 1.0 * @Author small @Date 2023/5/16 13:49 @Version 1.0
*/ */
public interface Freeze {} public interface Freeze {
}
src/main/java/com/mmc/pms/model/vo/Update.java → src/main/java/com/mmc/pms/model/group/Update.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.group;
/** /**
* @Author small @Date 2023/5/16 13:37 @Version 1.0 * @Author small @Date 2023/5/16 13:37 @Version 1.0
*/ */
public interface Update {} public interface Update {
}
src/main/java/com/mmc/pms/model/dto/AppletWareInfoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/AppletWareInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/BrandDTO.java → src/main/java/com/mmc/pms/model/lease/dto/BrandDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/DeviceCategoryDTO.java → src/main/java/com/mmc/pms/model/lease/dto/DeviceCategoryDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/DeviceListDTO.java → src/main/java/com/mmc/pms/model/lease/dto/DeviceListDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/WareDetailDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/WareImgDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareImgDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -16,7 +16,7 @@ import java.io.Serializable; ...@@ -16,7 +16,7 @@ import java.io.Serializable;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@ApiModel(value = "com.mmc.pms.model.dto.WareImgDTO", description = "设备图片DTO") @ApiModel(value = "com.mmc.pms.model.lease.dto.WareImgDTO", description = "设备图片DTO")
public class WareImgDTO implements Serializable { public class WareImgDTO implements Serializable {
private static final long serialVersionUID = 1195966760401573468L; private static final long serialVersionUID = 1195966760401573468L;
......
src/main/java/com/mmc/pms/model/dto/WareInfoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/WareInfoItemDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareInfoItemDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -19,7 +18,7 @@ import java.util.List; ...@@ -19,7 +18,7 @@ import java.util.List;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
//@ApiModel(value = "com.mmc.pms.model.dto.WareInfoItemDTO", description = "设备列表ItemDTO") //@ApiModel(value = "com.mmc.pms.model.lease.dto.WareInfoItemDTO", description = "设备列表ItemDTO")
public class WareInfoItemDTO implements Serializable { public class WareInfoItemDTO implements Serializable {
private static final long serialVersionUID = -4354269497656808831L; private static final long serialVersionUID = -4354269497656808831L;
......
src/main/java/com/mmc/pms/model/dto/WarePropDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WarePropDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/WareVideoDTO.java → src/main/java/com/mmc/pms/model/lease/dto/WareVideoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.lease.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/vo/LeaseVo.java → src/main/java/com/mmc/pms/model/lease/vo/LeaseVo.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; ...@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
// @ApiModel(value = "com.mmc.pms.model.vo.LeaseVo", description = "立即租赁") // @ApiModel(value = "com.mmc.pms.model.lease.vo.LeaseVo", description = "立即租赁")
public class LeaseVo { public class LeaseVo {
private static final long serialVersionUID = -8917940296555539559L; private static final long serialVersionUID = -8917940296555539559L;
......
src/main/java/com/mmc/pms/model/vo/PriceAcquisition.java → src/main/java/com/mmc/pms/model/lease/vo/PriceAcquisition.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/WareImgVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareImgVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/vo/WareInfoVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareInfoVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/WareSkuInfoVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareSkuInfoVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/WareSkuPriceVO.java → src/main/java/com/mmc/pms/model/lease/vo/WareSkuPriceVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.lease.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstDetailDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/OrderGoodsIndstProdListDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstProdListDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/OrderGoodsProdDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import com.mmc.pms.model.sale.dto.GoodsServiceDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/OrderGoodsProdDetailDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/OrderInfoDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import com.mmc.pms.entity.RepoCashDO; import com.mmc.pms.entity.RepoCashDO;
import com.mmc.pms.model.other.dto.KdnExpDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/OrderReceiptDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderReceiptDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/OrderRefundDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderRefundDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import com.mmc.pms.model.other.dto.RefundLogDTO;
import com.mmc.pms.model.other.dto.RepoCashDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/OrderTaskDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderTaskDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -152,9 +152,6 @@ public class OrderTaskDTO implements Serializable { ...@@ -152,9 +152,6 @@ public class OrderTaskDTO implements Serializable {
@ApiModelProperty(value = "倒计时") @ApiModelProperty(value = "倒计时")
private Long countSconds; private Long countSconds;
@ApiModelProperty(value = "飞手基本信息")
private FlyerAccountDTO flyerAccount;
@ApiModelProperty(value = "飞手类型") @ApiModelProperty(value = "飞手类型")
private Integer flyerType; private Integer flyerType;
...@@ -164,9 +161,6 @@ public class OrderTaskDTO implements Serializable { ...@@ -164,9 +161,6 @@ public class OrderTaskDTO implements Serializable {
@ApiModelProperty(value = "0:隐藏 1:显示") @ApiModelProperty(value = "0:隐藏 1:显示")
private Integer display; private Integer display;
@ApiModelProperty(value = "飞手-结算-信息", hidden = true)
private TaskFlyerCostDTO taskFlyerCost;
@ApiModelProperty(value = "下期飞手入账时间") @ApiModelProperty(value = "下期飞手入账时间")
private String nextFlyerIncomeDate; private String nextFlyerIncomeDate;
...@@ -206,25 +200,4 @@ public class OrderTaskDTO implements Serializable { ...@@ -206,25 +200,4 @@ public class OrderTaskDTO implements Serializable {
@ApiModelProperty(value = "子订单信息") @ApiModelProperty(value = "子订单信息")
private List<OrderTaskSonDTO> son; private List<OrderTaskSonDTO> son;
public void buildOperateUser(UserAccountDTO op) {
this.phoneNum = op.getPhoneNum();
this.operateName = op.getUserName();
this.userOperateId = op.getId();
}
public void buildWxUser(UserAccountDTO wx) {
this.userAccountId = wx.getId();
this.uid = wx.getUid();
this.nickName = wx.getNickName();
this.userName = wx.getUserName();
this.userPhoneNum = wx.getPhoneNum();
}
public FlyerOrderTaskDTO buildFlyerOrderTaskDTO() {
return FlyerOrderTaskDTO.builder()
.orderId(this.id)
.orderNo(this.orderNo)
.orderName(this.orderName)
.build();
}
} }
src/main/java/com/mmc/pms/model/dto/OrderTaskSonDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderTaskSonDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/OrderVcuDTO.java → src/main/java/com/mmc/pms/model/order/dto/OrderVcuDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.order.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/LeaseOrderVO.java → src/main/java/com/mmc/pms/model/order/vo/LeaseOrderVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.order.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/vo/OrderReceiptVO.java → src/main/java/com/mmc/pms/model/order/vo/OrderReceiptVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.order.vo;
import com.mmc.pms.entity.OrderReceiptDO; import com.mmc.pms.entity.OrderReceiptDO;
import com.mmc.pms.model.dto.RepoAddressDTO; import com.mmc.pms.model.other.dto.RepoAddressDTO;
import com.mmc.pms.model.dto.RepoInfoDTO; import com.mmc.pms.model.other.dto.RepoInfoDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/AdDTO.java → src/main/java/com/mmc/pms/model/other/dto/AdDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/DistrictInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/DistrictInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ExpStationsDTO.java → src/main/java/com/mmc/pms/model/other/dto/ExpStationsDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/KdnExpDTO.java → src/main/java/com/mmc/pms/model/other/dto/KdnExpDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ModelDTO.java → src/main/java/com/mmc/pms/model/other/dto/ModelDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/RefundLogDTO.java → src/main/java/com/mmc/pms/model/other/dto/RefundLogDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/RepoAddressDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoAddressDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/RepoCashDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoCashDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/RepoInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/RepoInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/RoleInfoDTO.java → src/main/java/com/mmc/pms/model/other/dto/RoleInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.other.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/qo/GoodsInfoQO.java
package com.mmc.pms.model.qo; package com.mmc.pms.model.qo;
import com.mmc.pms.model.vo.Freeze; import com.mmc.pms.model.group.Freeze;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/qo/IndustrySkuQO.java
package com.mmc.pms.model.qo; package com.mmc.pms.model.qo;
import com.mmc.pms.model.vo.Freeze; import com.mmc.pms.model.group.Freeze;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/qo/ProductSkuQO.java
package com.mmc.pms.model.qo; package com.mmc.pms.model.qo;
import com.mmc.pms.model.vo.Freeze; import com.mmc.pms.model.group.Freeze;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/AppGoodsInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/AppGoodsInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/AppGoodsInfoDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/AppGoodsInfoDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -65,6 +65,4 @@ public class AppGoodsInfoDetailDTO implements Serializable { ...@@ -65,6 +65,4 @@ public class AppGoodsInfoDetailDTO implements Serializable {
@ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ") @ApiModelProperty(value = "其他服务: 1:免费配送，2：专业飞手培训2日， 3：半年保修， 4：一年保修 ")
private List<GoodsOtherServiceDTO> otherService; private List<GoodsOtherServiceDTO> otherService;
@ApiModelProperty(value = "常见问题")
private List<GoodsQaDTO> question;
} }
src/main/java/com/mmc/pms/model/dto/BrandInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/BrandInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/GoodsDetailInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsDetailInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/GoodsImgDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsImgDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/GoodsInfoListDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsInfoListDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/GoodsOtherServiceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsOtherServiceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/GoodsServiceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsServiceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/GoodsSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsSpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/GoodsTypeDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/GoodsTypeDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/IndustrySkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySkuDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/IndustrySpecCPQVO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecCPQVO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.mmc.pms.model.vo.SpecPriceVO; import com.mmc.pms.model.sale.vo.SpecPriceVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/dto/IndustrySpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -33,4 +33,6 @@ public class IndustrySpecDTO implements Serializable { ...@@ -33,4 +33,6 @@ public class IndustrySpecDTO implements Serializable {
private List<ProductInventoryVO> productInventoryList; private List<ProductInventoryVO> productInventoryList;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "价格配置")
private List<IndustrySpecPriceDTO> priceList;
} }
src/main/java/com/mmc/pms/model/dto/IndustrySpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/IndustrySpecPriceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/MallGoodsDetailDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallGoodsDetailDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/MallGoodsShopCarDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallGoodsShopCarDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
src/main/java/com/mmc/pms/model/dto/MallIndustrySpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallIndustrySpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/MallProductSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallProductSpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.mmc.pms.model.vo.ProductSpecCPQVO; import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/MallProductSpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallProductSpecPriceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/MallSkuInfoSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallSkuInfoSpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/MallUserDTO.java → src/main/java/com/mmc/pms/model/sale/dto/MallUserDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ProductCategoryDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductCategoryDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ProductInventoryVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductInventoryVO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.mmc.pms.model.vo.GoodsProductSkuVO; import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/dto/ProductSkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSkuDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ProductSkuVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSkuVO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.mmc.pms.model.vo.Create; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.vo.Update; import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/dto/ProductSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ProductSpecPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecPriceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/ProductSpecVO.java → src/main/java/com/mmc/pms/model/sale/dto/ProductSpecVO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import com.mmc.pms.model.vo.Create; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.vo.ProductSpecCPQVO; import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.vo.Update; import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/dto/RemoveSkuDTO.java → src/main/java/com/mmc/pms/model/sale/dto/RemoveSkuDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/SkuAndSpecDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuAndSpecDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/SkuInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/dto/SkuPriceDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuPriceDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/dto/SkuUnitDTO.java → src/main/java/com/mmc/pms/model/sale/dto/SkuUnitDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/dto/TypeGoodsInfoDTO.java → src/main/java/com/mmc/pms/model/sale/dto/TypeGoodsInfoDTO.java
package com.mmc.pms.model.dto; package com.mmc.pms.model.sale.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/GoodsAddVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsAddVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/GoodsDetailVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsDetailVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/GoodsImgVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsImgVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/mmc/pms/model/vo/GoodsProdSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsProdSpecVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.dto.ProductSpecVO; import com.mmc.pms.model.sale.dto.ProductSpecVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/GoodsProductSkuVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsProductSkuVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -27,6 +29,8 @@ public class GoodsProductSkuVO implements Serializable { ...@@ -27,6 +29,8 @@ public class GoodsProductSkuVO implements Serializable {
@NotNull(message = "产品类型不能为空", groups = {Update.class, Create.class}) @NotNull(message = "产品类型不能为空", groups = {Update.class, Create.class})
@ApiModelProperty(value = "产品类型") @ApiModelProperty(value = "产品类型")
private Integer goodsTypeId; private Integer goodsTypeId;
@ApiModelProperty()
private String categoryName;
@ApiModelProperty(value = "型号") @ApiModelProperty(value = "型号")
private String model; private String model;
@ApiModelProperty(value = "产品品牌") @ApiModelProperty(value = "产品品牌")
......
src/main/java/com/mmc/pms/model/vo/GoodsSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/GoodsSpecVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.dto.ProductSpecVO; import com.mmc.pms.model.sale.dto.ProductSpecVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/IndustrySkuVO.java → src/main/java/com/mmc/pms/model/sale/vo/IndustrySkuVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/com/mmc/pms/model/vo/IndustrySpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/IndustrySpecVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.dto.ProductInventoryVO; import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.model.sale.dto.ProductInventoryVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/model/vo/MallProductSpecVO.java → src/main/java/com/mmc/pms/model/sale/vo/MallProductSpecVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/ProductSpecCPQVO.java → src/main/java/com/mmc/pms/model/sale/vo/ProductSpecCPQVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/QueryClassifyVO.java → src/main/java/com/mmc/pms/model/sale/vo/QueryClassifyVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import com.mmc.pms.model.group.Create;
import com.mmc.pms.model.group.Freeze;
import com.mmc.pms.model.group.Update;
import com.mmc.pms.page.Page; import com.mmc.pms.page.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/com/mmc/pms/model/vo/SpecPriceVO.java → src/main/java/com/mmc/pms/model/sale/vo/SpecPriceVO.java
package com.mmc.pms.model.vo; package com.mmc.pms.model.sale.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/com/mmc/pms/service/CategoriesService.java
package com.mmc.pms.service; package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.vo.ClassifyInfoVO; import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
import com.mmc.pms.model.vo.DirectoryInfoVO; import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
import com.mmc.pms.model.vo.QueryClassifyVO; import com.mmc.pms.model.sale.vo.QueryClassifyVO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
/** /**
...@@ -15,7 +15,7 @@ public interface CategoriesService { ...@@ -15,7 +15,7 @@ public interface CategoriesService {
ResultBody addOrEditDirectory(DirectoryInfoVO param); ResultBody addOrEditDirectory(DirectoryInfoVO param);
PageResult directoryList(Integer pageNo, Integer pageSize); PageResult directoryList(Integer pageNo, Integer pageSize, Integer type);
ResultBody removeDirectory(Integer id); ResultBody removeDirectory(Integer id);
...@@ -28,4 +28,10 @@ public interface CategoriesService { ...@@ -28,4 +28,10 @@ public interface CategoriesService {
PageResult getClassificationList(QueryClassifyVO queryClassifyVO); PageResult getClassificationList(QueryClassifyVO queryClassifyVO);
ResultBody getClassifyDetails(Integer id); ResultBody getClassifyDetails(Integer id);
ResultBody queryRelevantBusiness(Integer id, Integer type);
ResultBody deleteRelevantBusiness(Integer id);
ResultBody getDirectoryList(Integer type);
} }
src/main/java/com/mmc/pms/service/GoodsInfoService.java
package com.mmc.pms.service; package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.sale.dto.ProductSpecPriceDTO;
import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
import com.mmc.pms.model.qo.MallOrderGoodsInfoQO; import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
import com.mmc.pms.model.qo.ProductSpecPriceQO; import com.mmc.pms.model.qo.ProductSpecPriceQO;
import com.mmc.pms.model.vo.GoodsAddVO; import com.mmc.pms.model.sale.dto.MallGoodsShopCarDTO;
import com.mmc.pms.model.sale.dto.MallProductSpecPriceDTO;
import com.mmc.pms.model.sale.vo.GoodsAddVO;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/pms/service/Impl/BrandManageServiceImpl.java
...@@ -5,7 +5,7 @@ import com.mmc.pms.common.ResultEnum; ...@@ -5,7 +5,7 @@ import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.dao.BrandManageDao; import com.mmc.pms.dao.BrandManageDao;
import com.mmc.pms.dao.ProductDao; import com.mmc.pms.dao.ProductDao;
import com.mmc.pms.entity.BrandInfoDO; import com.mmc.pms.entity.BrandInfoDO;
import com.mmc.pms.model.dto.BrandInfoDTO; import com.mmc.pms.model.sale.dto.BrandInfoDTO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.BrandManageService; import com.mmc.pms.service.BrandManageService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
src/main/java/com/mmc/pms/service/Impl/CategoriesServiceImpl.java
...@@ -3,19 +3,24 @@ package com.mmc.pms.service.Impl; ...@@ -3,19 +3,24 @@ package com.mmc.pms.service.Impl;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.common.ResultEnum; import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.dao.CategoriesDao; import com.mmc.pms.dao.CategoriesDao;
import com.mmc.pms.dao.GoodsInfoDao;
import com.mmc.pms.entity.Categories; import com.mmc.pms.entity.Categories;
import com.mmc.pms.entity.Directory; import com.mmc.pms.entity.Directory;
import com.mmc.pms.model.dto.ClassifyInfoDTO; import com.mmc.pms.entity.GoodsInfo;
import com.mmc.pms.model.vo.ClassifyInfoVO; import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
import com.mmc.pms.model.vo.DirectoryInfoVO; import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
import com.mmc.pms.model.vo.QueryClassifyVO; import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
import com.mmc.pms.model.categories.vo.RelevantBusinessVO;
import com.mmc.pms.model.sale.vo.QueryClassifyVO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.CategoriesService; import com.mmc.pms.service.CategoriesService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -31,6 +36,8 @@ import java.util.stream.Collectors; ...@@ -31,6 +36,8 @@ import java.util.stream.Collectors;
public class CategoriesServiceImpl implements CategoriesService { public class CategoriesServiceImpl implements CategoriesService {
@Autowired @Autowired
private CategoriesDao categoriesDao; private CategoriesDao categoriesDao;
@Resource
private GoodsInfoDao goodsInfoDao;
@Override @Override
public ResultBody addOrEditDirectory(DirectoryInfoVO param) { public ResultBody addOrEditDirectory(DirectoryInfoVO param) {
...@@ -42,18 +49,22 @@ public class CategoriesServiceImpl implements CategoriesService { ...@@ -42,18 +49,22 @@ public class CategoriesServiceImpl implements CategoriesService {
if (param.getId() == null) { if (param.getId() == null) {
categoriesDao.insertDirectory(directory); categoriesDao.insertDirectory(directory);
} else { } else {
int count = categoriesDao.selectDirectoryById(param.getId());
if (count > 0) {
return ResultBody.error("默认目录不可修改！");
}
categoriesDao.updateDirectory(directory); categoriesDao.updateDirectory(directory);
} }
return ResultBody.success(); return ResultBody.success();
} }
@Override @Override
public PageResult directoryList(Integer pageNo, Integer pageSize) { public PageResult directoryList(Integer pageNo, Integer pageSize, Integer type) {
int count = categoriesDao.countDirectoryList(); int count = categoriesDao.countDirectoryList();
if (count == 0) { if (count == 0) {
return PageResult.buildPage(pageNo, pageSize, count); return PageResult.buildPage(pageNo, pageSize, count);
} }
List<Directory> directoryList = categoriesDao.directoryList((pageNo - 1) * pageSize, pageSize); List<Directory> directoryList = categoriesDao.directoryList((pageNo - 1) * pageSize, pageSize, type);
List<DirectoryInfoVO> list = directoryList.stream().map(Directory::buildDirectoryInfoVO).collect(Collectors.toList()); List<DirectoryInfoVO> list = directoryList.stream().map(Directory::buildDirectoryInfoVO).collect(Collectors.toList());
return PageResult.buildPage(pageNo, pageSize, count, list); return PageResult.buildPage(pageNo, pageSize, count, list);
} }
...@@ -162,6 +173,39 @@ public class CategoriesServiceImpl implements CategoriesService { ...@@ -162,6 +173,39 @@ public class CategoriesServiceImpl implements CategoriesService {
return ResultBody.success(goodsGroup == null ? null : goodsGroup.buildClassifyDetailsDTO() return ResultBody.success(goodsGroup == null ? null : goodsGroup.buildClassifyDetailsDTO()
); );
} }
@Override
public ResultBody queryRelevantBusiness(Integer id, Integer type) {
RelevantBusinessVO relevantBusinessVO = new RelevantBusinessVO();
switch (type) {
case 0:
List<GoodsInfo> goodsInfo = goodsInfoDao.ListGoodsInfoByCategoryId(id);
if (CollectionUtils.isNotEmpty(goodsInfo)) {
relevantBusinessVO.setRelevanceGoodsInfoVOs(goodsInfo.stream().map(GoodsInfo::buildRelevanceGoodsInfoVO).collect(Collectors.toList()));
return ResultBody.success(relevantBusinessVO);
}
break;
default:
return ResultBody.error("输入类型有误！");
}
return ResultBody.success();
}
@Override
public ResultBody getDirectoryList(Integer type) {
List<Directory> directoryList = categoriesDao.getDirectoryList(type);
List<DirectoryInfoVO> list = directoryList.stream().map(Directory::buildDirectoryInfoVO).collect(Collectors.toList());
return ResultBody.success(list);
}
@Override
public ResultBody deleteRelevantBusiness(Integer id) {
int count = categoriesDao.deleteById(id);
return ResultBody.success();
}
} }
......
src/main/java/com/mmc/pms/service/Impl/GoodsInfoServiceImpl.java
...@@ -6,10 +6,13 @@ import com.mmc.pms.dao.GoodsInfoDao; ...@@ -6,10 +6,13 @@ import com.mmc.pms.dao.GoodsInfoDao;
import com.mmc.pms.dao.IndustrySpecDao; import com.mmc.pms.dao.IndustrySpecDao;
import com.mmc.pms.dao.ProductDao; import com.mmc.pms.dao.ProductDao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.order.dto.OrderGoodsIndstDTO;
import com.mmc.pms.model.order.dto.OrderGoodsProdDTO;
import com.mmc.pms.model.order.dto.OrderGoodsProdDetailDTO;
import com.mmc.pms.model.qo.MallOrderGoodsInfoQO; import com.mmc.pms.model.qo.MallOrderGoodsInfoQO;
import com.mmc.pms.model.qo.ProductSpecPriceQO; import com.mmc.pms.model.qo.ProductSpecPriceQO;
import com.mmc.pms.model.vo.*; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.sale.vo.*;
import com.mmc.pms.service.GoodsInfoService; import com.mmc.pms.service.GoodsInfoService;
import com.mmc.pms.util.CodeUtil; import com.mmc.pms.util.CodeUtil;
import com.mmc.pms.util.TDateUtil; import com.mmc.pms.util.TDateUtil;
...@@ -712,9 +715,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService { ...@@ -712,9 +715,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
//还需配置商品规格金额， 单个商品skuSpecAmount， 全部小sku金额 //还需配置商品规格金额， 单个商品skuSpecAmount， 全部小sku金额
List<Integer> goodsIds = orderGoodsProdDTOList.stream().map(OrderGoodsProdDTO::getGoodsInfoId).collect(Collectors.toList()); List<Integer> goodsIds = orderGoodsProdDTOList.stream().map(OrderGoodsProdDTO::getGoodsInfoId).collect(Collectors.toList());
// 拼装商品服务 // 拼装商品服务
List<GoodsServiceDTO> services = goodsInfoDao.listGoodsService(goodsIds).stream().map(d -> { List<GoodsServiceDTO> services = goodsInfoDao.listGoodsService(goodsIds).stream().map(d -> d.buildGoodsServiceDTO()).collect(Collectors.toList());
return d.buildGoodsServiceDTO();
}).collect(Collectors.toList());
Map<Integer, List<GoodsServiceDTO>> mapGoodsService = org.springframework.util.CollectionUtils.isEmpty(services) ? null Map<Integer, List<GoodsServiceDTO>> mapGoodsService = org.springframework.util.CollectionUtils.isEmpty(services) ? null
: services.stream() : services.stream()
.collect(Collectors.groupingBy(GoodsServiceDTO::getGoodsInfoId)); .collect(Collectors.groupingBy(GoodsServiceDTO::getGoodsInfoId));
......
src/main/java/com/mmc/pms/service/Impl/IndustrySpecServiceImpl.java
...@@ -6,16 +6,22 @@ import com.mmc.pms.dao.BrandManageDao; ...@@ -6,16 +6,22 @@ import com.mmc.pms.dao.BrandManageDao;
import com.mmc.pms.dao.IndustrySpecDao; import com.mmc.pms.dao.IndustrySpecDao;
import com.mmc.pms.dao.ProductDao; import com.mmc.pms.dao.ProductDao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.sale.dto.ProductInventoryVO;
import com.mmc.pms.model.sale.dto.ProductSpecVO;
import com.mmc.pms.model.sale.dto.RemoveSkuDTO;
import com.mmc.pms.model.qo.IndustrySkuQO; import com.mmc.pms.model.qo.IndustrySkuQO;
import com.mmc.pms.model.vo.GoodsProductSkuVO; import com.mmc.pms.model.sale.dto.IndustrySpecCPQVO;
import com.mmc.pms.model.vo.IndustrySkuVO; import com.mmc.pms.model.sale.dto.IndustrySpecDTO;
import com.mmc.pms.model.vo.IndustrySpecVO; import com.mmc.pms.model.sale.dto.IndustrySpecPriceDTO;
import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
import com.mmc.pms.model.sale.vo.IndustrySkuVO;
import com.mmc.pms.model.sale.vo.IndustrySpecVO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.IndustrySpecService; import com.mmc.pms.service.IndustrySpecService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -213,6 +219,7 @@ public class IndustrySpecServiceImpl implements IndustrySpecService { ...@@ -213,6 +219,7 @@ public class IndustrySpecServiceImpl implements IndustrySpecService {
for (ProductSkuDO e : productSkuList) { for (ProductSkuDO e : productSkuList) {
GoodsProductSkuVO goodsProductSkuVO = new GoodsProductSkuVO(); GoodsProductSkuVO goodsProductSkuVO = new GoodsProductSkuVO();
goodsProductSkuVO.setId(d.getId()); goodsProductSkuVO.setId(d.getId());
goodsProductSkuVO.setCategoryName(e.getCategoryName());
goodsProductSkuVO.setProductName(e.getProductName()); goodsProductSkuVO.setProductName(e.getProductName());
for (BrandInfoDO b : brandInfoList) { for (BrandInfoDO b : brandInfoList) {
if (e.getBrandInfoId().equals(b.getId())) { if (e.getBrandInfoId().equals(b.getId())) {
...@@ -294,7 +301,17 @@ public class IndustrySpecServiceImpl implements IndustrySpecService { ...@@ -294,7 +301,17 @@ public class IndustrySpecServiceImpl implements IndustrySpecService {
return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count)); return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count));
} }
List<IndustrySpecDO> industrySpecList = industrySpecDao.listPageIndustrySpec((pageNo - 1) * pageSize, pageSize, industrySkuId, keyword); List<IndustrySpecDO> industrySpecList = industrySpecDao.listPageIndustrySpec((pageNo - 1) * pageSize, pageSize, industrySkuId, keyword);
List<IndustrySpecDTO> list = industrySpecList.stream().map(IndustrySpecDO::buildIndustrySpecDTO).collect(Collectors.toList()); List<Integer> specIds = industrySpecList.stream().map(IndustrySpecDO::getId).collect(Collectors.toList());
// 根据规格id批量查询价格信息
List<IndustrySpecPriceDO> industrySpecPrice = industrySpecDao.getIndustrySpecPriceList(specIds);
Map<Integer, List<IndustrySpecPriceDO>> priceMap = industrySpecPrice.stream().collect(Collectors.groupingBy(IndustrySpecPriceDO::getIndustrySpecId));
List<IndustrySpecDTO> list = industrySpecList.stream().map(d -> {
IndustrySpecDTO industrySpecDTO = d.buildIndustrySpecDTO();
if (!CollectionUtils.isEmpty(priceMap.get(d.getId()))) {
industrySpecDTO.setPriceList(priceMap.get(d.getId()).stream().map(IndustrySpecPriceDO::buildIndustrySpecPriceDTO).collect(Collectors.toList()));
}
return industrySpecDTO;
}).collect(Collectors.toList());
return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count, list)); return ResultBody.success(PageResult.buildPage(pageNo, pageSize, count, list));
} }
......
src/main/java/com/mmc/pms/service/Impl/MiniProgramProductMallServiceImpl.java
...@@ -5,9 +5,9 @@ import com.mmc.pms.common.ResultEnum; ...@@ -5,9 +5,9 @@ import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.dao.MiniProgramProductMallDao; import com.mmc.pms.dao.MiniProgramProductMallDao;
import com.mmc.pms.dao.WebDeviceDao; import com.mmc.pms.dao.WebDeviceDao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.*;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.model.vo.GoodsProductSkuVO; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.sale.vo.GoodsProductSkuVO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.MiniProgramProductMallService; import com.mmc.pms.service.MiniProgramProductMallService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -59,10 +59,6 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall ...@@ -59,10 +59,6 @@ public class MiniProgramProductMallServiceImpl implements MiniProgramProductMall
// 获取商品详情信息 // 获取商品详情信息
GoodsDetailDO goodsDetailDO = goodsInfoDao.getGoodsDetailByGoodsId(goodsId); GoodsDetailDO goodsDetailDO = goodsInfoDao.getGoodsDetailByGoodsId(goodsId);
appGoodsInfoDetailDTO.setGoodsDetail(goodsDetailDO.buildGoodsDetailInfoDTO()); appGoodsInfoDetailDTO.setGoodsDetail(goodsDetailDO.buildGoodsDetailInfoDTO());
// 获取常见问题信息
List<GoodsQaDO> goodsQaDO = goodsInfoDao.listGoodsQaInfoByGoodsId(goodsId);
appGoodsInfoDetailDTO.setQuestion(
goodsQaDO.stream().map(GoodsQaDO::buildGoodsQaDTO).collect(Collectors.toList()));
// 获取其他服务信息 // 获取其他服务信息
List<GoodsServiceDO> goodsServiceDO = goodsInfoDao.listGoodsServiceByGoodsId(goodsId); List<GoodsServiceDO> goodsServiceDO = goodsInfoDao.listGoodsServiceByGoodsId(goodsId);
appGoodsInfoDetailDTO.setOtherService( appGoodsInfoDetailDTO.setOtherService(
......
src/main/java/com/mmc/pms/service/Impl/ProductServiceImpl.java
...@@ -5,10 +5,10 @@ import com.mmc.pms.common.ResultEnum; ...@@ -5,10 +5,10 @@ import com.mmc.pms.common.ResultEnum;
import com.mmc.pms.dao.IndustrySpecDao; import com.mmc.pms.dao.IndustrySpecDao;
import com.mmc.pms.dao.ProductDao; import com.mmc.pms.dao.ProductDao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.lease.vo.PriceAcquisition;
import com.mmc.pms.model.qo.ProductSkuQO; import com.mmc.pms.model.qo.ProductSkuQO;
import com.mmc.pms.model.vo.PriceAcquisition; import com.mmc.pms.model.sale.dto.*;
import com.mmc.pms.model.vo.ProductSpecCPQVO; import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.ProductSkuService; import com.mmc.pms.service.ProductSkuService;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
......
src/main/java/com/mmc/pms/service/Impl/WebAndMiniProgramCategoryServiceImpl.java 0 → 100644
package com.mmc.pms.service.Impl;
import com.mmc.pms.service.WebAndMiniProgramCategoryService;
import org.springframework.stereotype.Service;
/**
* @Author LW
* @date 2023/6/7 13:51
* 概要：
*/
@Service
public class WebAndMiniProgramCategoryServiceImpl implements WebAndMiniProgramCategoryService {
}
src/main/java/com/mmc/pms/service/Impl/WebDeviceServiceImpl.java
...@@ -3,9 +3,13 @@ package com.mmc.pms.service.Impl; ...@@ -3,9 +3,13 @@ package com.mmc.pms.service.Impl;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.dao.WebDeviceDao; import com.mmc.pms.dao.WebDeviceDao;
import com.mmc.pms.entity.*; import com.mmc.pms.entity.*;
import com.mmc.pms.model.dto.*; import com.mmc.pms.model.lease.dto.*;
import com.mmc.pms.model.lease.vo.LeaseVo;
import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.other.dto.DistrictInfoDTO;
import com.mmc.pms.model.other.dto.ModelDTO;
import com.mmc.pms.model.qo.WareInfoQO; import com.mmc.pms.model.qo.WareInfoQO;
import com.mmc.pms.model.vo.LeaseVo; import com.mmc.pms.model.sale.dto.SkuInfoDTO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.WebDeviceService; import com.mmc.pms.service.WebDeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,7 +24,8 @@ import java.util.stream.Collectors; ...@@ -20,7 +24,8 @@ import java.util.stream.Collectors;
@Service @Service
public class WebDeviceServiceImpl implements WebDeviceService { public class WebDeviceServiceImpl implements WebDeviceService {
@Autowired WebDeviceDao webDeviceDao; @Autowired
WebDeviceDao webDeviceDao;
@Override @Override
public ResultBody listSecondDistrict() { public ResultBody listSecondDistrict() {
...@@ -180,6 +185,7 @@ public class WebDeviceServiceImpl implements WebDeviceService { ...@@ -180,6 +185,7 @@ public class WebDeviceServiceImpl implements WebDeviceService {
.collect(Collectors.toList()); .collect(Collectors.toList());
return ResultBody.success(collect); return ResultBody.success(collect);
} }
@Override @Override
public List<SkuInfoDTO> listWareSkuById(Integer id) { public List<SkuInfoDTO> listWareSkuById(Integer id) {
List<SkuInfoDO> skuInfoDOS = webDeviceDao.listSkuInfo(id); List<SkuInfoDO> skuInfoDOS = webDeviceDao.listSkuInfo(id);
......
src/main/java/com/mmc/pms/service/Impl/WebProductMallServiceImpl.java
...@@ -5,10 +5,10 @@ import com.mmc.pms.dao.WebProductMallDao; ...@@ -5,10 +5,10 @@ import com.mmc.pms.dao.WebProductMallDao;
import com.mmc.pms.entity.AdDO; import com.mmc.pms.entity.AdDO;
import com.mmc.pms.entity.GoodsInfoDO; import com.mmc.pms.entity.GoodsInfoDO;
import com.mmc.pms.entity.ProductCategory; import com.mmc.pms.entity.ProductCategory;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.dto.GoodsInfoListDTO; import com.mmc.pms.model.sale.dto.ProductCategoryDTO;
import com.mmc.pms.model.dto.ProductCategoryDTO;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.model.sale.dto.GoodsInfoListDTO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
import com.mmc.pms.service.WebProductMallService; import com.mmc.pms.service.WebProductMallService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -23,7 +23,8 @@ import java.util.stream.Collectors; ...@@ -23,7 +23,8 @@ import java.util.stream.Collectors;
@Service @Service
public class WebProductMallServiceImpl implements WebProductMallService { public class WebProductMallServiceImpl implements WebProductMallService {
@Autowired private WebProductMallDao webProductMallDao; @Autowired
private WebProductMallDao webProductMallDao;
@Override @Override
public ResultBody productCategory() { public ResultBody productCategory() {
......
src/main/java/com/mmc/pms/service/IndustrySpecService.java
package com.mmc.pms.service; package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.IndustrySpecCPQVO;
import com.mmc.pms.model.qo.IndustrySkuQO; import com.mmc.pms.model.qo.IndustrySkuQO;
import com.mmc.pms.model.vo.IndustrySkuVO; import com.mmc.pms.model.sale.dto.IndustrySpecCPQVO;
import com.mmc.pms.model.vo.IndustrySpecVO; import com.mmc.pms.model.sale.vo.IndustrySkuVO;
import com.mmc.pms.model.sale.vo.IndustrySpecVO;
/** /**
* @Author LW * @Author LW
......
src/main/java/com/mmc/pms/service/ProductSkuService.java
...@@ -2,11 +2,11 @@ package com.mmc.pms.service; ...@@ -2,11 +2,11 @@ package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.entity.ProductSpecPriceDO; import com.mmc.pms.entity.ProductSpecPriceDO;
import com.mmc.pms.model.dto.ProductSkuVO; import com.mmc.pms.model.lease.vo.PriceAcquisition;
import com.mmc.pms.model.dto.ProductSpecVO;
import com.mmc.pms.model.qo.ProductSkuQO; import com.mmc.pms.model.qo.ProductSkuQO;
import com.mmc.pms.model.vo.PriceAcquisition; import com.mmc.pms.model.sale.dto.ProductSkuVO;
import com.mmc.pms.model.vo.ProductSpecCPQVO; import com.mmc.pms.model.sale.dto.ProductSpecVO;
import com.mmc.pms.model.sale.vo.ProductSpecCPQVO;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/pms/service/WebAndMiniProgramCategoryService.java 0 → 100644
package com.mmc.pms.service;
/**
* @Author LW
* @date 2023/6/7 13:51
* 概要：
*/
public interface WebAndMiniProgramCategoryService {
}
src/main/java/com/mmc/pms/service/WebDeviceService.java
package com.mmc.pms.service; package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.lease.dto.WareInfoDTO;
import com.mmc.pms.model.dto.ModelDTO; import com.mmc.pms.model.lease.vo.LeaseVo;
import com.mmc.pms.model.dto.SkuInfoDTO; import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.dto.WareInfoDTO;
import com.mmc.pms.model.qo.WareInfoQO; import com.mmc.pms.model.qo.WareInfoQO;
import com.mmc.pms.model.vo.LeaseVo; import com.mmc.pms.model.sale.dto.SkuInfoDTO;
import com.mmc.pms.model.dto.SkuInfoDTO;
import java.util.List; import java.util.List;
......
src/main/java/com/mmc/pms/service/WebProductMallService.java
package com.mmc.pms.service; package com.mmc.pms.service;
import com.mmc.pms.common.ResultBody; import com.mmc.pms.common.ResultBody;
import com.mmc.pms.model.dto.AdDTO; import com.mmc.pms.model.other.dto.AdDTO;
import com.mmc.pms.model.qo.GoodsInfoQO; import com.mmc.pms.model.qo.GoodsInfoQO;
import com.mmc.pms.page.PageResult; import com.mmc.pms.page.PageResult;
......
src/main/resources/mapper/CategoriesDao.xml
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
is_deleted is_deleted
</sql> </sql>
<insert id="insertDirectory"> <insert id="insertDirectory">
insert into directory(directory_name, relevance, insert into directory(directory_name, pid,
`type`) `type`)
values (#{directoryName}, #{relevance}, #{type}) values (#{directoryName}, #{pid}, #{type})
</insert> </insert>
<insert id="insertClassification"> <insert id="insertClassification">
insert into categories (parent_id, insert into categories (parent_id,
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<update id="updateDirectory"> <update id="updateDirectory">
update directory update directory
set directory_name = #{directoryName}, set directory_name = #{directoryName},
relevance = #{relevance}, pid = #{pid},
`type` = #{type} `type` = #{type}
where id = #{id} where id = #{id}
</update> </update>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<select id="countUpdateDirectoryName" resultType="java.lang.Integer"> <select id="countUpdateDirectoryName" resultType="java.lang.Integer">
SELECT COUNT(*) FROM directory SELECT COUNT(*) FROM directory
WHERE directory_name = #{directoryName} and is_deleted = 0 and `type` = #{type} WHERE directory_name = #{directoryName} and is_deleted = 0 and `type` = #{type}
<if test="id!=null and id!=''"> <if test="id!=null">
and id <![CDATA[<>]]> #{id} and id <![CDATA[<>]]> #{id}
</if> </if>
</select> </select>
...@@ -85,13 +85,22 @@ ...@@ -85,13 +85,22 @@
where is_deleted = 0 where is_deleted = 0
</select> </select>
<select id="directoryList" resultType="com.mmc.pms.entity.Directory"> <select id="directoryList" resultType="com.mmc.pms.entity.Directory">
select id, SELECT d.id,
directory_name, d.directory_name,
relevance, d.pid,
`type`, d.`type`,
create_time d.create_time,
from directory dt.directory_name relevanceName
where is_deleted = 0 FROM `directory` d
LEFT JOIN `directory` dt ON dt.id = d.pid
<where>
d.is_deleted = 0
<if test="type != null">
and d.type = #{type}
</if>
</where>
ORDER BY create_time DESC
limit #{pageNo}, #{pageSize}
</select> </select>
<select id="countDirectory" resultType="java.lang.Integer"> <select id="countDirectory" resultType="java.lang.Integer">
SELECT count(*) SELECT count(*)
...@@ -153,4 +162,28 @@ ...@@ -153,4 +162,28 @@
AND directory_id = #{directoryId} AND directory_id = #{directoryId}
AND `type` = #{type} AND `type` = #{type}
</select> </select>
<select id="selectDirectoryById" resultType="java.lang.Integer">
select count(*)
from directory
where id = #{id}
and is_default = 0
</select>
<select id="getDirectoryList" resultType="com.mmc.pms.entity.Directory">
SELECT d.id,
d.directory_name,
d.pid,
d.`type`,
d.create_time
FROM `directory` d
WHERE d.is_deleted = 0
AND d.type = #{type}
OR d.type = 0
AND d.pid IS NULL
ORDER BY create_time DESC
</select>
<update id="deleteById">
UPDATE `categories`
SET `is_deleted` = 1
WHERE `id` = #{id};
</update>
</mapper> </mapper>
src/main/resources/mapper/GoodsInfoDao.xml
...@@ -397,4 +397,14 @@ ...@@ -397,4 +397,14 @@
</foreach> </foreach>
) )
</select> </select>
<select id="ListGoodsInfoByCategoryId" resultType="com.mmc.pms.entity.GoodsInfo">
SELECT gi.id,
gi.goods_name,
gi.shelf_status,
im.img_url mainImg
FROM goods_info gi
INNER JOIN goods_img im ON gi.id = im.goods_info_id
AND im.img_type = 0
WHERE gi.category_by_one = #{id}
</select>
</mapper> </mapper>
src/main/resources/mapper/IndustrySpecDao.xml
...@@ -7,11 +7,13 @@ ...@@ -7,11 +7,13 @@
insert into industry_sku (solution_name, categories_id, description) insert into industry_sku (solution_name, categories_id, description)
values (#{solutionName}, #{categoriesId}, #{description}) values (#{solutionName}, #{categoriesId}, #{description})
</insert> </insert>
<insert id="insertIndustrySpec"> <insert id="insertIndustrySpec" parameterType="com.mmc.pms.entity.IndustrySpecDO"
useGeneratedKeys="true" keyProperty="id">
insert into industry_spec (industry_sku_id, spec_name, spec_image) insert into industry_spec (industry_sku_id, spec_name, spec_image)
values (#{industrySkuId}, #{specName}, #{specImage}) values (#{industrySkuId}, #{specName}, #{specImage})
</insert> </insert>
<insert id="insertIndustryProductInventory"> <insert id="insertIndustryProductInventory" parameterType="com.mmc.pms.entity.IndustryProductInventoryDO"
useGeneratedKeys="true" keyProperty="id">
insert into industry_product_inventory (industry_spec_id, product_id, is_selected) insert into industry_product_inventory (industry_spec_id, product_id, is_selected)
values (#{industrySpecId}, #{productSkuId}, #{selected}) values (#{industrySpecId}, #{productSkuId}, #{selected})
</insert> </insert>
...@@ -213,7 +215,7 @@ ...@@ -213,7 +215,7 @@
WHERE id = #{id} WHERE id = #{id}
AND is_deleted = 0 AND is_deleted = 0
</select> </select>
<select id="getIndustryProductInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO"> <select id="getIndustryProductInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
SELECT id, SELECT id,
industry_spec_id industrySpecId, industry_spec_id industrySpecId,
product_id productSkuId, product_id productSkuId,
...@@ -283,7 +285,7 @@ ...@@ -283,7 +285,7 @@
#{d} #{d}
</foreach>) </foreach>)
</select> </select>
<select id="listIndustryProdInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO"> <select id="listIndustryProdInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
SELECT SELECT
id, id,
industry_spec_id industrySpecId, industry_spec_id industrySpecId,
...@@ -356,4 +358,17 @@ ...@@ -356,4 +358,17 @@
</foreach> </foreach>
) )
</select> </select>
<select id="getIndustrySpecPriceList" resultType="com.mmc.pms.entity.IndustrySpecPriceDO">
SELECT
id,
industry_spec_id industrySpecId,
tag_info_id tagInfoId,
price
FROM
industry_spec_price
WHERE industry_spec_id in (
<foreach collection="list" separator="," index="index" item="d">
#{d}
</foreach>)
</select>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/MiniProgramProductMallDao.xml
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
ORDER BY sort ASC ORDER BY sort ASC
</select> </select>
<select id="getIndustryProductInventory" resultType="com.mmc.pms.service.Impl.IndustryProductInventoryDO"> <select id="getIndustryProductInventory" resultType="com.mmc.pms.entity.IndustryProductInventoryDO">
SELECT id, SELECT id,
industry_spec_id industrySpecId, industry_spec_id industrySpecId,
product_id productSkuId, product_id productSkuId,
......
src/main/resources/mapper/ProductDao.xml
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</select> </select>
<select id="listProductSpec" resultType="com.mmc.pms.entity.ProductSpecDO"> <select id="listProductSpec" resultType="com.mmc.pms.entity.ProductSpecDO">
select id, select id,
product_id, product_id productSkuId,
spec_name, spec_name,
spec_image, spec_image,
part_no, part_no,
...@@ -227,13 +227,15 @@ ...@@ -227,13 +227,15 @@
SELECT ps.id, SELECT ps.id,
ps.product_name productName, ps.product_name productName,
ps.model, ps.model,
ps.product_brand productBrand, ps.categories_id,
ps.brand_info_id brandInfoId, ps.brand_info_id brandInfoId,
ps.create_time createTime, ps.create_time createTime,
c.id categoriesId, c.id categoriesId,
c.type_name categoryName c.name categoryName,
bi.brand_name brandName
FROM product ps FROM product ps
INNER JOIN categories c ON ps.goods_type_id = c.id INNER JOIN categories c ON ps.categories_id = c.id
LEFT JOIN brand_info bi ON ps.brand_info_id = bi.id
where ps.id in where ps.id in
<foreach collection="list" item="item" open="(" close=")" separator=","> <foreach collection="list" item="item" open="(" close=")" separator=",">
#{item} #{item}
...@@ -359,7 +361,7 @@ ...@@ -359,7 +361,7 @@
</foreach> </foreach>
) )
</select> </select>
<select id="feignGetUnitPrice" resultType="com.mmc.pms.model.dto.ProductSpecPriceDTO"> <select id="feignGetUnitPrice" resultType="com.mmc.pms.model.sale.dto.ProductSpecPriceDTO">
select price select price
from product_spec_price from product_spec_price
where product_spec_id = #{id} where product_spec_id = #{id}
...@@ -399,7 +401,7 @@ ...@@ -399,7 +401,7 @@
</foreach> </foreach>
) )
</select> </select>
<select id="listProdGoodsSkuInfo" resultType="com.mmc.pms.model.dto.OrderGoodsProdDTO"> <select id="listProdGoodsSkuInfo" resultType="com.mmc.pms.model.order.dto.OrderGoodsProdDTO">
SELECT SELECT
gi.id as goods_info_id,gi.goods_name,gi.goods_no,gi.directory_id, gi.id as goods_info_id,gi.goods_name,gi.goods_no,gi.directory_id,
gimg.img_url as mainImg, gimg.img_url as mainImg,
......
src/main/resources/mapper/WebAndMiniProgramCategoryDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.pms.dao.WebAndMiniProgramCategoryDao">
</mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论