diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a672f4de20d1ca8c49658d918b6cb611c95213e..522b4f9ee2e0689efd3366e5928a8c7d468d7da2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 3.0.0 + # 2.2.0 (2022/12/5) ### 🍏 feat diff --git a/laboratory/pom.xml b/laboratory/pom.xml index e28361baa86c79f8168e31a376b64ec272280cb0..cc55204bf3852bf850277a382ab527fbbdc4f794 100644 --- a/laboratory/pom.xml +++ b/laboratory/pom.xml @@ -5,7 +5,7 @@ youlai-mall com.youlai - 2.2.0 + 3.0.0 4.0.0 @@ -61,12 +61,6 @@ spring-cloud-starter-alibaba-nacos-config - - - com.github.xiaoymin - knife4j-micro-spring-boot-starter - - com.youlai oms-api diff --git a/laboratory/src/main/java/com/youlai/laboratory/LaboratoryApplication.java b/laboratory/src/main/java/com/youlai/laboratory/LaboratoryApplication.java index 006a75fd8aca9a62402c4646ac46194d02f1f819..8042dcdf734a03a5aaa671fd87bf3ff86179eb33 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/LaboratoryApplication.java +++ b/laboratory/src/main/java/com/youlai/laboratory/LaboratoryApplication.java @@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * 实验室启动类 * * @author zc - * @date 2021/11/29 0029 22:50 + * @since 2021/11/29 0029 22:50 */ @SpringBootApplication @EnableFeignClients(basePackageClasses = {OrderFeignClient.class, SkuFeignClient.class, MemberFeignClient.class}) diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/controller/SeataController.java b/laboratory/src/main/java/com/youlai/laboratory/seata/controller/SeataController.java index 9d6b73ed0f78296ddf79764c3fef1e714ef53fd0..2b7e8a433d309d467fb813cff0197b98c5710bab 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/seata/controller/SeataController.java +++ b/laboratory/src/main/java/com/youlai/laboratory/seata/controller/SeataController.java @@ -4,8 +4,8 @@ import com.youlai.common.result.Result; import com.youlai.laboratory.seata.pojo.form.SeataForm; import com.youlai.laboratory.seata.pojo.vo.SeataVO; import com.youlai.laboratory.seata.service.SeataService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.*; * Seata 控制层 * * @author haoxr - * @date 2022/4/16 20:46 + * @since 2022/4/16 20:46 */ -@Api(tags = "「实验室」Seata接口") +@Tag(name = "「实验室」Seata接口") @RestController @RequestMapping("/api/v1/seata") @RequiredArgsConstructor @@ -25,21 +25,21 @@ public class SeataController { private final SeataService seataService; - @ApiOperation("获取模拟数据") + @Operation(summary ="获取模拟数据") @GetMapping("/data") public Result getData() { SeataVO result = seataService.getData(); return Result.success(result); } - @ApiOperation("重置模拟数据") + @Operation(summary ="重置模拟数据") @PutMapping("/data/_reset") public Result resetData() { boolean result = seataService.resetData(); return Result.success(result); } - @ApiOperation("订单支付") + @Operation(summary ="订单支付") @PostMapping("/_pay") public Result payOrder(@RequestBody SeataForm seataForm) { boolean openTx = seataForm.isOpenTx(); diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/form/SeataForm.java b/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/form/SeataForm.java index a1723af0617d1ccdb15b0d3d5b2bb5cdcac4ebd7..fb4e40699ad92968eb4f8d5d6480c5e0ee898155 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/form/SeataForm.java +++ b/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/form/SeataForm.java @@ -6,7 +6,7 @@ import lombok.Data; * Seata 表单数据 * * @author haoxr - * @date 2022/4/21 23:16 + * @since 2022/4/21 23:16 */ @Data public class SeataForm { diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/vo/SeataVO.java b/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/vo/SeataVO.java index 2112511d8d86e50903e90081425c2992290183f7..773d3d44e2a745f2747c310bd82348fb979368ee 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/vo/SeataVO.java +++ b/laboratory/src/main/java/com/youlai/laboratory/seata/pojo/vo/SeataVO.java @@ -1,59 +1,59 @@ package com.youlai.laboratory.seata.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * Seata模拟数据视图对象 * * @author haoxr - * @date 2022/4/17 16:51 + * @since 2022/4/17 16:51 */ -@ApiModel("Seata模拟数据视图对象") +@Schema(description = "Seata模拟数据视图对象") @Data public class SeataVO { - @ApiModelProperty("商品库存信息") + @Schema(description="商品库存信息") private StockInfo stockInfo; - @ApiModelProperty("会员信息") + @Schema(description="会员信息") private AccountInfo accountInfo; - @ApiModelProperty("订单信息") + @Schema(description="订单信息") private OrderInfo orderInfo; - @ApiModel("商品库存信息") + @Schema(description = "商品库存信息") @Data public static class StockInfo{ - @ApiModelProperty("商品名称") + @Schema(description="商品名称") private String name; - @ApiModelProperty("商品图片") + @Schema(description="商品图片") private String picUrl; - @ApiModelProperty("库存数量") + @Schema(description="库存数量") private Integer stockNum; } - @ApiModel("订单信息") + @Schema(description = "订单信息") @Data public static class OrderInfo{ - @ApiModelProperty("订单编号") + @Schema(description="订单编号") private String orderSn; - @ApiModelProperty("订单状态") + @Schema(description="订单状态") private Integer status; } - @ApiModel("会员信息") + @Schema(description = "会员信息") @Data public static class AccountInfo{ - @ApiModelProperty("会员") + @Schema(description="会员") private String nickName; - @ApiModelProperty("订单状态") + @Schema(description="订单状态") private String avatarUrl; - @ApiModelProperty("订单状态") + @Schema(description="订单状态") private Long balance; } diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/service/SeataService.java b/laboratory/src/main/java/com/youlai/laboratory/seata/service/SeataService.java index 5958976dc11e5993327848138b2333ec5e529306..fe07eb12b62c7c76a43855594ed857a9dd63d16d 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/seata/service/SeataService.java +++ b/laboratory/src/main/java/com/youlai/laboratory/seata/service/SeataService.java @@ -7,7 +7,7 @@ import com.youlai.laboratory.seata.pojo.vo.SeataVO; * Seata 实验室接口层 * * @author haoxr - * @date 2022/4/16 20:49 + * @since 2022/4/16 20:49 */ public interface SeataService { diff --git a/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java b/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java index b11f5b25f0baad55bf0341aa1ef7eb5b01e0139c..3e0796decd2d7a25bf88af5790a106658331830d 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java +++ b/laboratory/src/main/java/com/youlai/laboratory/seata/service/impl/SeataServiceImpl.java @@ -8,7 +8,7 @@ import com.youlai.mall.oms.api.OrderFeignClient; import com.youlai.mall.oms.dto.OrderInfoDTO; import com.youlai.mall.oms.dto.SeataOrderDTO; import com.youlai.mall.pms.api.SkuFeignClient; -import com.youlai.mall.pms.pojo.dto.SkuDTO; +import com.youlai.mall.pms.model.dto.SkuDTO; import com.youlai.mall.ums.api.MemberFeignClient; import com.youlai.mall.ums.dto.MemberInfoDTO; import io.seata.spring.annotation.GlobalTransactional; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Service; * Seata 实验室业务类接口 * * @author haoxr - * @date 2022/4/16 20:49 + * @since 2022/4/16 20:49 */ @Service @Slf4j diff --git a/laboratory/src/main/java/com/youlai/laboratory/sentinel/controller/SentinelController.java b/laboratory/src/main/java/com/youlai/laboratory/sentinel/controller/SentinelController.java index ee823dc24861933ce47170f90978f481b79cf0c6..292fdf8758107fceab3ed815ec06539f354898d8 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/sentinel/controller/SentinelController.java +++ b/laboratory/src/main/java/com/youlai/laboratory/sentinel/controller/SentinelController.java @@ -1,34 +1,34 @@ package com.youlai.laboratory.sentinel.controller; import com.youlai.common.result.Result; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "「实验室」Sentinel接口") +@Tag(name = "「实验室」Sentinel接口") @RestController @RequestMapping("/api/v1/sentinel") @RequiredArgsConstructor @Slf4j public class SentinelController { - @ApiOperation("【普通流控】获取数据") + @Operation(summary ="【普通流控】获取数据") @GetMapping("/flow_limiting/data") public Result getFlowLimitingData() { return Result.success("正常数据"); } - @ApiOperation("【网关流控-RouteID】获取数据") + @Operation(summary ="【网关流控-RouteID】获取数据") @GetMapping("/gateway_route_flow_limiting/data") public Result getGatewayRouteFlowLimitingData() { return Result.success("正常数据"); } - @ApiOperation("【网关流控-API分组】获取数据") + @Operation(summary ="【网关流控-API分组】获取数据") @GetMapping("/gateway_api_flow_limiting/data") public Result getGatewayApiFlowLimitingData() { return Result.success("正常数据"); diff --git a/laboratory/src/main/java/com/youlai/laboratory/sentinel/handler/DefaultBlockExceptionHandler.java b/laboratory/src/main/java/com/youlai/laboratory/sentinel/handler/DefaultBlockExceptionHandler.java index 5c2a3c76dc8f2e349d34407221a4c419651bd9cc..5685c13d148a2810b30ca962879e0c0d301ca863 100644 --- a/laboratory/src/main/java/com/youlai/laboratory/sentinel/handler/DefaultBlockExceptionHandler.java +++ b/laboratory/src/main/java/com/youlai/laboratory/sentinel/handler/DefaultBlockExceptionHandler.java @@ -9,8 +9,8 @@ import com.youlai.common.result.ResultCode; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Component public class DefaultBlockExceptionHandler implements BlockExceptionHandler { diff --git a/mall-oms/oms-api/pom.xml b/mall-oms/oms-api/pom.xml index 4f1b651006cb543a23d6af20322c45cb0d29ce92..89a865443a4f508e388765b34a104ad822f19956 100644 --- a/mall-oms/oms-api/pom.xml +++ b/mall-oms/oms-api/pom.xml @@ -5,7 +5,7 @@ mall-oms com.youlai - 2.2.0 + 3.0.0 4.0.0 @@ -38,12 +38,6 @@ spring-cloud-starter-loadbalancer - - - com.github.xiaoymin - knife4j-micro-spring-boot-starter - - diff --git a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java index 0645499d0b1a565ac3ce374fe4eef211795b045c..4a32aadf5ec2dc8a7e582d3dc296714974aa92ad 100644 --- a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java +++ b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/api/OrderFeignClient.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*; * 订单Feign Client * * @author haoxr - * @date 2021/3/13 + * @since 2021/3/13 */ @FeignClient(value = "mall-oms", contextId = "order") public interface OrderFeignClient { diff --git a/mall-oms/oms-boot/pom.xml b/mall-oms/oms-boot/pom.xml index 8eb7ef104e5f8b7d1d424f93b2ac27bc512d69f6..41db2efe12084fe8bf4a10bcad21dc446057a714 100644 --- a/mall-oms/oms-boot/pom.xml +++ b/mall-oms/oms-boot/pom.xml @@ -5,7 +5,7 @@ mall-oms com.youlai - 2.2.0 + 3.0.0 4.0.0 diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/constant/OmsConstants.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/constant/OmsConstants.java index 383bdbba89fd5ccc75b45f96adf36f98ea2efd17..955a9eebb7fc7708aec051dad98e9bececdaaeb4 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/constant/OmsConstants.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/constant/OmsConstants.java @@ -4,7 +4,7 @@ package com.youlai.mall.oms.common.constant; * 订单常量 * * @author haoxr - * @date 2021/03/16 + * @since 2021/03/16 */ public interface OmsConstants { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderSourceTypeEnum.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderSourceTypeEnum.java index 8b8a631b9d8ad287533dc8a310d6b6e048ccef7c..2de5ace538939c9f5e2fdfeb0c062c63995f7a38 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderSourceTypeEnum.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderSourceTypeEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; * * @author huawei * @email huawei_code@163.com - * @date 2021/1/16 + * @since 2021/1/16 */ public enum OrderSourceTypeEnum implements IBaseEnum { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderStatusEnum.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderStatusEnum.java index 6a790c861122b9146e2803f63f4209feeed93a6d..1b8f72e997e0d6aec4c600c42bf4c2c373830812 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderStatusEnum.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/OrderStatusEnum.java @@ -7,7 +7,7 @@ import lombok.Getter; * 订单状态枚举 * * @author haoxr - * @date 2022/11/28 + * @since 2022/11/28 */ public enum OrderStatusEnum implements IBaseEnum { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java index b4f1b163f118cf0cea4a96df68b046d75545a3e6..9c7f05852497f0693f73ced25508156ed815b46e 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/common/enums/PayTypeEnum.java @@ -9,7 +9,7 @@ import lombok.Getter; * * @author huawei * @email huawei_code@163.com - * @date 2021/1/16 + * @since 2021/1/16 */ public enum PayTypeEnum implements IBaseEnum { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/OrderCloseRabbitConfig.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/OrderCloseRabbitConfig.java index 0853decd3647fda3f7a40db13eabe1d951838524..215d6dfb32af787b75a20b3c0ea83dbf9c411a8a 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/OrderCloseRabbitConfig.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/OrderCloseRabbitConfig.java @@ -15,7 +15,7 @@ import java.util.Map; * 订单超时关单延时队列 * * @author haoxr - * @date 2022/2/4 23:21 + * @since 2022/2/4 23:21 */ @Component diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfig.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..54e3237231fa199aa8d7081624526b3d94027bcc --- /dev/null +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfig.java @@ -0,0 +1,58 @@ +package com.youlai.mall.oms.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Swagger 配置 + *

+ * Spring Doc FAQ: https://springdoc.org/#faq + * + * @author haoxr + * @since 2023/2/17 + */ +@Configuration +public class SwaggerConfig { + + /** + * 接口信息 + */ + @Bean + public OpenAPI apiInfo() { + return new OpenAPI() + .components(new Components() + .addSecuritySchemes("Authorization", + new SecurityScheme().type(SecurityScheme.Type.HTTP) + .scheme("bearer").bearerFormat("JWT") + ) + ) + .info(new Info() + .title("订单服务") + .version("3.0.0") + .description("订单服务接口文档") + .license(new License().name("Apache 2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0")) + ); + } + + /** + * 接口分组 + */ + @Bean + public GroupedOpenApi omsApi() { + String[] paths = {"/**"}; + String[] packagesToScan = {"com.youlai.mall.oms.controller"}; + return GroupedOpenApi.builder() + .group("订单服务") + .packagesToScan(packagesToScan) + .pathsToMatch(paths) + .build(); + } + +} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfiguration.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfiguration.java deleted file mode 100644 index 8a2e29c4bda1412f55cdf41b4ee871ae16e12255..0000000000000000000000000000000000000000 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/SwaggerConfiguration.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.youlai.mall.oms.config; - -import com.google.common.collect.Lists; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.OAuthBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author haoxr - * @Date 2021/02/25 - */ -@Configuration -@EnableSwagger2WebMvc -@Import(BeanValidatorPluginsConfiguration.class) -public class SwaggerConfiguration { - - @Value("${knife4j.password_token_url}") - private String passwordTokenUrl; - - @Bean - public Docket restApi() { - //schema - List grantTypes=new ArrayList<>(); - //密码模式 - ResourceOwnerPasswordCredentialsGrant resourceOwnerPasswordCredentialsGrant=new ResourceOwnerPasswordCredentialsGrant(passwordTokenUrl); - grantTypes.add(resourceOwnerPasswordCredentialsGrant); - OAuth oAuth=new OAuthBuilder().name("oauth2") - .grantTypes(grantTypes).build(); - //context - //scope方位 - List scopes=new ArrayList<>(); - scopes.add(new AuthorizationScope("read","read resources")); - scopes.add(new AuthorizationScope("write","write resources")); - scopes.add(new AuthorizationScope("reads","read all resources")); - scopes.add(new AuthorizationScope("writes","write all resources")); - - SecurityReference securityReference=new SecurityReference("oauth2",scopes.toArray(new AuthorizationScope[]{})); - SecurityContext securityContext=new SecurityContext(Lists.newArrayList(securityReference),PathSelectors.ant("/**")); - //schemas - List securitySchemes=Lists.newArrayList(oAuth); - //securityContext - List securityContexts=Lists.newArrayList(securityContext); - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) - .paths(PathSelectors.any()) - .build() - .securityContexts(securityContexts) - .securitySchemes(securitySchemes) - .apiInfo(apiInfo()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("订单中心") - .description("

订单提交、秒杀接口
") - .termsOfServiceUrl("https://www.youlai.tech") - .contact(new Contact("有来开源组织", "https://gitee.com/youlaiorg", "youlaitech@163.com")) - .license("Apache-2.0") - .licenseUrl("https://www.apache.org/licenses/LICENSE-2.0") - .version("1.0.0") - .build(); - } - -} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/ThreadPoolConfig.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/ThreadPoolConfig.java index c2ffed7c81a4ce11d6d43c35c513bbf3b936bca7..7232e9e60087d80a46c86231d3d924bad1755935 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/ThreadPoolConfig.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/config/ThreadPoolConfig.java @@ -14,7 +14,7 @@ import java.util.concurrent.TimeUnit; * 自定义订单线程池 * * @author haoxr - * @date 2022/2/13 + * @since 2022/2/13 */ @Configuration @Slf4j diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java index 72d68cbd86395da79594263dc1e343734884e6e2..3734e54b05d27edd30a00c18477991ae0956071a 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/admin/OmsOrderController.java @@ -8,15 +8,15 @@ import com.youlai.common.result.Result; import com.youlai.mall.oms.dto.OrderInfoDTO; import com.youlai.mall.oms.dto.SeataOrderDTO; import com.youlai.mall.oms.common.enums.OrderStatusEnum; -import com.youlai.mall.oms.pojo.dto.OrderDTO; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; +import com.youlai.mall.oms.model.dto.OrderDTO; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.entity.OmsOrderItem; +import com.youlai.mall.oms.model.query.OrderPageQuery; import com.youlai.mall.oms.service.OrderItemService; import com.youlai.mall.oms.service.admin.OmsOrderService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -28,9 +28,9 @@ import java.util.Optional; * 「管理端」订单控制层 * * @author huawei - * @date 2020/12/30 + * @since 2020/12/30 */ -@Api(tags = "「管理端」订单管理") +@Tag(name = "「管理端」订单管理") @RestController @RequestMapping("/api/v1/orders") @RequiredArgsConstructor @@ -40,17 +40,17 @@ public class OmsOrderController { private final OrderItemService orderItemService; - @ApiOperation("订单分页列表") + @Operation(summary ="订单分页列表") @GetMapping public PageResult listOrderPages(OrderPageQuery queryParams) { IPage result = orderService.listOrderPages(queryParams); return PageResult.success(result); } - @ApiOperation(value = "订单详情") + @Operation(summary= "订单详情") @GetMapping("/{orderId}") public Result getOrderDetail( - @ApiParam("订单ID") @PathVariable Long orderId + @Parameter(name = "订单ID") @PathVariable Long orderId ) { OrderDTO orderDTO = new OrderDTO(); // 订单 @@ -66,10 +66,10 @@ public class OmsOrderController { return Result.success(orderDTO); } - @ApiOperation(value = "「实验室」获取订单信息", hidden = true) + @Operation(summary= "「实验室」获取订单信息", hidden = true) @GetMapping("/{orderId}/orderInfo") public Result getOrderInfo( - @ApiParam("订单ID") @PathVariable Long orderId + @Parameter(name = "订单ID") @PathVariable Long orderId ) { OrderInfoDTO orderInfo = new OrderInfoDTO(); @@ -81,20 +81,20 @@ public class OmsOrderController { return Result.success(orderInfo); } - @ApiOperation(value = "「实验室」订单支付", hidden = true) + @Operation(summary= "「实验室」订单支付", hidden = true) @PutMapping("/{orderId}/_pay") public Result payOrder( - @ApiParam("订单ID") @PathVariable Long orderId, + @Parameter(name = "订单ID") @PathVariable Long orderId, @RequestBody SeataOrderDTO orderDTO ) { Boolean result = orderService.payOrder(orderId, orderDTO); return Result.judge(result); } - @ApiOperation(value = "「实验室」订单重置", hidden = true) + @Operation(summary= "「实验室」订单重置", hidden = true) @PutMapping("/{orderId}/_reset") public Result resetOrder( - @ApiParam("订单ID") @PathVariable Long orderId + @Parameter(name = "订单ID") @PathVariable Long orderId ) { boolean result = orderService.update(new LambdaUpdateWrapper() .eq(OmsOrder::getId, orderId) diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java index 9f30109dc8d712e8361dd53f2ae1bfa608b7f732..1af6bdcb971fdede2e1c6c7d0a2d4d7b2c8bb11c 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/CartController.java @@ -2,11 +2,11 @@ package com.youlai.mall.oms.controller.app; import com.youlai.common.result.Result; import com.youlai.common.security.util.SecurityUtils; -import com.youlai.mall.oms.pojo.dto.CartItemDTO; +import com.youlai.mall.oms.model.dto.CartItemDTO; import com.youlai.mall.oms.service.CartService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -17,10 +17,10 @@ import java.util.List; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ -@Api(tags = "「移动端」购物车接口") +@Tag(name = "「移动端」购物车接口") @RestController @RequestMapping("/app-api/v1/carts") @RequiredArgsConstructor @@ -28,28 +28,28 @@ public class CartController { private final CartService cartService; - @ApiOperation(value = "查询购物车") + @Operation(summary= "查询购物车") @GetMapping public Result getCart() { List result = cartService.listCartItems(SecurityUtils.getMemberId()); return Result.success((T) result); } - @ApiOperation(value = "删除购物车") + @Operation(summary= "删除购物车") @DeleteMapping public Result deleteCart() { boolean result = cartService.deleteCart(); return Result.judge(result); } - @ApiOperation(value = "添加购物车商品") + @Operation(summary= "添加购物车商品") @PostMapping public Result addCartItem(@RequestParam Long skuId) { cartService.addCartItem(skuId); return Result.success(); } - @ApiOperation(value = "更新购物车商品") + @Operation(summary= "更新购物车商品") @PutMapping("/skuId/{skuId}") public Result updateCartItem( @PathVariable Long skuId, @@ -60,17 +60,17 @@ public class CartController { return Result.judge(result); } - @ApiOperation(value = "删除购物车商品") + @Operation(summary= "删除购物车商品") @DeleteMapping("/skuId/{skuId}") public Result removeCartItem(@PathVariable Long skuId) { boolean result = cartService.removeCartItem(skuId); return Result.judge(result); } - @ApiOperation(value = "全选/全不选购物车商品") + @Operation(summary= "全选/全不选购物车商品") @PatchMapping("/_check") public Result check( - @ApiParam("全选/全不选") boolean checked + @Parameter(name = "全选/全不选") boolean checked ) { boolean result = cartService.checkAll(checked); return Result.judge(result); diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java index a8e28a64a8ec62dcb77febd1f31c52cdd76669e0..605016a75e2189691bb6bc99057fba8b1c27b56c 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java @@ -3,14 +3,14 @@ package com.youlai.mall.oms.controller.app; import com.baomidou.mybatisplus.core.metadata.IPage; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.form.OrderSubmitForm; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; -import com.youlai.mall.oms.pojo.vo.OrderConfirmVO; -import com.youlai.mall.oms.pojo.vo.OrderSubmitResultVO; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.form.OrderSubmitForm; +import com.youlai.mall.oms.model.query.OrderPageQuery; +import com.youlai.mall.oms.model.vo.OrderConfirmVO; +import com.youlai.mall.oms.model.vo.OrderSubmitResultVO; import com.youlai.mall.oms.service.OrderService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.*; * 「移动端」订单控制层 * * @author huawei - * @date 2020/12/30 + * @since 2020/12/30 */ -@Api(tags = "「移动端」订单接口") +@Tag(name = "「移动端」订单接口") @RestController @RequestMapping("/app-api/v1/orders") @RequiredArgsConstructor @@ -29,7 +29,7 @@ public class OrderController { final OrderService orderService; - @ApiOperation("分页列表") + @Operation(summary ="分页列表") @GetMapping public PageResult listOrderPages(OrderPageQuery queryParams) { IPage result = orderService.listOrderPages(queryParams); @@ -45,28 +45,28 @@ public class OrderController { * @param skuId 直接购买必填,购物车结算不填 * @return */ - @ApiOperation("订单确认") + @Operation(summary ="订单确认") @PostMapping("/_confirm") public Result confirmOrder(@RequestParam(required = false) Long skuId) { OrderConfirmVO result = orderService.confirmOrder(skuId); return Result.success(result); } - @ApiOperation("订单提交") + @Operation(summary ="订单提交") @PostMapping("/_submit") public Result submitOrder(@RequestBody @Validated OrderSubmitForm orderSubmitForm) { OrderSubmitResultVO result = orderService.submitOrder(orderSubmitForm); return Result.success(result); } - @ApiOperation("订单支付") + @Operation(summary ="订单支付") @PostMapping("/{orderId}/_pay") public Result payOrder(@PathVariable Long orderId) { boolean result = orderService.payOrder(orderId); return Result.judge(result); } - @ApiOperation("订单删除") + @Operation(summary ="订单删除") @DeleteMapping("/{orderId}") public Result deleteOrder(@PathVariable Long orderId) { boolean result = orderService.deleteOrder(orderId); diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/WxPayCallbackController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/WxPayCallbackController.java index 206ab52e4b23b38a7f782df0d5a116dd6a3916ef..b6b6329d4265dc38a07072c1c6041074d7da30ea 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/WxPayCallbackController.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/WxPayCallbackController.java @@ -3,9 +3,9 @@ package com.youlai.mall.oms.controller.app; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; import com.github.binarywang.wxpay.constant.WxPayConstants; import com.github.binarywang.wxpay.exception.WxPayException; -import com.youlai.mall.oms.pojo.vo.WxPayResponseVO; +import com.youlai.mall.oms.model.vo.WxPayResponseVO; import com.youlai.mall.oms.service.OrderService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * @author Gadfly * @since 2021-05-27 14:24 */ -@Api(tags = "「移动端」微信支付回调接口") +@Tag(name = "「移动端」微信支付回调接口") @Slf4j @Validated @RestController diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java index c93ba60b2a935d06f2bb5e993b33f70efcf3bae0..325a89f97f584aee102a75df30258de0ba4aeadf 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderConverter.java @@ -1,7 +1,7 @@ package com.youlai.mall.oms.converter; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.form.OrderSubmitForm; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.form.OrderSubmitForm; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -11,7 +11,7 @@ import org.mapstruct.Mappings; * 订单转化器 * * @author haoxr - * @date 2022/12/21 + * @since 2022/12/21 */ @Mapper(componentModel = "spring") public interface OrderConverter { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderItemConverter.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderItemConverter.java index 700315c5e2f733e2065d0e96e87d34819e41c817..d32132f12977e5ecb8abb46b1c064ef72f3b6493 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderItemConverter.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/converter/OrderItemConverter.java @@ -2,8 +2,8 @@ package com.youlai.mall.oms.converter; import cn.hutool.core.collection.CollectionUtil; -import com.youlai.mall.oms.pojo.dto.OrderItemDTO; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; +import com.youlai.mall.oms.model.dto.OrderItemDTO; +import com.youlai.mall.oms.model.entity.OmsOrderItem; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -17,7 +17,7 @@ import java.util.stream.Collectors; * 订单对象转化器 * * @author haoxr - * @date 2022/12/21 + * @since 2022/12/21 */ @Mapper(componentModel = "spring") public interface OrderItemConverter { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/listener/OrderCloseListener.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/listener/OrderCloseListener.java index e2531ab0ccf6e0e9e3b836bbdfc5ca62e16e59c5..95b9e865ce8fb10b92edd5bf44f8b954a6944739 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/listener/OrderCloseListener.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/listener/OrderCloseListener.java @@ -14,7 +14,7 @@ import java.io.IOException; * 订单超时未支付取消 * * @author haoxr - * @date 2022/12/19 + * @since 2022/12/19 */ //@Component @RequiredArgsConstructor diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderDeliveryMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderDeliveryMapper.java index 814f75576b1afe677b541f2eb753268845e3fb09..7b2f0380434ab90807271a501e534233398fb451 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderDeliveryMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderDeliveryMapper.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms.mapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderDelivery; +import com.youlai.mall.oms.model.entity.OmsOrderDelivery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Mapper public interface OrderDeliveryMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderItemMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderItemMapper.java index 4aa8e12ebe0f67e7bd739ef9d783f80573a3db30..f7b81e2f60d4aaa1a7cb4f53e47acf4cc9b4b486 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderItemMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderItemMapper.java @@ -1,14 +1,14 @@ package com.youlai.mall.oms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; +import com.youlai.mall.oms.model.entity.OmsOrderItem; import org.apache.ibatis.annotations.Mapper; /** * 订单商品明细表 * * @author huawei - * @date 2020-12-30 + * @since 2020-12-30 */ @Mapper public interface OrderItemMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderLogMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderLogMapper.java index c3c273bf0a664bff115ea9ca8e20755290ce2242..e609509f64cb74a55263213b130fb8c9dfcba815 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderLogMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderLogMapper.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms.mapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderLog; +import com.youlai.mall.oms.model.entity.OmsOrderLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Mapper public interface OrderLogMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java index 3ee4fa55f3f2dcb1630284e677d9e08f80ae13c5..fa8e8429326e6ad15841a24e51517fcd42383f6e 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java @@ -2,8 +2,8 @@ package com.youlai.mall.oms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.query.OrderPageQuery; import org.apache.ibatis.annotations.*; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Mapper public interface OrderMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderPayMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderPayMapper.java index c5477b7487e1b1c695c577dca8e4aaf2d24916a4..370985c6ba65c4e0713a5fd7448bbcc2374c3abc 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderPayMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderPayMapper.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms.mapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderPay; +import com.youlai.mall.oms.model.entity.OmsOrderPay; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Mapper public interface OrderPayMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderSettingMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderSettingMapper.java index 4daf8e11a84a65f7966511132009f6b5c7282f3f..d1eba73ffd665ca682883284a436ed1480b66209 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderSettingMapper.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderSettingMapper.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms.mapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderSetting; +import com.youlai.mall.oms.model.entity.OmsOrderSetting; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Mapper public interface OrderSettingMapper extends BaseMapper { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/CartItemDTO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/CartItemDTO.java similarity index 95% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/CartItemDTO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/CartItemDTO.java index c31468a01bc15e2a8d2de081b18e3c8cf0bf7808..675a3c341941ac89569e986cea63eab679758d3d 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/CartItemDTO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/CartItemDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.dto; +package com.youlai.mall.oms.model.dto; import lombok.*; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderDTO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderDTO.java similarity index 68% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderDTO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderDTO.java index 0a47a8d4c23aab4f11803a6dadaaf98c1e036443..4801bde18205a5f2778b8617b6e7c5df88a6224c 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderDTO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderDTO.java @@ -1,7 +1,7 @@ -package com.youlai.mall.oms.pojo.dto; +package com.youlai.mall.oms.model.dto; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.entity.OmsOrderItem; import com.youlai.mall.ums.dto.MemberDTO; import lombok.Data; import lombok.experimental.Accessors; @@ -12,7 +12,7 @@ import java.util.List; * @author huawei * @desc * @email huawei_code@163.com - * @date 2021/1/19 + * @since 2021/1/19 */ @Data @Accessors(chain = true) diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderItemDTO.java similarity index 90% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderItemDTO.java index 274eb35757270b575c506be6244e049a199d50f8..5edf75a1097b5dc0f54d07623694092000340f8b 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/dto/OrderItemDTO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/dto/OrderItemDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.dto; +package com.youlai.mall.oms.model.dto; import lombok.*; @@ -6,7 +6,7 @@ import lombok.*; * 订单商品 * * @author haoxr - * @date 2022/12/21 + * @since 2022/12/21 */ @Data public class OrderItemDTO { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrder.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrder.java similarity index 96% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrder.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrder.java index ef759cce9e2852f84a02a350b36af86435f6fbdd..c3124f0a1ec5c82e4c56daa90dd9c47db1963c1a 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrder.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrder.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; @@ -16,7 +16,7 @@ import java.util.List; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data @Accessors(chain = true) diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderDelivery.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderDelivery.java similarity index 94% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderDelivery.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderDelivery.java index 6a33b62ba781916739b4bc410681ffb5e44d5984..4dedfe3e3f1adfba07c5ce6faa3ac76cd87802eb 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderDelivery.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderDelivery.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,7 +13,7 @@ import java.util.Date; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data @Builder diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderItem.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderItem.java similarity index 93% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderItem.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderItem.java index dee4fce577c5564389356a29ac2d1b6641351649..b1e22a27a780cf5ecaeab0e57e23bc7a713a060f 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderItem.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderItem.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,7 +11,7 @@ import lombok.experimental.Accessors; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data @Accessors(chain = true) diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderLog.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderLog.java similarity index 91% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderLog.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderLog.java index 9797dccb28f558a8a6aab4fa81c6627469b97fb6..676017a91273bd07359af24a67883af9144164a8 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderLog.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderLog.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import lombok.Data; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data public class OmsOrderLog extends BaseEntity { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderPay.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderPay.java similarity index 93% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderPay.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderPay.java index 4a099817012267809163fec15389efd9351a04e0..2c80eb1d61aadbe01982b17e88602e9492ee0107 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderPay.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderPay.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,7 +13,7 @@ import java.util.Date; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data @Builder diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderSetting.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderSetting.java similarity index 93% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderSetting.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderSetting.java index 1ad1571ccdb5a5c50c492e729c0e9de91a6dfa36..b9dd92a47669c3c39040a7777de02329a0b42764 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/entity/OmsOrderSetting.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/entity/OmsOrderSetting.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.entity; +package com.youlai.mall.oms.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -10,7 +10,7 @@ import lombok.Data; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ @Data public class OmsOrderSetting extends BaseEntity { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/form/OrderSubmitForm.java similarity index 52% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/form/OrderSubmitForm.java index 0fcb4d4684b5b7fa2ae5627e43b8b91a0f7a5fae..7adbe2095738549275aa0b7d97ae79ad4242fd44 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/form/OrderSubmitForm.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/form/OrderSubmitForm.java @@ -1,13 +1,13 @@ -package com.youlai.mall.oms.pojo.form; +package com.youlai.mall.oms.model.form; import com.youlai.mall.oms.common.enums.OrderSourceTypeEnum; -import com.youlai.mall.oms.pojo.dto.OrderItemDTO; +import com.youlai.mall.oms.model.dto.OrderItemDTO; import com.youlai.mall.ums.dto.MemberAddressDTO; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.ToString; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.List; /** @@ -15,7 +15,7 @@ import java.util.List; * * @author huawei * @email huawei_code@163.com - * @date 2021/1/16 + * @since 2021/1/16 */ @Data @ToString @@ -27,29 +27,29 @@ public class OrderSubmitForm { * * @see OrderSourceTypeEnum */ - @ApiModelProperty("订单来源") + @Schema(description="订单来源") private Integer sourceType; - @ApiModelProperty("提交订单确认页面签发的令牌(防止订单重复提交,订单提交成功转为订单编号)") + @Schema(description="提交订单确认页面签发的令牌(防止订单重复提交,订单提交成功转为订单编号)") private String orderToken; - @ApiModelProperty("订单总金额-用于验价(单位:分)") + @Schema(description="订单总金额-用于验价(单位:分)") private Long totalAmount; - @ApiModelProperty("支付金额(单位:分)") + @Schema(description="支付金额(单位:分)") private Long payAmount; - @ApiModelProperty("订单的商品明细") + @Schema(description="订单的商品明细") private List orderItems; - @ApiModelProperty("订单备注") + @Schema(description="订单备注") @Size(max = 500, message = "订单备注长度不能超过500") private String remark; - @ApiModelProperty("优惠券ID") + @Schema(description="优惠券ID") private String couponId; - @ApiModelProperty("收获地址") + @Schema(description="收获地址") private MemberAddressDTO deliveryAddress; } diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/query/OrderPageQuery.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/query/OrderPageQuery.java new file mode 100644 index 0000000000000000000000000000000000000000..ecf264fd69eb1fb1728803394e30fe09435ddac2 --- /dev/null +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/query/OrderPageQuery.java @@ -0,0 +1,31 @@ +package com.youlai.mall.oms.model.query; + +import com.youlai.common.base.BasePageQuery; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/** + * @author haoxr + * @since 2022/2/1 19:14 + */ +@Data +@Schema(description = "订单分页查询对象") +public class OrderPageQuery extends BasePageQuery { + + @Schema(description="订单状态") + private Integer status; + + @Schema(description="会员ID") + private Long memberId; + + @Schema(description="订单编号") + private String orderSn; + + @Schema(description = "开始时间(格式:yyyy-MM-dd)") + private String beginDate; + + @Schema(description = "截止时间(格式:yyyy-MM-dd)") + private String endDate; + +} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderConfirmVO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderConfirmVO.java new file mode 100644 index 0000000000000000000000000000000000000000..9390228a02d534ba7bac61270730755003aca0f9 --- /dev/null +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderConfirmVO.java @@ -0,0 +1,24 @@ +package com.youlai.mall.oms.model.vo; + +import com.youlai.mall.oms.model.dto.OrderItemDTO; +import com.youlai.mall.ums.dto.MemberAddressDTO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + + +@Schema(description = "订单确认视图层对象") +@Data +public class OrderConfirmVO { + + @Schema(description="订单token") + private String orderToken; + + @Schema(description="订单明细") + private List orderItems; + + @Schema(description="会员收获地址列表") + private List addresses; + +} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderPageVO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderPageVO.java similarity index 92% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderPageVO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderPageVO.java index 6b6dd810ac2e6b6770f50135b649e90a4ef85d60..5c0bfc5ffb826abcb348d1c4d96cbd2a245e7026 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderPageVO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderPageVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.oms.pojo.vo; +package com.youlai.mall.oms.model.vo; import lombok.Data; @@ -9,7 +9,7 @@ import java.util.List; * 订单分页视图对象 * * @author haoxr - * @date 2022/2/1 20:58 + * @since 2022/2/1 20:58 */ @Data public class OrderPageVO { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderSubmitResultVO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderSubmitResultVO.java similarity index 50% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderSubmitResultVO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderSubmitResultVO.java index 7bfb2013f9c1e1c4d8a8d8fd51af5f750706a5cc..f67cb01cb520f21a45322194b19c5870d988da54 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderSubmitResultVO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/OrderSubmitResultVO.java @@ -1,7 +1,6 @@ -package com.youlai.mall.oms.pojo.vo; +package com.youlai.mall.oms.model.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,18 +9,18 @@ import lombok.NoArgsConstructor; * 订单提交结果 * * @author huawei - * @date 2021/1/21 + * @since 2021/1/21 */ -@ApiModel("订单提交结果") +@Schema(description = "订单提交结果") @Data @AllArgsConstructor @NoArgsConstructor public class OrderSubmitResultVO { - @ApiModelProperty("订单ID") + @Schema(description="订单ID") private Long orderId; - @ApiModelProperty("订单编号,进入支付页面显示") + @Schema(description="订单编号,进入支付页面显示") private String orderSn; } diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/WxPayResponseVO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/WxPayResponseVO.java similarity index 79% rename from mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/WxPayResponseVO.java rename to mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/WxPayResponseVO.java index 5714fbd292e6e01b382a453b7850ac25468ba2ef..8de70ac3418596e22816c13f77303d1bfbc337a4 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/WxPayResponseVO.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/model/vo/WxPayResponseVO.java @@ -1,6 +1,5 @@ -package com.youlai.mall.oms.pojo.vo; +package com.youlai.mall.oms.model.vo; -import lombok.Builder; import lombok.Data; import lombok.experimental.Accessors; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/query/OrderPageQuery.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/query/OrderPageQuery.java deleted file mode 100644 index a433244b4d56e11be960df9e15e20bd7ba69f578..0000000000000000000000000000000000000000 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/query/OrderPageQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.youlai.mall.oms.pojo.query; - -import com.youlai.common.base.BasePageQuery; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -/** - * @author haoxr - * @date 2022/2/1 19:14 - */ -@Data -@ApiModel("订单分页查询对象") -public class OrderPageQuery extends BasePageQuery { - - @ApiModelProperty("订单状态") - private Integer status; - - @ApiModelProperty("会员ID") - private Long memberId; - - @ApiModelProperty("订单编号") - private String orderSn; - - @ApiModelProperty(value = "开始时间(格式:yyyy-MM-dd)") - private String beginDate; - - @ApiModelProperty(value = "截止时间(格式:yyyy-MM-dd)") - private String endDate; - -} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderConfirmVO.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderConfirmVO.java deleted file mode 100644 index cbca5eec3156ce05a51eb1c279630f94f0d3d687..0000000000000000000000000000000000000000 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/pojo/vo/OrderConfirmVO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.youlai.mall.oms.pojo.vo; - -import com.youlai.common.base.BaseVO; -import com.youlai.mall.oms.pojo.dto.OrderItemDTO; -import com.youlai.mall.ums.dto.MemberAddressDTO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - - -@ApiModel("订单确认视图层对象") -@Data -public class OrderConfirmVO { - - @ApiModelProperty("订单token") - private String orderToken; - - @ApiModelProperty("订单明细") - private List orderItems; - - @ApiModelProperty("会员收获地址列表") - private List addresses; - -} diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/CartService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/CartService.java index 04ae156318fdb57b901b88166fff1f894f37c88c..ba8fc8017eff6ea74e0e557b35df4cd7c77b5b55 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/CartService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/CartService.java @@ -1,6 +1,6 @@ package com.youlai.mall.oms.service; -import com.youlai.mall.oms.pojo.dto.CartItemDTO; +import com.youlai.mall.oms.model.dto.CartItemDTO; import java.util.List; @@ -8,7 +8,7 @@ import java.util.List; * 购物车业务接口 * * @author haoxr - * @date 2022/11/13 + * @since 2022/11/13 */ public interface CartService { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderDeliveryService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderDeliveryService.java index dab15f591827d5a4202673a22dc747d58ed50061..9e45e01775565458d7731a0801c7d0b8d44bf283 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderDeliveryService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderDeliveryService.java @@ -2,14 +2,14 @@ package com.youlai.mall.oms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.oms.pojo.entity.OmsOrderDelivery; +import com.youlai.mall.oms.model.entity.OmsOrderDelivery; /** * 订单物流记录表 * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ public interface OrderDeliveryService extends IService { } diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderItemService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderItemService.java index e843a81b6f2d50d8cae85999a9eeac8411e46105..04b3855acc5d1f85817937e6e437329aabe48a4b 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderItemService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderItemService.java @@ -1,7 +1,7 @@ package com.youlai.mall.oms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; +import com.youlai.mall.oms.model.entity.OmsOrderItem; /** @@ -9,7 +9,7 @@ import com.youlai.mall.oms.pojo.entity.OmsOrderItem; * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ public interface OrderItemService extends IService { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderLogService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderLogService.java index 4beebba34b4c39815dd47280a615d94c36b59174..9b8980be9b94360cd19cb3b2c24a189d0f54a19e 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderLogService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderLogService.java @@ -2,14 +2,14 @@ package com.youlai.mall.oms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.oms.pojo.entity.OmsOrderLog; +import com.youlai.mall.oms.model.entity.OmsOrderLog; /** * 订单操作历史记录 * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ public interface OrderLogService extends IService { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderService.java index b089eb258ae3756013be36704f019a6d4fa72bf9..6fca6a9209965cf41db9b98c05fe4316f5dc6715 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderService.java @@ -5,18 +5,18 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.binarywang.wxpay.bean.notify.SignatureHeader; import com.github.binarywang.wxpay.exception.WxPayException; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; -import com.youlai.mall.oms.pojo.vo.OrderConfirmVO; -import com.youlai.mall.oms.pojo.vo.OrderSubmitResultVO; -import com.youlai.mall.oms.pojo.form.OrderSubmitForm; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.query.OrderPageQuery; +import com.youlai.mall.oms.model.vo.OrderConfirmVO; +import com.youlai.mall.oms.model.vo.OrderSubmitResultVO; +import com.youlai.mall.oms.model.form.OrderSubmitForm; /** * 订单业务接口 * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ public interface OrderService extends IService { diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderSettingService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderSettingService.java index a943a2445ec9779cb37830baa902015bfd7c1b84..c7dc1195dfb199f0735bdaf3bd089f504a51267e 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderSettingService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/OrderSettingService.java @@ -2,14 +2,14 @@ package com.youlai.mall.oms.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.mall.oms.pojo.entity.OmsOrderSetting; +import com.youlai.mall.oms.model.entity.OmsOrderSetting; /** * 订单配置信息 * * @author huawei * @email huawei_code@163.com - * @date 2020-12-30 22:31:10 + * @since 2020-12-30 22:31:10 */ public interface OrderSettingService extends IService { } diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/OmsOrderService.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/OmsOrderService.java index a63eba794620f36e5c8874e982c21304fbc5f9d8..870b5a1d180f066b28d38fad6c63654b02bf23be 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/OmsOrderService.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/OmsOrderService.java @@ -3,14 +3,14 @@ package com.youlai.mall.oms.service.admin; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.mall.oms.dto.SeataOrderDTO; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.query.OrderPageQuery; /** * 「管理端」订单业务接口 * * @author haoxr - * @date 2020/12/30 + * @since 2020/12/30 */ public interface OmsOrderService extends IService { /** diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/impl/OmsOrderServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/impl/OmsOrderServiceImpl.java index d6c2e1277832aa0d3caadc85df528a44a45197b5..4a953c2ed7c2776da9f04f724f8e3e25c8a3dc74 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/impl/OmsOrderServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/admin/impl/OmsOrderServiceImpl.java @@ -8,8 +8,8 @@ import com.youlai.common.redis.BusinessSnGenerator; import com.youlai.mall.oms.common.enums.OrderStatusEnum; import com.youlai.mall.oms.dto.SeataOrderDTO; import com.youlai.mall.oms.mapper.OrderMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.query.OrderPageQuery; import com.youlai.mall.oms.service.admin.OmsOrderService; import com.youlai.mall.ums.api.MemberFeignClient; import lombok.RequiredArgsConstructor; @@ -22,7 +22,7 @@ import java.util.List; * 「管理端」订单业务实现类 * * @author haoxr - * @date 2022/2/12 + * @since 2022/2/12 */ @Service @RequiredArgsConstructor diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/CartServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/CartServiceImpl.java index 771ce6a20805335b5ff220f5cdca41306b245b00..bac54d022110995d47767b69fe642589ed569325 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/CartServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/CartServiceImpl.java @@ -6,10 +6,10 @@ import com.youlai.common.result.ResultCode; import com.youlai.common.security.util.SecurityUtils; import com.youlai.common.web.exception.BizException; import com.youlai.mall.oms.common.constant.OmsConstants; -import com.youlai.mall.oms.pojo.dto.CartItemDTO; +import com.youlai.mall.oms.model.dto.CartItemDTO; import com.youlai.mall.oms.service.CartService; import com.youlai.mall.pms.api.SkuFeignClient; -import com.youlai.mall.pms.pojo.dto.SkuDTO; +import com.youlai.mall.pms.model.dto.SkuDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.BoundHashOperations; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderDeliveryServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderDeliveryServiceImpl.java index 95d2e1178e1a8c5d193db2fe977f03f5b1b9e069..eda58b0cc2505b81008ec5ca0f617f2fdf3644c1 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderDeliveryServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderDeliveryServiceImpl.java @@ -2,7 +2,7 @@ package com.youlai.mall.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.mall.oms.mapper.OrderDeliveryMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderDelivery; +import com.youlai.mall.oms.model.entity.OmsOrderDelivery; import com.youlai.mall.oms.service.OrderDeliveryService; import org.springframework.stereotype.Service; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderItemServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderItemServiceImpl.java index c54d104555d81b24bc55acdda1e8fad7459c206a..817a0887350fff7039b1950cbef21c5727edcd88 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderItemServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderItemServiceImpl.java @@ -2,7 +2,7 @@ package com.youlai.mall.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.mall.oms.mapper.OrderItemMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; +import com.youlai.mall.oms.model.entity.OmsOrderItem; import com.youlai.mall.oms.service.OrderItemService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderLogServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderLogServiceImpl.java index 1baa66fdbca5985d5e59e7678acb6aad6f1b8d5f..a89529d85642e972a3a05366425ff3a77dcc8727 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderLogServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderLogServiceImpl.java @@ -3,7 +3,7 @@ package com.youlai.mall.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.common.security.util.SecurityUtils; import com.youlai.mall.oms.mapper.OrderLogMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderLog; +import com.youlai.mall.oms.model.entity.OmsOrderLog; import com.youlai.mall.oms.service.OrderLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java index f1162f290de326e9c74ec9353d41e4c50b606a32..b5051eb7f18455e3f0f56f5e68603047440f5d6a 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java @@ -31,21 +31,21 @@ import com.youlai.mall.oms.common.enums.PayTypeEnum; import com.youlai.mall.oms.converter.OrderConverter; import com.youlai.mall.oms.converter.OrderItemConverter; import com.youlai.mall.oms.mapper.OrderMapper; -import com.youlai.mall.oms.pojo.dto.CartItemDTO; -import com.youlai.mall.oms.pojo.dto.OrderItemDTO; -import com.youlai.mall.oms.pojo.entity.OmsOrder; -import com.youlai.mall.oms.pojo.entity.OmsOrderItem; -import com.youlai.mall.oms.pojo.form.OrderSubmitForm; -import com.youlai.mall.oms.pojo.query.OrderPageQuery; -import com.youlai.mall.oms.pojo.vo.OrderConfirmVO; -import com.youlai.mall.oms.pojo.vo.OrderSubmitResultVO; +import com.youlai.mall.oms.model.dto.CartItemDTO; +import com.youlai.mall.oms.model.dto.OrderItemDTO; +import com.youlai.mall.oms.model.entity.OmsOrder; +import com.youlai.mall.oms.model.entity.OmsOrderItem; +import com.youlai.mall.oms.model.form.OrderSubmitForm; +import com.youlai.mall.oms.model.query.OrderPageQuery; +import com.youlai.mall.oms.model.vo.OrderConfirmVO; +import com.youlai.mall.oms.model.vo.OrderSubmitResultVO; import com.youlai.mall.oms.service.CartService; import com.youlai.mall.oms.service.OrderItemService; import com.youlai.mall.oms.service.OrderService; import com.youlai.mall.pms.api.SkuFeignClient; -import com.youlai.mall.pms.pojo.dto.CheckPriceDTO; -import com.youlai.mall.pms.pojo.dto.SkuDTO; -import com.youlai.mall.pms.pojo.dto.LockStockDTO; +import com.youlai.mall.pms.model.dto.CheckPriceDTO; +import com.youlai.mall.pms.model.dto.SkuDTO; +import com.youlai.mall.pms.model.dto.LockStockDTO; import com.youlai.mall.ums.api.MemberFeignClient; import com.youlai.mall.ums.dto.MemberAddressDTO; import io.seata.spring.annotation.GlobalTransactional; @@ -53,7 +53,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; -import org.springframework.amqp.rabbit.connection.CorrelationData; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.script.DefaultRedisScript; @@ -75,7 +74,7 @@ import static com.youlai.mall.oms.common.constant.OmsConstants.*; * 订单业务实现类 * * @author haoxr - * @date 2022/2/12 + * @since 2022/2/12 */ @Service @RequiredArgsConstructor diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderSettingServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderSettingServiceImpl.java index 6800f9d7068f7b6c5e862c623f72e41b80fa68c0..bcc1b4d641698dfd42da4572886016a5cea94990 100644 --- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderSettingServiceImpl.java +++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderSettingServiceImpl.java @@ -2,7 +2,7 @@ package com.youlai.mall.oms.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.mall.oms.mapper.OrderSettingMapper; -import com.youlai.mall.oms.pojo.entity.OmsOrderSetting; +import com.youlai.mall.oms.model.entity.OmsOrderSetting; import com.youlai.mall.oms.service.OrderSettingService; import org.springframework.stereotype.Service; diff --git a/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderItemMapper.xml b/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderItemMapper.xml index 5be67e422d2993ba91cd682b6a73ed23994b794d..a0127053155090693d805b8b63ff12aaa3a93cc9 100644 --- a/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderItemMapper.xml +++ b/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderItemMapper.xml @@ -5,7 +5,7 @@ - SELECT id, order_id, diff --git a/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderMapper.xml b/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderMapper.xml index ff86c829b55b92981e5077ba8c6514c3b0f033df..7a38da7071bea68635034b275c5270c19980a5f6 100644 --- a/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderMapper.xml +++ b/mall-oms/oms-boot/src/main/resources/mapper/OmsOrderMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/mall-oms/pom.xml b/mall-oms/pom.xml index fd8792a3654a078b081897eec85d81d9a6fd87b6..4e15235e1d02d4b528daf9106574bf924a8b1ab3 100644 --- a/mall-oms/pom.xml +++ b/mall-oms/pom.xml @@ -5,7 +5,7 @@ youlai-mall com.youlai - 2.2.0 + 3.0.0 4.0.0 diff --git a/mall-pms/pms-api/pom.xml b/mall-pms/pms-api/pom.xml index 3fe16ce1c1659dac63b745e3abbde596d2e350e4..6275f24b759548dbd545c42b76fffdabebb6a1fc 100644 --- a/mall-pms/pms-api/pom.xml +++ b/mall-pms/pms-api/pom.xml @@ -5,7 +5,7 @@ mall-pms com.youlai - 2.2.0 + 3.0.0 4.0.0 @@ -29,11 +29,6 @@ spring-cloud-starter-openfeign - - - com.github.xiaoymin - knife4j-micro-spring-boot-starter - diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java index 2d2764af64a084630b492ffc8806bf9c7ea9802c..f465488722d92e8ecafc97b245b9b6e257f91ff3 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/api/SkuFeignClient.java @@ -1,9 +1,9 @@ package com.youlai.mall.pms.api; import com.youlai.common.result.Result; -import com.youlai.mall.pms.pojo.dto.CheckPriceDTO; -import com.youlai.mall.pms.pojo.dto.SkuDTO; -import com.youlai.mall.pms.pojo.dto.LockStockDTO; +import com.youlai.mall.pms.model.dto.CheckPriceDTO; +import com.youlai.mall.pms.model.dto.SkuDTO; +import com.youlai.mall.pms.model.dto.LockStockDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/CheckPriceDTO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java similarity index 93% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/CheckPriceDTO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java index 2a547d0896682f18fd6b0792156e8a7c09ddc7af..b2d7b5bec48ebd4bfd4d45c5cfe35c1543ffd239 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/CheckPriceDTO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/CheckPriceDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.dto; +package com.youlai.mall.pms.model.dto; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.List; * 订单商品验价传输对象 * * @author haoxr - * @date 2022/2/7 + * @since 2022/2/7 */ @Data @NoArgsConstructor diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/LockStockDTO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockStockDTO.java similarity index 91% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/LockStockDTO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockStockDTO.java index 92f8a78a8431288c261576418d8a8fdeb23bf608..18dfb02476f3eeb650c3b4ff3d6d4a9d1e9bb251 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/LockStockDTO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/LockStockDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.dto; +package com.youlai.mall.pms.model.dto; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.List; * 锁定库存传输对象 * * @author haoxr - * @date 2022/12/20 + * @since 2022/12/20 */ @Data @ToString diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SkuDTO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuDTO.java similarity index 89% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SkuDTO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuDTO.java index 026cbb4da9dd59de76f9ab4b67f48892ab73c5af..f2319666d4fe9fc73ad228da1075a7bf8e2a4319 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/dto/SkuDTO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/dto/SkuDTO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.dto; +package com.youlai.mall.pms.model.dto; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; * SKU信息传输对象 * * @author haoxr - * @date 2022/2/5 23:09 + * @since 2022/2/5 23:09 */ @Data diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/CategoryVO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java similarity index 90% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/CategoryVO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java index 378daf6601af12c88156b5c7f23ef0ee3210b269..15cd2f9f38a284fe8c7a3e5c96f8463bd3474947 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/CategoryVO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/CategoryVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.vo; +package com.youlai.mall.pms.model.vo; import lombok.Data; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/OrderItemVO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java similarity index 96% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/OrderItemVO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java index 5e4b425dcdafd6f23f5069c64249280de87542f9..4e5ded8a24d4767ef98fcfcaf157a1bbfefcd05d 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/OrderItemVO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/OrderItemVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.vo; +package com.youlai.mall.pms.model.vo; import com.youlai.common.base.BaseVO; import lombok.Builder; diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/ProductHistoryVO.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java similarity index 88% rename from mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/ProductHistoryVO.java rename to mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java index b23595aa313b0578fa0e25bb3f96d7d050d18ad3..9177573473e2528f30d018174878fe5590ad19a1 100644 --- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/vo/ProductHistoryVO.java +++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/model/vo/ProductHistoryVO.java @@ -1,4 +1,4 @@ -package com.youlai.mall.pms.pojo.vo; +package com.youlai.mall.pms.model.vo; import lombok.Data; diff --git a/mall-pms/pms-boot/pom.xml b/mall-pms/pms-boot/pom.xml index 694a4874947a1b783aea9454c8b0513a4698c732..b8f3b3e2dc96f313754077dac64ca7edc46ea5e0 100644 --- a/mall-pms/pms-boot/pom.xml +++ b/mall-pms/pms-boot/pom.xml @@ -5,7 +5,7 @@ mall-pms com.youlai - 2.2.0 + 3.0.0 4.0.0 diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/constant/ProductConstants.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/constant/ProductConstants.java index 39c5f0bd14c27b8b08627ccbb61c8b3f37cfc5b2..691105e48995a8be1a47127789113b61f83b4206 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/constant/ProductConstants.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/constant/ProductConstants.java @@ -4,7 +4,7 @@ package com.youlai.mall.pms.common.constant; * 商品模块常量 * * @author haoxr - * @date 2021/02/28 + * @since 2021/02/28 */ public interface ProductConstants { diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/enums/AttributeTypeEnum.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/enums/AttributeTypeEnum.java index 72c5c7a11eca03fc63092a3bdaab0e66718fc95f..f7b43100df24d24689e0371c8a6309561e15b629 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/enums/AttributeTypeEnum.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/enums/AttributeTypeEnum.java @@ -6,7 +6,7 @@ import lombok.Getter; * 商品属性类型枚举 * * @author haoxr - * @date 2022/12/20 + * @since 2022/12/20 */ public enum AttributeTypeEnum { diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java index 02a269e375c2ee627cc2b570cc34cf68cfb060e7..ef844a99445af95b5bcd50260fe93bf6c0798f31 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/common/util/BloomFilterUtils.java @@ -9,7 +9,7 @@ import static com.google.common.base.Preconditions.checkArgument; * 布隆过滤器,摘录自Google-guava包 * * @author DaniR - * @date 2021/6/23 20:30 + * @since 2021/6/23 20:30 */ public class BloomFilterUtils { private final int numHashFunctions; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfig.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..95cdfd1bcd8523aadce9a1d80aae532652dd0ca5 --- /dev/null +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfig.java @@ -0,0 +1,58 @@ +package com.youlai.mall.pms.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Swagger 配置 + *

+ * Spring Doc FAQ: https://springdoc.org/#faq + * + * @author haoxr + * @since 2023/2/17 + */ +@Configuration +public class SwaggerConfig { + + /** + * 接口信息 + */ + @Bean + public OpenAPI apiInfo() { + return new OpenAPI() + .components(new Components() + .addSecuritySchemes("Authorization", + new SecurityScheme().type(SecurityScheme.Type.HTTP) + .scheme("bearer").bearerFormat("JWT") + ) + ) + .info(new Info() + .title("商品服务") + .version("3.0.0") + .description("商品管理、库存、分类、品牌、规格、参数等接口") + .license(new License().name("Apache 2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0")) + ); + } + + /** + * 接口分组 + */ + @Bean + public GroupedOpenApi orderApi() { + String[] paths = {"/**"}; + String[] packagesToScan = {"com.youlai.mall.pms.controller"}; + return GroupedOpenApi.builder() + .group("商品服务") + .packagesToScan(packagesToScan) + .pathsToMatch(paths) + .build(); + } + +} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfiguration.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfiguration.java deleted file mode 100644 index 99a44b948c718b6da031869aa3e887331c1cb9eb..0000000000000000000000000000000000000000 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/config/SwaggerConfiguration.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.youlai.mall.pms.config; - -import com.google.common.collect.Lists; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.OAuthBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author haoxr - * @Date 2021-02-25 15:36 - * @Version 1.0.0 - */ -@Configuration -@EnableSwagger2WebMvc -@Import(BeanValidatorPluginsConfiguration.class) -public class SwaggerConfiguration { - - @Value("${knife4j.password_token_url}") - private String passwordTokenUrl; - - @Bean - public Docket restApi() { - //schema - List grantTypes=new ArrayList<>(); - //密码模式 - ResourceOwnerPasswordCredentialsGrant resourceOwnerPasswordCredentialsGrant=new ResourceOwnerPasswordCredentialsGrant(passwordTokenUrl); - grantTypes.add(resourceOwnerPasswordCredentialsGrant); - OAuth oAuth=new OAuthBuilder().name("oauth2") - .grantTypes(grantTypes).build(); - //context - //scope方位 - List scopes=new ArrayList<>(); - scopes.add(new AuthorizationScope("read","read resources")); - scopes.add(new AuthorizationScope("write","write resources")); - scopes.add(new AuthorizationScope("reads","read all resources")); - scopes.add(new AuthorizationScope("writes","write all resources")); - - SecurityReference securityReference=new SecurityReference("oauth2",scopes.toArray(new AuthorizationScope[]{})); - SecurityContext securityContext=new SecurityContext(Lists.newArrayList(securityReference),PathSelectors.ant("/**")); - //schemas - List securitySchemes=Lists.newArrayList(oAuth); - //securityContext - List securityContexts=Lists.newArrayList(securityContext); - return new Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) - .paths(PathSelectors.any()) - .build() - .securityContexts(securityContexts) - .securitySchemes(securitySchemes) - .apiInfo(apiInfo()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title("商品中心") - .description("

商品管理、库存、分类、品牌、规格、参数等接口
") - .termsOfServiceUrl("https://www.youlai.tech") - .contact(new Contact("有来开源组织", "https://gitee.com/youlaiorg", "youlaitech@163.com")) - .license("Apache-2.0") - .licenseUrl("https://www.apache.org/licenses/LICENSE-2.0") - .version("1.0.0") - .build(); - } - -} diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsAttributeController.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsAttributeController.java index 5e8d02eb07e2ba5fdd1d5c60d82c2e41a03a6281..8cba35994c112fc4c72eb6c33f7a11ba0af0d7d6 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsAttributeController.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsAttributeController.java @@ -2,10 +2,12 @@ package com.youlai.mall.pms.controller.admin; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.youlai.common.result.Result; -import com.youlai.mall.pms.pojo.form.PmsCategoryAttributeForm; -import com.youlai.mall.pms.pojo.entity.PmsCategoryAttribute; +import com.youlai.mall.pms.model.form.PmsCategoryAttributeForm; +import com.youlai.mall.pms.model.entity.PmsCategoryAttribute; import com.youlai.mall.pms.service.AttributeService; -import io.swagger.annotations.*; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -15,10 +17,10 @@ import java.util.List; /** * 「管理端」商品属性控制器 * - * @author haoxr - * @date 2022/1/1 + * @author haoxr + * @since 2022/1/1 */ -@Api(tags = "「管理端」商品属性") +@Tag(name = "「管理端」商品属性") @RestController @RequestMapping("/api/v1/attributes") @Slf4j @@ -27,11 +29,11 @@ public class PmsAttributeController { private AttributeService attributeService; - @ApiOperation(value = "属性列表") + @Operation(summary= "属性列表") @GetMapping public Result listAttributes( - @ApiParam("商品分类ID") Long categoryId, - @ApiParam("类型(1:规格;2:属性)") Integer type + @Parameter(name = "商品分类ID") Long categoryId, + @Parameter(name = "类型(1:规格;2:属性)") Integer type ) { List list = attributeService.list(new LambdaQueryWrapper() .eq(categoryId != null, PmsCategoryAttribute::getCategoryId, categoryId) @@ -40,7 +42,7 @@ public class PmsAttributeController { return Result.success(list); } - @ApiOperation(value = "批量新增/修改") + @Operation(summary= "批量新增/修改") @PostMapping("/batch") public Result saveBatch(@RequestBody PmsCategoryAttributeForm pmsCategoryAttributeForm) { boolean result = attributeService.saveBatch(pmsCategoryAttributeForm); diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsBrandController.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsBrandController.java index b2f4b6a7c53c4f6eabede6e8bab0089e56c5eac7..3414196850e183d48e0ca598e81ac9969a0f6f26 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsBrandController.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsBrandController.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.common.result.PageResult; import com.youlai.common.result.Result; -import com.youlai.mall.pms.pojo.entity.PmsBrand; -import com.youlai.mall.pms.pojo.query.BrandPageQuery; +import com.youlai.mall.pms.model.entity.PmsBrand; +import com.youlai.mall.pms.model.query.BrandPageQuery; import com.youlai.mall.pms.service.BrandService; -import io.swagger.annotations.*; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -19,9 +21,9 @@ import java.util.List; * 品牌管理控制器 * * @author haoxr - * @date 2022/7/2 + * @since 2022/7/2 */ -@Api(tags = "「管理端」品牌接口") +@Tag(name = "「管理端」品牌接口") @RestController @RequestMapping("/api/v1/brands") @RequiredArgsConstructor @@ -29,7 +31,7 @@ public class PmsBrandController { private final BrandService brandService; - @ApiOperation(value = "品牌分页列表") + @Operation(summary= "品牌分页列表") @GetMapping("/pages") public PageResult listBrandPages(BrandPageQuery queryParams ) { @@ -45,7 +47,7 @@ public class PmsBrandController { return PageResult.success(result); } - @ApiOperation(value = "品牌列表") + @Operation(summary= "品牌列表") @GetMapping public Result getBrandList() { List list = brandService.list(new LambdaQueryWrapper() @@ -53,7 +55,7 @@ public class PmsBrandController { return Result.success(list); } - @ApiOperation(value = "品牌详情") + @Operation(summary= "品牌详情") @ApiImplicitParam(name = "id", value = "品牌id", required = true, paramType = "path", dataType = "Long") @GetMapping("/{id}") public Result getBrandList(@PathVariable Integer id) { @@ -61,14 +63,14 @@ public class PmsBrandController { return Result.success(brand); } - @ApiOperation(value = "新增品牌") + @Operation(summary= "新增品牌") @PostMapping public Result addBrand(@RequestBody PmsBrand brand) { boolean status = brandService.save(brand); return Result.judge(status); } - @ApiOperation(value = "修改品牌") + @Operation(summary= "修改品牌") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "品牌id", required = true, paramType = "path", dataType = "Long"), @ApiImplicitParam(name = "brand", value = "实体JSON对象", required = true, paramType = "body", dataType = "PmsBrand") @@ -81,9 +83,9 @@ public class PmsBrandController { return Result.judge(status); } - @ApiOperation(value = "删除品牌") + @Operation(summary= "删除品牌") @DeleteMapping("/{ids}") - public Result deleteBrands(@ApiParam("品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids) { + public Result deleteBrands(@Parameter(name = "品牌ID,多个以英文逗号(,)分割") @PathVariable("ids") String ids) { boolean status = brandService.removeByIds(Arrays.asList(ids.split(","))); return Result.judge(status); } diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsCategoryController.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsCategoryController.java index 560cee51661bf88099e9348bacdd84e78f917316..80f28b7fbf60a7de41300f20749371049d9b3789 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsCategoryController.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsCategoryController.java @@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.youlai.common.result.Result; import com.youlai.common.web.model.Option; -import com.youlai.mall.pms.pojo.entity.PmsCategoryAttribute; -import com.youlai.mall.pms.pojo.entity.PmsCategory; -import com.youlai.mall.pms.pojo.vo.CategoryVO; +import com.youlai.mall.pms.model.entity.PmsCategoryAttribute; +import com.youlai.mall.pms.model.entity.PmsCategory; +import com.youlai.mall.pms.model.vo.CategoryVO; import com.youlai.mall.pms.service.AttributeService; import com.youlai.mall.pms.service.CategoryService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; @@ -22,12 +21,12 @@ import java.util.Arrays; import java.util.List; /** - * * 「管理端」商品分类控制器 + * 「管理端」商品分类控制器 * - * @author haoxr - * @date 2022/01/01 + * @author haoxr + * @since 2022/01/01 */ -@Api(tags = "「管理端」商品分类") +@Tag(name = "「管理端」商品分类") @RestController @RequestMapping("/api/v1/categories") @RequiredArgsConstructor @@ -36,40 +35,40 @@ public class PmsCategoryController { private final CategoryService categoryService; private final AttributeService attributeService; - @ApiOperation(value = "商品分类列表") + @Operation(summary = "商品分类列表") @GetMapping public Result> list() { List list = categoryService.listCategory(null); return Result.success(list); } - @ApiOperation(value = "商品分类级联列表") + @Operation(summary = "商品分类级联列表") @GetMapping("/options") public Result listCategoryOptions() { List