From d551f9a4c55be237b045def93757ea4b9abbceca Mon Sep 17 00:00:00 2001 From: Derran Date: Wed, 20 Mar 2024 15:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dating-agency-mal-sdk/pom.xml | 15 ++++++++++ .../MallServerApplicationService.java | 28 +++++++++++++++++++ .../UserCheckEnableRightBySdkQueryParam.java | 23 +++++++++++++++ .../request/UserConsumeRightBySdkDto.java | 28 +++++++++++++++++++ .../response/UserCheckEnableRightBySdkVo.java | 11 ++++++++ .../response/UserConsumeRightBySdkVo.java | 10 +++++++ .../right/user/RightUserQueryController.java | 4 +-- .../UserCheckEnableRightBySdkQueryParam.java | 3 +- .../right/impl/RightQueryServiceImpl.java | 2 +- 9 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/MallServerApplicationService.java create mode 100644 dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserCheckEnableRightBySdkQueryParam.java create mode 100644 dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserConsumeRightBySdkDto.java create mode 100644 dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserCheckEnableRightBySdkVo.java create mode 100644 dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserConsumeRightBySdkVo.java diff --git a/dating-agency-mal-sdk/pom.xml b/dating-agency-mal-sdk/pom.xml index 93718c0..83e4af6 100644 --- a/dating-agency-mal-sdk/pom.xml +++ b/dating-agency-mal-sdk/pom.xml @@ -17,4 +17,19 @@ UTF-8 + + + com.qniao + spring-boot-starter + + + com.qniao + spring-cloud-starter + + + com.qniao + dating-agency-mall-constant + compile + + \ No newline at end of file diff --git a/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/MallServerApplicationService.java b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/MallServerApplicationService.java new file mode 100644 index 0000000..af29af6 --- /dev/null +++ b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/MallServerApplicationService.java @@ -0,0 +1,28 @@ +package com.qniao.dam.application; + +import com.qniao.dam.application.request.UserCheckEnableRightBySdkQueryParam; +import com.qniao.dam.application.request.UserConsumeRightBySdkDto; +import com.qniao.dam.application.response.UserCheckEnableRightBySdkVo; +import com.qniao.dam.application.response.UserConsumeRightBySdkVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +@FeignClient("eureka-client-dating-agency-mall") +@RequestMapping("dating-agency-mall") +public interface MallServerApplicationService { + + /** + * 客户检查可用权益 + * + * @param queryParam + * @return + */ + @PostMapping("/user/check/enable-right/by/sdk") + UserCheckEnableRightBySdkVo userCheckEnableRightBySdk(@RequestBody UserCheckEnableRightBySdkQueryParam queryParam); + + @PostMapping("/user/consume/right/by/sdk") + UserConsumeRightBySdkVo userConsumeRightBySdk(@RequestBody UserConsumeRightBySdkDto dto); + +} diff --git a/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserCheckEnableRightBySdkQueryParam.java b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserCheckEnableRightBySdkQueryParam.java new file mode 100644 index 0000000..f3b7a1a --- /dev/null +++ b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserCheckEnableRightBySdkQueryParam.java @@ -0,0 +1,23 @@ +package com.qniao.dam.application.request; + +import com.qniao.dam.domian.aggregate.right.constant.RightTypeEnum; +import lombok.Data; + +@Data +public class UserCheckEnableRightBySdkQueryParam { + + /** + * 用户标识 + */ + private Long userId; + + /** + * 征婚资料标识 + */ + private Long miId; + + /** + * 权益类型 + */ + private RightTypeEnum type; +} diff --git a/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserConsumeRightBySdkDto.java b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserConsumeRightBySdkDto.java new file mode 100644 index 0000000..6d3aa71 --- /dev/null +++ b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/request/UserConsumeRightBySdkDto.java @@ -0,0 +1,28 @@ +package com.qniao.dam.application.request; + +import com.qniao.dam.domian.aggregate.right.constant.RightTypeEnum; +import lombok.Data; + +@Data +public class UserConsumeRightBySdkDto { + + /** + * 用户标识 + */ + private Long userId; + + /** + * 征婚资料标识 + */ + private Long miId; + + /** + * 权益类型 + */ + private RightTypeEnum type; + + /** + * 关联标识 目前针对审核要求必填，传入审核数据ID,用于审核驳回权益退回 + */ + private Long associatedId; +} diff --git a/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserCheckEnableRightBySdkVo.java b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserCheckEnableRightBySdkVo.java new file mode 100644 index 0000000..b7f9ab6 --- /dev/null +++ b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserCheckEnableRightBySdkVo.java @@ -0,0 +1,11 @@ +package com.qniao.dam.application.response; + +import lombok.Data; + +@Data +public class UserCheckEnableRightBySdkVo { + + private Boolean flag = false; + + private String failReason; +} diff --git a/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserConsumeRightBySdkVo.java b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserConsumeRightBySdkVo.java new file mode 100644 index 0000000..b6d7877 --- /dev/null +++ b/dating-agency-mal-sdk/src/main/java/com/qniao/dam/application/response/UserConsumeRightBySdkVo.java @@ -0,0 +1,10 @@ +package com.qniao.dam.application.response; + +import lombok.Data; + +@Data +public class UserConsumeRightBySdkVo { + private Boolean flag = false; + + private String failReason; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/RightUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/RightUserQueryController.java index 5d066ff..600337c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/RightUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/RightUserQueryController.java @@ -30,10 +30,10 @@ public class RightUserQueryController { return rightQueryService.listRightByCustomer(queryParam); } - @GetMapping("check/enable-right/by/sdk") + @PostMapping("check/enable-right/by/sdk") @ApiOperation("客户检查可用权益") @IgnoreResponseAdvice - public UserCheckEnableRightBySdkVo userCheckEnableRightBySdk(@Validated UserCheckEnableRightBySdkQueryParam queryParam) { + public UserCheckEnableRightBySdkVo userCheckEnableRightBySdk(@RequestBody @Validated UserCheckEnableRightBySdkQueryParam queryParam) { return rightQueryService.checkEnableRight(queryParam); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/request/UserCheckEnableRightBySdkQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/request/UserCheckEnableRightBySdkQueryParam.java index da6f680..a456308 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/request/UserCheckEnableRightBySdkQueryParam.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/right/user/request/UserCheckEnableRightBySdkQueryParam.java @@ -1,5 +1,6 @@ package com.qniao.dam.api.query.right.user.request; +import com.qniao.dam.domian.aggregate.right.constant.RightTypeEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,6 +19,6 @@ public class UserCheckEnableRightBySdkQueryParam { @ApiModelProperty("权益类型") @NotNull(message = "权益类型不能为空") - private Integer type; + private RightTypeEnum type; } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java index 2869f66..cde3b0d 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/right/impl/RightQueryServiceImpl.java @@ -122,7 +122,7 @@ public class RightQueryServiceImpl implements RightQueryService { UserCheckEnableRightBySdkVo vo = new UserCheckEnableRightBySdkVo(); String failReason = null; try { - List rightList = listEnableRightBy(queryParam.getUserId(), queryParam.getMiId(), RightTypeEnum.get(queryParam.getType())); + List rightList = listEnableRightBy(queryParam.getUserId(), queryParam.getMiId(), queryParam.getType()); if (CollUtil.isNotEmpty(rightList)) { //1.判断今日使用权益次数 if (!checkRightUseLimit(rightList.get(0))) {