diff --git a/common/common-framework/src/main/java/cn/iocoder/common/framework/vo/SortingField.java b/common/common-framework/src/main/java/cn/iocoder/common/framework/vo/SortingField.java index 6c6af5336..99273d2a4 100644 --- a/common/common-framework/src/main/java/cn/iocoder/common/framework/vo/SortingField.java +++ b/common/common-framework/src/main/java/cn/iocoder/common/framework/vo/SortingField.java @@ -1,21 +1,27 @@ package cn.iocoder.common.framework.vo; +import java.io.Serializable; + /** * 排序字段 DTO * * 类名加了 ing 的原因是，避免和 ES SortField 重名。 */ -public class SortingField { +public class SortingField implements Serializable { /** * 字段 */ private String field; /** - * 排序 + * 顺序 */ private String order; + // 空构造方法，解决反序列化 + public SortingField() { + } + public SortingField(String field, String order) { this.field = field; this.order = order; diff --git a/product/pom.xml b/moved/product/pom.xml similarity index 100% rename from product/pom.xml rename to moved/product/pom.xml diff --git a/product/product-biz/pom.xml b/moved/product/product-biz/pom.xml similarity index 100% rename from product/product-biz/pom.xml rename to moved/product/product-biz/pom.xml diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleWithValueBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleWithValueBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleWithValueBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrSimpleWithValueBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrValueSimpleBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrValueSimpleBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrValueSimpleBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrValueSimpleBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrWithValueBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrWithValueBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrWithValueBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/attr/ProductAttrWithValueBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrBO2.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrBO2.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrBO2.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrBO2.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrSimpleBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrSimpleBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrSimpleBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrSimpleBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueDetailBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueDetailBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueDetailBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueDetailBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueSimpleBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueSimpleBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueSimpleBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductAttrValueSimpleBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductBrangPageBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductBrangPageBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductBrangPageBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductBrangPageBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSkuDetailBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSkuDetailBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSkuDetailBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSkuDetailBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuDetailBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuDetailBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuDetailBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuDetailBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuPageBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuPageBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuPageBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/ProductSpuPageBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsPageBO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsPageBO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsPageBO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/bo/product/UserProductSpuCollectionsPageBO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/config/MQStreamConfiguration.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/config/MQStreamConfiguration.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/config/MQStreamConfiguration.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/config/MQStreamConfiguration.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/attr/ProductAttrConvert.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/attr/ProductAttrConvert.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/attr/ProductAttrConvert.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/attr/ProductAttrConvert.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/product/UserProductSpuCollectionsConvert.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/product/UserProductSpuCollectionsConvert.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/product/UserProductSpuCollectionsConvert.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/product/UserProductSpuCollectionsConvert.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/sku/ProductSpuConvert.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/sku/ProductSpuConvert.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/sku/ProductSpuConvert.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/convert/sku/ProductSpuConvert.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dao/sku/UserProductSpuCollectionsMapper.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dao/sku/UserProductSpuCollectionsMapper.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dao/sku/UserProductSpuCollectionsMapper.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dao/sku/UserProductSpuCollectionsMapper.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/spu/UserProductSpuCollectionsDO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/spu/UserProductSpuCollectionsDO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/spu/UserProductSpuCollectionsDO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/spu/UserProductSpuCollectionsDO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/stock/ProductStockDO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/stock/ProductStockDO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/stock/ProductStockDO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dataobject/stock/ProductStockDO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/ProductSpuSearchListDTO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/ProductSpuSearchListDTO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/ProductSpuSearchListDTO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/ProductSpuSearchListDTO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsAddDTO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsAddDTO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsAddDTO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsAddDTO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsPageDTO.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsPageDTO.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsPageDTO.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/dto/product/UserProductSpuCollectionsPageDTO.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrService.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrService.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrService.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrService.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrServiceImpl.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrServiceImpl.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrServiceImpl.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/attr/ProductAttrServiceImpl.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuService.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuService.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuService.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuService.java diff --git a/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuServiceImpl.java b/moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuServiceImpl.java similarity index 100% rename from product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuServiceImpl.java rename to moved/product/product-biz/src/main/java/cn/iocoder/mall/product/biz/service/spu/ProductSpuServiceImpl.java diff --git a/product/product-rest/pom.xml b/moved/product/product-rest/pom.xml similarity index 100% rename from product/product-rest/pom.xml rename to moved/product/product-rest/pom.xml diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/attr/AdminsProductAttrController.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/attr/AdminsProductAttrController.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/attr/AdminsProductAttrController.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/attr/AdminsProductAttrController.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/favorite/UserFavoriteController.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/favorite/UserFavoriteController.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/favorite/UserFavoriteController.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/controller/favorite/UserFavoriteController.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/convert/attr/ProductAttrConvert.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/convert/attr/ProductAttrConvert.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/convert/attr/ProductAttrConvert.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/convert/attr/ProductAttrConvert.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrAddRequest.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrAddRequest.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrAddRequest.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrAddRequest.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrPageRequest.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrPageRequest.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrPageRequest.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrPageRequest.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrUpdateRequest.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrUpdateRequest.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrUpdateRequest.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrUpdateRequest.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueAddRequest.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueAddRequest.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueAddRequest.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueAddRequest.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueUpdateRequest.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueUpdateRequest.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueUpdateRequest.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/request/attr/ProductAttrValueUpdateRequest.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrPageResponse.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrPageResponse.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrPageResponse.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrPageResponse.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrSimpleResponse.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrSimpleResponse.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrSimpleResponse.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrSimpleResponse.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrValueResponse.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrValueResponse.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrValueResponse.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProductAttrValueResponse.java diff --git a/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProdutAttrResponse.java b/moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProdutAttrResponse.java similarity index 100% rename from product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProdutAttrResponse.java rename to moved/product/product-rest/src/main/java/cn/iocoder/mall/product/rest/response/attr/AdminsProdutAttrResponse.java diff --git a/product/product-rpc-api/pom.xml b/moved/product/product-rpc-api/pom.xml similarity index 100% rename from product/product-rpc-api/pom.xml rename to moved/product/product-rpc-api/pom.xml diff --git a/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/api/ProductSpuRpc.java b/moved/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/api/ProductSpuRpc.java similarity index 100% rename from product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/api/ProductSpuRpc.java rename to moved/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/api/ProductSpuRpc.java diff --git a/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/response/ProductSpuDetailResponse.java b/moved/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/response/ProductSpuDetailResponse.java similarity index 100% rename from product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/response/ProductSpuDetailResponse.java rename to moved/product/product-rpc-api/src/main/java/cn/iocoder/mall/product/rpc/response/ProductSpuDetailResponse.java diff --git a/product/product-rpc/pom.xml b/moved/product/product-rpc/pom.xml similarity index 100% rename from product/product-rpc/pom.xml rename to moved/product/product-rpc/pom.xml diff --git a/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/convert/ProductSpuConvert.java b/moved/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/convert/ProductSpuConvert.java similarity index 100% rename from product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/convert/ProductSpuConvert.java rename to moved/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/convert/ProductSpuConvert.java diff --git a/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/rpc/ProductSpuRpcImpl.java b/moved/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/rpc/ProductSpuRpcImpl.java similarity index 100% rename from product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/rpc/ProductSpuRpcImpl.java rename to moved/product/product-rpc/src/main/java/cn/iocoder/mall/product/rpc/rpc/ProductSpuRpcImpl.java diff --git a/product/product-service-api/pom.xml b/moved/product/product-service-api/pom.xml similarity index 100% rename from product/product-service-api/pom.xml rename to moved/product/product-service-api/pom.xml diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductAttrService.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductAttrService.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductAttrService.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductAttrService.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuCollectionService.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuCollectionService.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuCollectionService.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuCollectionService.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuService.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuService.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuService.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/ProductSpuService.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/UserProductSpuCollectionsService.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/UserProductSpuCollectionsPageBO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuSearchListDTO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuSearchListDTO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuSearchListDTO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuSearchListDTO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsAddDTO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsPageDTO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/UserProductSpuCollectionsUpdateDTO.java diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java b/moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java similarity index 100% rename from product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java rename to moved/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/message/ProductSpuCollectionMessage.java diff --git a/product/product-service-impl/pom.xml b/moved/product/product-service-impl/pom.xml similarity index 100% rename from product/product-service-impl/pom.xml rename to moved/product/product-service-impl/pom.xml diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductAttrConvert.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductSpuConvert.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductSpuConvert.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductSpuConvert.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/ProductSpuConvert.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/convert/UserProductSpuCollectionsConvert.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrMapper.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrMapper.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrMapper.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrMapper.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrValueMapper.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrValueMapper.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrValueMapper.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductAttrValueMapper.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductSkuMapper.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductSkuMapper.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductSkuMapper.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/ProductSkuMapper.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dao/UserProductSpuCollectionsMapper.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/UserProductSpuCollectionsDO.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/message/UserProductSpuCollectionsConsumer.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductAttrServiceImpl.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuCollectionServiceImpl.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/ProductSpuServiceImpl.java diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java b/moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java similarity index 100% rename from product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java rename to moved/product/product-service-impl/src/main/java/cn/iocoder/mall/product/service/UserProductSpuCollectionsServiceImpl.java diff --git a/product/product-service-impl/src/main/resources/config/application.yaml b/moved/product/product-service-impl/src/main/resources/config/application.yaml similarity index 100% rename from product/product-service-impl/src/main/resources/config/application.yaml rename to moved/product/product-service-impl/src/main/resources/config/application.yaml diff --git a/product/product-service-impl/src/main/resources/mapper/ProductAttrMapper.xml b/moved/product/product-service-impl/src/main/resources/mapper/ProductAttrMapper.xml similarity index 100% rename from product/product-service-impl/src/main/resources/mapper/ProductAttrMapper.xml rename to moved/product/product-service-impl/src/main/resources/mapper/ProductAttrMapper.xml diff --git a/product/product-service-impl/src/main/resources/mapper/ProductAttrValueMapper.xml b/moved/product/product-service-impl/src/main/resources/mapper/ProductAttrValueMapper.xml similarity index 100% rename from product/product-service-impl/src/main/resources/mapper/ProductAttrValueMapper.xml rename to moved/product/product-service-impl/src/main/resources/mapper/ProductAttrValueMapper.xml diff --git a/product/product-service-impl/src/main/resources/mapper/ProductSkuMapper.xml b/moved/product/product-service-impl/src/main/resources/mapper/ProductSkuMapper.xml similarity index 100% rename from product/product-service-impl/src/main/resources/mapper/ProductSkuMapper.xml rename to moved/product/product-service-impl/src/main/resources/mapper/ProductSkuMapper.xml diff --git a/product/product-start/pom.xml b/moved/product/product-start/pom.xml similarity index 100% rename from product/product-start/pom.xml rename to moved/product/product-start/pom.xml diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductAttrController.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductSpuController.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UserFavoriteController.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuCollectionController.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductSpuController.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductAttrConvert.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/convert/ProductSpuConvert.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java diff --git a/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java b/moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java similarity index 100% rename from product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java rename to moved/product/product-start/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java diff --git a/system/pom.xml b/moved/system/pom.xml similarity index 100% rename from system/pom.xml rename to moved/system/pom.xml diff --git a/system/system-biz/pom.xml b/moved/system/system-biz/pom.xml similarity index 100% rename from system/system-biz/pom.xml rename to moved/system/system-biz/pom.xml diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/ListSmsSignBO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsSign/SmsSignBO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/ListSmsTemplateBO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/bo/smsTemplate/SmsTemplateBO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/config/QiniuConfiguration.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsSignConvert.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/convert/SmsTemplateConvert.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSendMapper.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsSignMapper.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/sms/SmsTemplateMapper.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSendLogDO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsSignDO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/sms/SmsTemplateDO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/AddSignDTO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/ListSmsSignDTO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsSign/UpdateSignDTO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dto/smsTemplate/ListSmsTemplateDTO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsApplyStatusEnum.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsPlatformEnum.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/enums/sms/SmsTypeEnum.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/annotation/OperationLogging.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/aspect/OperationLogAspect.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/enums/LogStatus.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogEvent.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/event/OperationLogListener.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/dto/OperationLogDTO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/model/po/OperationLogPO.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/log/operation/service/OperationLogSaveService.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/AliYunSmsClient.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsClient.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsService.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/SmsServiceImpl.java diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java b/moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java similarity index 100% rename from system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java rename to moved/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/service/sms/YunPianSmsClient.java diff --git a/system/system-biz/src/main/resources/application.yaml b/moved/system/system-biz/src/main/resources/application.yaml similarity index 100% rename from system/system-biz/src/main/resources/application.yaml rename to moved/system/system-biz/src/main/resources/application.yaml diff --git a/system/system-rest/pom.xml b/moved/system/system-rest/pom.xml similarity index 100% rename from system/system-rest/pom.xml rename to moved/system/system-rest/pom.xml diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/admin/AdminsUserUpdateRequest.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java b/moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java similarity index 100% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java rename to moved/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java diff --git a/system/system-rest/src/main/resources/rest.yaml b/moved/system/system-rest/src/main/resources/rest.yaml similarity index 100% rename from system/system-rest/src/main/resources/rest.yaml rename to moved/system/system-rest/src/main/resources/rest.yaml diff --git a/system/system-service-api/pom.xml b/moved/system/system-service-api/pom.xml similarity index 100% rename from system/system-service-api/pom.xml rename to moved/system/system-service-api/pom.xml diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/DataDictService.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/SmsService.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsSignBO.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/PageSmsTemplateBO.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsSignBO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsSignBO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsSignBO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsSignBO.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsTemplateBO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsTemplateBO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsTemplateBO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/bo/sms/SmsTemplateBO.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/AdminErrorCodeEnum.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/AdminErrorCodeEnum.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/AdminErrorCodeEnum.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/AdminErrorCodeEnum.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsApplyStatusEnum.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsApplyStatusEnum.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsApplyStatusEnum.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsApplyStatusEnum.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsPlatformEnum.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsPlatformEnum.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsPlatformEnum.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsPlatformEnum.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsTypeEnum.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsTypeEnum.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsTypeEnum.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/constant/SmsTypeEnum.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsSignDTO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsSignDTO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsSignDTO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsSignDTO.java diff --git a/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsTemplateDTO.java b/moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsTemplateDTO.java similarity index 100% rename from system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsTemplateDTO.java rename to moved/system/system-service-api/src/main/java/cn/iocoder/mall/system/api/dto/sms/PageQuerySmsTemplateDTO.java diff --git a/system/system-service-impl/pom.xml b/moved/system/system-service-impl/pom.xml similarity index 100% rename from system/system-service-impl/pom.xml rename to moved/system/system-service-impl/pom.xml diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsAliYunClient.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsClient.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsClient.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsClient.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsClient.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/client/SmsYunPianClient.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsSignConvert.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsSignConvert.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsSignConvert.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsSignConvert.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsTemplateConvert.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsTemplateConvert.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsTemplateConvert.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/SmsTemplateConvert.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSendMapper.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSendMapper.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSendMapper.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSendMapper.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSignMapper.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSignMapper.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSignMapper.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsSignMapper.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsTemplateMapper.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsTemplateMapper.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsTemplateMapper.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/SmsTemplateMapper.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSendLogDO.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSendLogDO.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSendLogDO.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSendLogDO.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSignDO.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSignDO.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSignDO.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsSignDO.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsTemplateDO.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsTemplateDO.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsTemplateDO.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/SmsTemplateDO.java diff --git a/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SmsServiceImpl.java b/moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SmsServiceImpl.java similarity index 100% rename from system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SmsServiceImpl.java rename to moved/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/SmsServiceImpl.java diff --git a/system/system-service-impl/src/main/resources/config/application.yaml b/moved/system/system-service-impl/src/main/resources/config/application.yaml similarity index 100% rename from system/system-service-impl/src/main/resources/config/application.yaml rename to moved/system/system-service-impl/src/main/resources/config/application.yaml diff --git a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/SystemApplicationTest.java b/moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/SystemApplicationTest.java similarity index 100% rename from system/system-service-impl/src/test/java/cn/iocoder/mall/admin/SystemApplicationTest.java rename to moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/SystemApplicationTest.java diff --git a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsAliYunClientTest.java b/moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsAliYunClientTest.java similarity index 100% rename from system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsAliYunClientTest.java rename to moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsAliYunClientTest.java diff --git a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsYunPianClientTest.java b/moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsYunPianClientTest.java similarity index 100% rename from system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsYunPianClientTest.java rename to moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/client/SmsYunPianClientTest.java diff --git a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SmsServiceImplTest.java b/moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SmsServiceImplTest.java similarity index 100% rename from system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SmsServiceImplTest.java rename to moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SmsServiceImplTest.java diff --git a/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SystemLogServiceImplTest.java b/moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SystemLogServiceImplTest.java similarity index 100% rename from system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SystemLogServiceImplTest.java rename to moved/system/system-service-impl/src/test/java/cn/iocoder/mall/admin/service/SystemLogServiceImplTest.java diff --git a/system/system-start/pom.xml b/moved/system/system-start/pom.xml similarity index 100% rename from system/system-start/pom.xml rename to moved/system/system-start/pom.xml diff --git a/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/FileController.java b/moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/FileController.java similarity index 100% rename from system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/FileController.java rename to moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/FileController.java diff --git a/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsSignController.java b/moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsSignController.java similarity index 100% rename from system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsSignController.java rename to moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsSignController.java diff --git a/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsTemplateController.java b/moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsTemplateController.java similarity index 100% rename from system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsTemplateController.java rename to moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/controller/admins/SmsTemplateController.java diff --git a/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateAddPO.java b/moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateAddPO.java similarity index 100% rename from system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateAddPO.java rename to moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateAddPO.java diff --git a/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateUpdatePO.java b/moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateUpdatePO.java similarity index 100% rename from system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateUpdatePO.java rename to moved/system/system-start/src/main/java/cn/iocoder/mall/system/application/po/sms/SmsTemplateUpdatePO.java diff --git a/system/system-start/src/main/resources/application.yaml b/moved/system/system-start/src/main/resources/application.yaml similarity index 100% rename from system/system-start/src/main/resources/application.yaml rename to moved/system/system-start/src/main/resources/application.yaml diff --git a/product-service-project/product-service-api/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpc.java b/product-service-project/product-service-api/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpc.java index 1c79a7a24..d18725fe7 100644 --- a/product-service-project/product-service-api/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpc.java +++ b/product-service-project/product-service-api/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpc.java @@ -6,6 +6,7 @@ import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryListQueryR import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryRespDTO; import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryUpdateReqDTO; +import java.util.Collection; import java.util.List; /** @@ -49,7 +50,7 @@ public interface ProductCategoryRpc { * @param productCategoryIds 商品分类编号列表 * @return 商品分类列表 */ - CommonResult> listProductCategories(List productCategoryIds); + CommonResult> listProductCategories(Collection productCategoryIds); /** * 获得符合条件的商品分类列表 diff --git a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/manager/category/ProductCategoryManager.java b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/manager/category/ProductCategoryManager.java index e39ebb21b..a59a28d7e 100644 --- a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/manager/category/ProductCategoryManager.java +++ b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/manager/category/ProductCategoryManager.java @@ -10,6 +10,7 @@ import cn.iocoder.mall.productservice.service.category.bo.ProductCategoryBO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; /** @@ -67,7 +68,7 @@ public class ProductCategoryManager { * @param productCategoryIds 商品分类编号列表 * @return 商品分类列表 */ - public List listProductCategories(List productCategoryIds) { + public List listProductCategories(Collection productCategoryIds) { List productCategoryBOs = productCategoryService.listProductCategories(productCategoryIds); return ProductCategoryConvert.INSTANCE.convertList02(productCategoryBOs); } diff --git a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpcImpl.java b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpcImpl.java index b35a55e5b..c3209145d 100644 --- a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpcImpl.java +++ b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/rpc/category/ProductCategoryRpcImpl.java @@ -9,6 +9,7 @@ import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryUpdateReqD import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Collection; import java.util.List; import static cn.iocoder.common.framework.vo.CommonResult.success; @@ -45,7 +46,7 @@ public class ProductCategoryRpcImpl implements ProductCategoryRpc { } @Override - public CommonResult> listProductCategories(List productCategoryIds) { + public CommonResult> listProductCategories(Collection productCategoryIds) { return success(productCategoryManager.listProductCategories(productCategoryIds)); } diff --git a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/service/category/ProductCategoryService.java b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/service/category/ProductCategoryService.java index ac862a4ee..003fc8bd3 100644 --- a/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/service/category/ProductCategoryService.java +++ b/product-service-project/product-service-app/src/main/java/cn/iocoder/mall/productservice/service/category/ProductCategoryService.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.validation.Valid; +import java.util.Collection; import java.util.List; import static cn.iocoder.mall.productservice.enums.ProductErrorCodeConstants.*; @@ -102,7 +103,7 @@ public class ProductCategoryService { * @param productCategoryIds 商品分类编号列表 * @return 商品分类列表 */ - public List listProductCategories(List productCategoryIds) { + public List listProductCategories(Collection productCategoryIds) { List productCategoryDOs = productCategoryMapper.selectBatchIds(productCategoryIds); return ProductCategoryConvert.INSTANCE.convertList(productCategoryDOs); } diff --git a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/enums/product/SearchProductConditionFieldEnum.java b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/enums/product/SearchProductConditionFieldEnum.java index eaed8cb6a..b32c3355b 100644 --- a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/enums/product/SearchProductConditionFieldEnum.java +++ b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/enums/product/SearchProductConditionFieldEnum.java @@ -16,4 +16,8 @@ public enum SearchProductConditionFieldEnum { this.field = field; } + public String getField() { + return field; + } + } diff --git a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpc.java b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpc.java index 264b6b529..c2ecc7ec6 100644 --- a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpc.java +++ b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpc.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.searchservice.rpc.product; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionReqDTO; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductPageReqDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; @@ -10,6 +12,20 @@ import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; */ public interface SearchProductRpc { - CommonResult> pageSearchProduct(SearchProductPageReqDTO pageQueryReqDTO); + /** + * 获得商品搜索分页 + * + * @param pageReqDTO 分页请求 DTO + * @return 商品搜索分页结果 + */ + CommonResult> pageSearchProduct(SearchProductPageReqDTO pageReqDTO); + + /** + * 获得商品搜索条件 + * + * @param conditionReqDTO 搜索条件 DTO + * @return 搜索条件 + */ + CommonResult getSearchProductCondition(SearchProductConditionReqDTO conditionReqDTO); } diff --git a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionReqDTO.java b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionReqDTO.java new file mode 100644 index 000000000..a630c3684 --- /dev/null +++ b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionReqDTO.java @@ -0,0 +1,28 @@ +package cn.iocoder.mall.searchservice.rpc.product.dto; + +import cn.iocoder.mall.searchservice.enums.product.SearchProductConditionFieldEnum; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Collection; + +/** + * 商品搜索条件 Request DTO + */ +@Data +@Accessors(chain = true) +public class SearchProductConditionReqDTO implements Serializable { + + /** + * 关键字 + */ + private String keyword; + /** + * 需要返回的搜索条件 + * + * 可选择的条件，见 {@link SearchProductConditionFieldEnum} 枚举类 + */ + private Collection fields; + +} diff --git a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionRespDTO.java b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionRespDTO.java new file mode 100644 index 000000000..1f86012a0 --- /dev/null +++ b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductConditionRespDTO.java @@ -0,0 +1,21 @@ +package cn.iocoder.mall.searchservice.rpc.product.dto; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.List; + +/** + * 商品搜索条件 Response DTO + */ +@Data +@Accessors(chain = true) +public class SearchProductConditionRespDTO implements Serializable { + + /** + * 商品分类数组 + */ + private List cids; + +} diff --git a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductRespDTO.java b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductRespDTO.java index 8a27e29ce..5014c9e77 100644 --- a/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductRespDTO.java +++ b/search-service-project/search-service-api/src/main/java/cn/iocoder/mall/searchservice/rpc/product/dto/SearchProductRespDTO.java @@ -3,6 +3,7 @@ package cn.iocoder.mall.searchservice.rpc.product.dto; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; import java.util.List; /** @@ -10,7 +11,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class SearchProductRespDTO { +public class SearchProductRespDTO implements Serializable { private Integer id; diff --git a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/convert/product/SearchProductConvert.java b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/convert/product/SearchProductConvert.java index e1f011284..aca0ca739 100644 --- a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/convert/product/SearchProductConvert.java +++ b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/convert/product/SearchProductConvert.java @@ -4,9 +4,11 @@ import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryRespDTO; import cn.iocoder.mall.productservice.rpc.spu.dto.ProductSpuRespDTO; import cn.iocoder.mall.searchservice.dal.es.dataobject.ESProductDO; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductPageReqDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; import cn.iocoder.mall.searchservice.service.product.bo.SearchProductBO; +import cn.iocoder.mall.searchservice.service.product.bo.SearchProductConditionBO; import cn.iocoder.mall.searchservice.service.product.bo.SearchProductPageQueryBO; import cn.iocoder.mall.searchservice.service.product.bo.SearchProductSaveBO; import org.mapstruct.Mapper; @@ -37,13 +39,15 @@ public interface SearchProductConvert { List convertList(List list); - default PageResult convertPage(Page searchPage) { - return new PageResult().setList(convertList(searchPage.getContent())) - .setTotal(searchPage.getTotalElements()); + default PageResult convertPage(Page page) { + return new PageResult().setList(convertList(page.getContent())) + .setTotal(page.getTotalElements()); } SearchProductPageQueryBO convert(SearchProductPageReqDTO bean); - PageResult convertPage(PageResult pageResult); + PageResult convertPage(PageResult page); + + SearchProductConditionRespDTO convert(SearchProductConditionBO bean); } diff --git a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/manager/product/SearchProductManager.java b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/manager/product/SearchProductManager.java index 4ea1c1456..19546f116 100644 --- a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/manager/product/SearchProductManager.java +++ b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/manager/product/SearchProductManager.java @@ -11,10 +11,13 @@ import cn.iocoder.mall.productservice.rpc.sku.dto.ProductSkuRespDTO; import cn.iocoder.mall.productservice.rpc.spu.ProductSpuRpc; import cn.iocoder.mall.productservice.rpc.spu.dto.ProductSpuRespDTO; import cn.iocoder.mall.searchservice.convert.product.SearchProductConvert; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionReqDTO; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductPageReqDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; import cn.iocoder.mall.searchservice.service.product.SearchProductService; import cn.iocoder.mall.searchservice.service.product.bo.SearchProductBO; +import cn.iocoder.mall.searchservice.service.product.bo.SearchProductConditionBO; import cn.iocoder.mall.searchservice.service.product.bo.SearchProductSaveBO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; @@ -48,6 +51,12 @@ public class SearchProductManager { return SearchProductConvert.INSTANCE.convertPage(pageResult); } + public SearchProductConditionRespDTO getSearchProductCondition(SearchProductConditionReqDTO conditionReqDTO) { + SearchProductConditionBO conditionBO = + searchProductService.getSearchProductCondition(conditionReqDTO.getKeyword(), conditionReqDTO.getFields()); + return SearchProductConvert.INSTANCE.convert(conditionBO); + } + /** * 重建所有商品的 ES 索引 * diff --git a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpcImpl.java b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpcImpl.java index 13936e3f5..897a57fb7 100644 --- a/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpcImpl.java +++ b/search-service-project/search-service-app/src/main/java/cn/iocoder/mall/searchservice/rpc/product/SearchProductRpcImpl.java @@ -3,6 +3,8 @@ package cn.iocoder.mall.searchservice.rpc.product; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.searchservice.manager.product.SearchProductManager; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionReqDTO; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductPageReqDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; import org.apache.dubbo.config.annotation.DubboService; @@ -17,8 +19,13 @@ public class SearchProductRpcImpl implements SearchProductRpc { private SearchProductManager searchProductManager; @Override - public CommonResult> pageSearchProduct(SearchProductPageReqDTO pageQueryReqDTO) { - return success(searchProductManager.pageSearchProduct(pageQueryReqDTO)); + public CommonResult> pageSearchProduct(SearchProductPageReqDTO pageReqDTO) { + return success(searchProductManager.pageSearchProduct(pageReqDTO)); + } + + @Override + public CommonResult getSearchProductCondition(SearchProductConditionReqDTO conditionReqDTO) { + return success(searchProductManager.getSearchProductCondition(conditionReqDTO)); } } diff --git a/search/pom.xml b/search/pom.xml deleted file mode 100644 index 410ab0701..000000000 --- a/search/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - onemall - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - search - pom - - search-application - search-biz - search-biz-api - - - search-rpc - search-rest - search-rpc-api - - - - - - cn.iocoder.mall - mall-dependencies - 1.0-SNAPSHOT - pom - import - - - - - diff --git a/search/search-rest/pom.xml b/search/search-rest/pom.xml deleted file mode 100644 index fa0bbe14f..000000000 --- a/search/search-rest/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - search - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - search-rest - 提供 商品搜索服务的 Rest 接口的实现，提供对外调用 - - - - - cn.iocoder.mall - search-biz - 1.0-SNAPSHOT - - - - - cn.iocoder.mall - mall-spring-boot-starter-web - 1.0-SNAPSHOT - - - cn.iocoder.mall - mall-spring-boot-starter-security - 1.0-SNAPSHOT - - - cn.iocoder.mall - mall-spring-boot-starter-swagger - 1.0-SNAPSHOT - - - - - \ No newline at end of file diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/controller/user/UsersProductSearchController.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/controller/user/UsersProductSearchController.java deleted file mode 100644 index 899801fca..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/controller/user/UsersProductSearchController.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.iocoder.mall.search.rest.controller.user; - -import cn.iocoder.common.framework.enums.MallConstants; -import cn.iocoder.common.framework.util.StringUtil; -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.common.framework.vo.SortingField; -import cn.iocoder.mall.search.biz.service.ProductSearchService; -import cn.iocoder.mall.search.rest.response.user.ProductPageResponse; -import io.swagger.annotations.Api; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import cn.iocoder.mall.search.rest.request.user.ProductConditionRequest; -import cn.iocoder.mall.search.rest.request.user.ProductSearchPageRequest; -import cn.iocoder.mall.search.rest.response.user.ProductConditionResponse; - -import java.util.Collections; - -import static cn.iocoder.common.framework.vo.CommonResult.success; - -/** - * Created with IDEA - * - * @author : lhl - * @version : 1.0 - * @Time : 19:26 - * @date : 2020/5/14 - */ -@RestController -@RequestMapping(MallConstants.ROOT_PATH_ADMIN + "users/product") -@Api(tags = "商品查询 API") -@Slf4j -@RequiredArgsConstructor(onConstructor = @__(@Autowired)) -public class UsersProductSearchController { - - - private final ProductSearchService productSearchService; - - @GetMapping("/page") // TODO 芋艿，后面把 BO 改成 VO - public CommonResult page(@RequestParam(value = "cid", required = false) Integer cid, - @RequestParam(value = "keyword", required = false) String keyword, - @RequestParam(value = "pageNo", required = false) Integer pageNo, - @RequestParam(value = "pageSize", required = false) Integer pageSize, - @RequestParam(value = "sortField", required = false) String sortField, - @RequestParam(value = "sortOrder", required = false) String sortOrder) { - // 创建 ProductSearchPageDTO 对象 - ProductSearchPageRequest productSearchPageDTO = new ProductSearchPageRequest().setCid(cid).setKeyword(keyword) - .setPageNo(pageNo).setPageSize(pageSize); - if (StringUtil.hasText(sortField) && StringUtil.hasText(sortOrder)) { - productSearchPageDTO.setSorts(Collections.singletonList(new SortingField(sortField, sortOrder))); - } - // 执行搜索 -// return success(productSearchService.getSearchPage(productSearchPageDTO)); - return success(null); - } - - @GetMapping("/condition") // TODO 芋艿，后面把 BO 改成 VO - public CommonResult condition(@RequestParam(value = "keyword", required = false) String keyword) { - // 创建 ProductConditionDTO 对象 - ProductConditionRequest productConditionDTO = new ProductConditionRequest().setKeyword(keyword) - .setFields(Collections.singleton(ProductConditionRequest.FIELD_CATEGORY)); - // 执行搜索 -// return success(productSearchService.getSearchCondition(productConditionDTO)); - return success(null); - } - - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/convert/user/UsersProductSearchConvert.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/convert/user/UsersProductSearchConvert.java deleted file mode 100644 index 4fcdac3bd..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/convert/user/UsersProductSearchConvert.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.mall.search.rest.convert.user; - -import cn.iocoder.mall.search.biz.bo.ProductBO; -import cn.iocoder.mall.search.biz.dataobject.ESProductDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -@Mapper -public interface UsersProductSearchConvert { - - cn.iocoder.mall.search.biz.convert.ProductSearchConvert INSTANCE = Mappers.getMapper(cn.iocoder.mall.search.biz.convert.ProductSearchConvert.class); - -// @Mappings({}) -// ESProductDO convert(ProductSpuDetailBO spu); - -// @Mappings({}) -// default ESProductDO convert(ProductSpuDetailBO spu, CalcSkuPriceBO calcSkuPrice) { -// // Spu 的基础数据 -// ESProductDO product = this.convert(spu); -// product.setOriginalPrice(calcSkuPrice.getOriginalPrice()).setBuyPrice(calcSkuPrice.getBuyPrice()); -// // 设置促销活动相关字段 -// if (calcSkuPrice.getTimeLimitedDiscount() != null) { -// PromotionActivityBO activity = calcSkuPrice.getTimeLimitedDiscount(); -// product.setPromotionActivityId(activity.getId()).setPromotionActivityTitle(activity.getTitle()) -// .setPromotionActivityType(activity.getActivityType()); -// } -// // 返回 -// return product; -// } - - List convert(List list); - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductConditionRequest.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductConditionRequest.java deleted file mode 100644 index c90b0b957..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductConditionRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.search.rest.request.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Collection; - -/** - * 获得商品检索条件 DTO - */ -@Data -@Accessors(chain = true) -public class UsersProductConditionRequest{ - - /** - * Field - 商品分类 - */ - public static final String FIELD_CATEGORY = "category"; - - /** - * 关键字 - */ - private String keyword; - /** - * 需要返回的搜索条件的 fields 名 - */ - private Collection fields; - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductSearchPageRequest.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductSearchPageRequest.java deleted file mode 100644 index bdb2c52f8..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/request/user/UsersProductSearchPageRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.iocoder.mall.search.rest.request.user; - -import cn.iocoder.common.framework.util.CollectionUtil; -import cn.iocoder.common.framework.vo.SortingField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; -import java.util.Set; - -/** - * Created with IDEA - * - * @author : lhl - * @version : 1.0 - * @Time : 19:09 - * @date : 2020/5/14 - */ -@Data -@Accessors(chain = true) -public class UsersProductSearchPageRequest { - - public static final Set SORT_FIELDS = CollectionUtil.asSet("buyPrice"); - - /** - * 分类编号 - */ - private Integer cid; - /** - * 关键字 - */ - private String keyword; - - /** - * 页码 - */ - private Integer pageNo; - /** - * 分页大小 - */ - private Integer pageSize; - - /** - * 排序字段数组 - */ - private List sorts; - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductConditionResponse.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductConditionResponse.java deleted file mode 100644 index 4b008a8ff..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductConditionResponse.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.mall.search.rest.response.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 商品搜索条件返回 BO - */ -@Data -@Accessors(chain = true) -public class UsersProductConditionResponse { - - /** - * 商品分类数组 - */ - private List categories; - - @Data - @Accessors(chain = true) - public static class Category { - - /** - * 分类编号 - */ - private Integer id; - /** - * 分类名称 - */ - private String name; - - } - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductPageResponse.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductPageResponse.java deleted file mode 100644 index 56ece1465..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductPageResponse.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.mall.search.rest.response.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -@Data -@Accessors(chain = true) -public class UsersProductPageResponse implements Serializable { - - /** - * 管理员数组 - */ - private List list; - /** - * 总量 - */ - private Integer total; - -} diff --git a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductResponse.java b/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductResponse.java deleted file mode 100644 index 5d5127fc7..000000000 --- a/search/search-rest/src/main/java/cn/iocoder/mall/search/rest/response/user/UsersProductResponse.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.iocoder.mall.search.rest.response.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * 商品 ES BO - */ -@Data -@Accessors(chain = true) -public class UsersProductResponse implements Serializable { - - private Integer id; - - // ========== 基本信息 ========= - /** - * SPU 名字 - */ - private String name; - /** - * 卖点 - */ - private String sellPoint; - /** - * 描述 - */ - private String description; - /** - * 分类编号 - */ - private Integer cid; - /** - * 分类名 - */ - private String categoryName; - /** - * 商品主图地数组 - */ - private List picUrls; - - // ========== 其他信息 ========= - /** - * 是否上架商品（是否可见）。 - * - * true 为已上架 - * false 为已下架 - */ - private Boolean visible; - /** - * 排序字段 - */ - private Integer sort; - - // ========== Sku 相关字段 ========= - /** - * 原价格，单位：分 - */ - private Integer originalPrice; - /** - * 购买价格，单位：分。 - */ - private Integer buyPrice; - /** - * 库存数量 - */ - private Integer quantity; - - // ========== 促销活动相关字段 ========= - // 目前只促销单体商品促销，目前仅限制折扣。 - /** - * 促销活动编号 - */ - private Integer promotionActivityId; - /** - * 促销活动标题 - */ - private String promotionActivityTitle; - /** - * 促销活动类型 - */ - private Integer promotionActivityType; - -} diff --git a/search/search-rpc-api/pom.xml b/search/search-rpc-api/pom.xml deleted file mode 100644 index 2dd3c6c5c..000000000 --- a/search/search-rpc-api/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - search - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - search-rpc-api - - - - - - search-biz-api - cn.iocoder.mall - 1.0-SNAPSHOT - - - - - javax.validation - validation-api - - - org.projectlombok - lombok - - - \ No newline at end of file diff --git a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductConditionRequest.java b/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductConditionRequest.java deleted file mode 100644 index eb9fd74ec..000000000 --- a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductConditionRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.search.biz.request.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Collection; - -/** - * 获得商品检索条件 DTO - */ -@Data -@Accessors(chain = true) -public class ProductConditionRequest { - - /** - * Field - 商品分类 - */ - public static final String FIELD_CATEGORY = "category"; - - /** - * 关键字 - */ - private String keyword; - /** - * 需要返回的搜索条件的 fields 名 - */ - private Collection fields; - -} diff --git a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductSearchPageRequest.java b/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductSearchPageRequest.java deleted file mode 100644 index a722eea46..000000000 --- a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/request/user/ProductSearchPageRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.iocoder.mall.search.biz.request.user; - -import cn.iocoder.common.framework.util.CollectionUtil; -import cn.iocoder.common.framework.vo.SortingField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; -import java.util.Set; - -/** - * Created with IDEA - * - * @author : lhl - * @version : 1.0 - * @Time : 19:09 - * @date : 2020/5/14 - */ -@Data -@Accessors(chain = true) -public class ProductSearchPageRequest { - - public static final Set SORT_FIELDS = CollectionUtil.asSet("buyPrice"); - - /** - * 分类编号 - */ - private Integer cid; - /** - * 关键字 - */ - private String keyword; - - /** - * 页码 - */ - private Integer pageNo; - /** - * 分页大小 - */ - private Integer pageSize; - - /** - * 排序字段数组 - */ - private List sorts; - -} diff --git a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductConditionResponse.java b/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductConditionResponse.java deleted file mode 100644 index 2b48816f1..000000000 --- a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductConditionResponse.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.mall.search.biz.response.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 商品搜索条件返回 BO - */ -@Data -@Accessors(chain = true) -public class ProductConditionResponse { - - /** - * 商品分类数组 - */ - private List categories; - - @Data - @Accessors(chain = true) - public static class Category { - - /** - * 分类编号 - */ - private Integer id; - /** - * 分类名称 - */ - private String name; - - } - -} diff --git a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductResponse.java b/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductResponse.java deleted file mode 100644 index 31952582b..000000000 --- a/search/search-rpc-api/src/main/java/cn/iocoder/mall/search/biz/response/user/ProductResponse.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.iocoder.mall.search.biz.response.user; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * 商品 ES BO - */ -@Data -@Accessors(chain = true) -public class ProductResponse implements Serializable { - - private Integer id; - - // ========== 基本信息 ========= - /** - * SPU 名字 - */ - private String name; - /** - * 卖点 - */ - private String sellPoint; - /** - * 描述 - */ - private String description; - /** - * 分类编号 - */ - private Integer cid; - /** - * 分类名 - */ - private String categoryName; - /** - * 商品主图地数组 - */ - private List picUrls; - - // ========== 其他信息 ========= - /** - * 是否上架商品（是否可见）。 - * - * true 为已上架 - * false 为已下架 - */ - private Boolean visible; - /** - * 排序字段 - */ - private Integer sort; - - // ========== Sku 相关字段 ========= - /** - * 原价格，单位：分 - */ - private Integer originalPrice; - /** - * 购买价格，单位：分。 - */ - private Integer buyPrice; - /** - * 库存数量 - */ - private Integer quantity; - - // ========== 促销活动相关字段 ========= - // 目前只促销单体商品促销，目前仅限制折扣。 - /** - * 促销活动编号 - */ - private Integer promotionActivityId; - /** - * 促销活动标题 - */ - private String promotionActivityTitle; - /** - * 促销活动类型 - */ - private Integer promotionActivityType; - -} diff --git a/search/search-service-api/pom.xml b/search/search-service-api/pom.xml deleted file mode 100644 index c6b736511..000000000 --- a/search/search-service-api/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - search - cn.iocoder.mall - 1.0-SNAPSHOT - - 4.0.0 - - search-service-api - - - - - cn.iocoder.mall - common-framework - 1.0-SNAPSHOT - - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - - org.projectlombok - lombok - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - diff --git a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/bo/ProductConditionBO.java b/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/bo/ProductConditionBO.java deleted file mode 100644 index b8eebbfe6..000000000 --- a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/bo/ProductConditionBO.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.mall.search.biz.bo; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * 商品搜索条件返回 BO - */ -@Data -@Accessors(chain = true) -public class ProductConditionBO { - - /** - * 商品分类数组 - */ - private List categories; - - @Data - @Accessors(chain = true) - public static class Category { - - /** - * 分类编号 - */ - private Integer id; - /** - * 分类名称 - */ - private String name; - - } - -} diff --git a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductConditionDTO.java b/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductConditionDTO.java deleted file mode 100644 index 4bfe0fead..000000000 --- a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductConditionDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.mall.search.biz.dto; - -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Collection; - -/** - * 获得商品检索条件 DTO - */ -@Data -@Accessors(chain = true) -public class ProductConditionDTO { - - /** - * Field - 商品分类 - */ - public static final String FIELD_CATEGORY = "category"; - - /** - * 关键字 - */ - private String keyword; - /** - * 需要返回的搜索条件的 fields 名 - */ - private Collection fields; - -} diff --git a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductSearchPageDTO.java b/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductSearchPageDTO.java deleted file mode 100644 index 430a32ed0..000000000 --- a/search/search-service-api/src/main/java/cn/iocoder/mall/search/api/dto/ProductSearchPageDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.mall.search.biz.dto; - -import cn.iocoder.common.framework.util.CollectionUtil; -import cn.iocoder.common.framework.vo.SortingField; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; -import java.util.Set; - -/** - * 商品检索分页 DTO - */ -@Data -@Accessors(chain = true) -public class ProductSearchPageDTO { - - public static final Set SORT_FIELDS = CollectionUtil.asSet("buyPrice"); - - /** - * 分类编号 - */ - private Integer cid; - /** - * 关键字 - */ - private String keyword; - - /** - * 页码 - */ - private Integer pageNo; - /** - * 分页大小 - */ - private Integer pageSize; - - /** - * 排序字段数组 - */ - private List sorts; - -} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.http b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.http new file mode 100644 index 000000000..21f7dfefe --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.http @@ -0,0 +1,9 @@ +### /product-spu/page 成功（全部） +GET {{shop-api-base-url}}/product-spu/page?pageNo=1&pageSize=10&keyword=骚气 +Content-Type: application/x-www-form-urlencoded + +### /product-spu/search-condition 成功 +GET {{shop-api-base-url}}/product-spu/search-condition?keyword=骚气 +Content-Type: application/x-www-form-urlencoded + +### diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.java index cb68107b4..146a62435 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/ProductSpuController.java @@ -4,13 +4,16 @@ import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuPageReqVO; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuRespVO; +import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuSearchConditionRespVO; import cn.iocoder.mall.shopweb.manager.product.ProductSpuManager; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import static cn.iocoder.common.framework.vo.CommonResult.success; @@ -30,4 +33,12 @@ public class ProductSpuController { return success(productSpuManager.pageProductSpu(pageReqVO)); } + @GetMapping("/search-condition") + @ApiOperation("获得商品的搜索条件") + @ApiImplicitParam(name = "keyword", value = "关键字", example = "芋艿") + public CommonResult getProductSpuSearchCondition( + @RequestParam(value = "keyword", required = false) String keyword) { + return success(productSpuManager.getProductSpuSearchCondition(keyword)); + } + } diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuPageReqVO.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuPageReqVO.java index 32dd0520f..563ac04ce 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuPageReqVO.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuPageReqVO.java @@ -1,24 +1,25 @@ package cn.iocoder.mall.shopweb.controller.product.vo.product; import cn.iocoder.common.framework.vo.PageParam; -import cn.iocoder.common.framework.vo.SortingField; - -import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +@ApiModel("商品 SPU 分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) public class ProductSpuPageReqVO extends PageParam { - /** - * 分类编号 - */ + @ApiModelProperty(value = "分类编号", example = "1") private Integer cid; - /** - * 关键字 - */ + @ApiModelProperty(value = "关键字", example = "芋艿") private String keyword; - - /** - * 排序字段数组 - */ - private List sorts; + @ApiModelProperty(value = "排序字段", example = "buyPrice", notes = "参见 SearchProductPageQuerySortFieldEnum 枚举") + private String sortField; + @ApiModelProperty(value = "排序顺序", example = "1") + private String sortOrder; } diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuRespVO.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuRespVO.java index 617711d97..a728f3b3d 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuRespVO.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuRespVO.java @@ -1,6 +1,7 @@ package cn.iocoder.mall.shopweb.controller.product.vo.product; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -11,62 +12,38 @@ import java.util.List; @Accessors(chain = true) public class ProductSpuRespVO { + @ApiModelProperty(value = "SPU 编号", required = true) private Integer id; // ========== 基本信息 ========= - /** - * SPU 名字 - */ + @ApiModelProperty(value = "SPU 名字", required = true, example = "芋艿") private String name; - /** - * 卖点 - */ + @ApiModelProperty(value = "卖点", required = true, example = "好吃好玩") private String sellPoint; - /** - * 描述 - */ + @ApiModelProperty(value = "描述", required = true, example = "我是哈哈哈") private String description; - /** - * 分类编号 - */ + @ApiModelProperty(value = "分类编号", required = true, example = "1") private Integer cid; - /** - * 分类名 - */ + @ApiModelProperty(value = "分类名字", required = true, example = "蔬菜") private String categoryName; - /** - * 商品主图地数组 - */ + @ApiModelProperty(value = "商品主图地址", required = true, example = "http://www.iocoder.cn/xxx.jpg", notes = "多个之间，使用逗号分隔") private List picUrls; // ========== 其他信息 ========= - /** - * 是否上架商品（是否可见）。 - * - * true 为已上架 - * false 为已下架 - */ + @ApiModelProperty(value = "是否上架商品", required = true, example = "true") private Boolean visible; - /** - * 排序字段 - */ + @ApiModelProperty(value = "排序字段", required = true, example = "1024") private Integer sort; // ========== Sku 相关字段 ========= - /** - * 原价格，单位：分 - */ + @ApiModelProperty(value = "原始价格，单位：分", required = true, example = "233", notes = "该价格为商品的原始价格") private Integer originalPrice; - /** - * 购买价格，单位：分。 - */ + @ApiModelProperty(value = "购买价格，单位：分", required = true, example = "233", notes = "该价格为商品经过优惠计算后的价格") private Integer buyPrice; - /** - * 库存数量 - */ + @ApiModelProperty(value = "库存数量", required = true, example = "1024") private Integer quantity; - // ========== 促销活动相关字段 ========= + // ========== 促销活动相关字段 ========= TODO 芋艿：等做到促销在处理 // 目前只促销单体商品促销，目前仅限制折扣。 /** * 促销活动编号 diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuSearchConditionRespVO.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuSearchConditionRespVO.java new file mode 100644 index 000000000..7a80c0413 --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/product/vo/product/ProductSpuSearchConditionRespVO.java @@ -0,0 +1,32 @@ +package cn.iocoder.mall.shopweb.controller.product.vo.product; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@ApiModel("商品 SPU 搜索条件 Response VO") +@Data +@Accessors(chain = true) +public class ProductSpuSearchConditionRespVO { + + @ApiModel("商品分类信息") + @Data + @Accessors(chain = true) + public static class Category { + + @ApiModelProperty(value = "分类编号", required = true, example = "1") + private Integer id; + @ApiModelProperty(value = "分类名称", required = true, example = "手机") + private String name; + + } + + /** + * 商品分类数组 + */ + private List categories; + +} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/product/ProductSpuConvert.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/product/ProductSpuConvert.java index b0fcbf757..552048f6c 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/product/ProductSpuConvert.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/product/ProductSpuConvert.java @@ -1,20 +1,37 @@ package cn.iocoder.mall.shopweb.convert.product; +import cn.iocoder.common.framework.util.StringUtils; import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.common.framework.vo.SortingField; +import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductPageReqDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuPageReqVO; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuRespVO; +import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuSearchConditionRespVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.Collections; +import java.util.List; + @Mapper public interface ProductSpuConvert { ProductSpuConvert INSTANCE = Mappers.getMapper(ProductSpuConvert.class); - SearchProductPageReqDTO convert(ProductSpuPageReqVO bean); + default SearchProductPageReqDTO convert(ProductSpuPageReqVO bean) { + SearchProductPageReqDTO reqDTO = new SearchProductPageReqDTO() + .setCid(bean.getCid()).setKeyword(bean.getKeyword()); + reqDTO.setPageNo(bean.getPageNo()).setPageSize(bean.getPageSize()); + if (StringUtils.hasText(bean.getSortField()) && StringUtils.hasText(bean.getSortOrder())) { + reqDTO.setSorts(Collections.singletonList(new SortingField(bean.getSortField(), bean.getSortOrder()))); + } + return reqDTO; + } PageResult convertPage(PageResult page); + List convertList(List list); + } diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/product/ProductSpuManager.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/product/ProductSpuManager.java index 46807e46c..74bc8c484 100644 --- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/product/ProductSpuManager.java +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/product/ProductSpuManager.java @@ -1,18 +1,28 @@ package cn.iocoder.mall.shopweb.manager.product; +import cn.iocoder.common.framework.util.CollectionUtils; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; +import cn.iocoder.mall.productservice.rpc.category.ProductCategoryRpc; +import cn.iocoder.mall.productservice.rpc.category.dto.ProductCategoryRespDTO; +import cn.iocoder.mall.searchservice.enums.product.SearchProductConditionFieldEnum; import cn.iocoder.mall.searchservice.rpc.product.SearchProductRpc; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionReqDTO; +import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductConditionRespDTO; import cn.iocoder.mall.searchservice.rpc.product.dto.SearchProductRespDTO; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuPageReqVO; import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuRespVO; +import cn.iocoder.mall.shopweb.controller.product.vo.product.ProductSpuSearchConditionRespVO; import cn.iocoder.mall.shopweb.convert.product.ProductSpuConvert; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.util.Collections; +import java.util.List; + /** - * Product SPU Manager + * 商品 SPU Manager */ @Service @Validated @@ -21,6 +31,9 @@ public class ProductSpuManager { @DubboReference(version = "${dubbo.consumer.SearchProductRpc.version}") private SearchProductRpc searchProductRpc; + @DubboReference(version = "${dubbo.consumer.ProductCategoryRpc.version}") + private ProductCategoryRpc productCategoryRpc; + public PageResult pageProductSpu(ProductSpuPageReqVO pageReqVO) { CommonResult> pageResult = searchProductRpc.pageSearchProduct(ProductSpuConvert.INSTANCE.convert(pageReqVO)); @@ -28,4 +41,23 @@ public class ProductSpuManager { return ProductSpuConvert.INSTANCE.convertPage(pageResult.getData()); } + public ProductSpuSearchConditionRespVO getProductSpuSearchCondition(String keyword) { + // 获得搜索条件 + CommonResult getSearchProductConditionResult = + searchProductRpc.getSearchProductCondition(new SearchProductConditionReqDTO().setKeyword(keyword) + .setFields(Collections.singletonList(SearchProductConditionFieldEnum.CATEGORY.getField()))); + getSearchProductConditionResult.checkError(); + // 拼接结果 + ProductSpuSearchConditionRespVO conditionRespVO = new ProductSpuSearchConditionRespVO(); + if (CollectionUtils.isEmpty(getSearchProductConditionResult.getData().getCids())) { + conditionRespVO.setCategories(Collections.emptyList()); + } else { + CommonResult> listProductCategoriesResult = + productCategoryRpc.listProductCategories(getSearchProductConditionResult.getData().getCids()); + listProductCategoriesResult.checkError(); + conditionRespVO.setCategories(ProductSpuConvert.INSTANCE.convertList(listProductCategoriesResult.getData())); + } + return conditionRespVO; + } + }