From 53d155c2374ad264732232776eb6cb37066f2735 Mon Sep 17 00:00:00 2001 From: Derran Date: Sun, 5 May 2024 14:55:15 +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 --- ...riageBountyOrderUserCommandController.java | 27 +++++++++++++++++++ .../request/RefundMarriageBountyOrderDto.java | 2 +- .../user/OrderUserCommandController.java | 13 --------- .../order/user/OrderUserQueryController.java | 2 -- 4 files changed, 28 insertions(+), 16 deletions(-) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/MarriageBountyOrderUserCommandController.java rename dating-agency-mall-server/src/main/java/com/qniao/dam/api/{query/order => command/marriagebounty}/user/request/RefundMarriageBountyOrderDto.java (82%) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/MarriageBountyOrderUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/MarriageBountyOrderUserCommandController.java new file mode 100644 index 0000000..ecc1053 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/MarriageBountyOrderUserCommandController.java @@ -0,0 +1,27 @@ +package com.qniao.dam.api.command.marriagebounty.user; + +import com.qniao.dam.api.command.marriagebounty.user.request.RefundMarriageBountyOrderDto; +import com.qniao.dam.application.service.marriagebounty.MarriageBountyOrderApplicationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("user") +@Api(tags = "悬赏招亲订单") +public class MarriageBountyOrderUserCommandController { + + @Resource + private MarriageBountyOrderApplicationService marriageBountyOrderApplicationService; + + @ApiOperation("用户发起悬赏招亲退款") + @PostMapping("/refund/marriage-bounty-order") + public void refundMarriageBountyOrder(@RequestBody @Validated RefundMarriageBountyOrderDto dto, + @RequestParam Long userId) { + marriageBountyOrderApplicationService.refund(userId, dto.getMiId()); + } + +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/RefundMarriageBountyOrderDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/request/RefundMarriageBountyOrderDto.java similarity index 82% rename from dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/RefundMarriageBountyOrderDto.java rename to dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/request/RefundMarriageBountyOrderDto.java index edb1bc1..7dda30b 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/RefundMarriageBountyOrderDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/marriagebounty/user/request/RefundMarriageBountyOrderDto.java @@ -1,4 +1,4 @@ -package com.qniao.dam.api.query.order.user.request; +package com.qniao.dam.api.command.marriagebounty.user.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java index 127dec9..55366e8 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java @@ -4,15 +4,11 @@ import com.qniao.dam.api.command.order.user.request.UserBatchSubmitOrderDto; import com.qniao.dam.api.command.order.user.request.UserSubmitMarriageBountyOrderDto; import com.qniao.dam.api.command.order.user.request.UserSubmitOrderDto; import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo; -import com.qniao.dam.api.query.order.user.request.RefundMarriageBountyOrderDto; -import com.qniao.dam.application.service.marriagebounty.MarriageBountyOrderApplicationService; import com.qniao.dam.application.service.order.OrderApplicationService; -import com.qniao.dam.domain.aggregate.marriagebounty.entity.MarriageBountyOrder; import com.qniao.dam.domain.aggregate.order.entity.Order; import com.qniao.dam.domain.aggregate.product.entity.Product; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,8 +22,6 @@ public class OrderUserCommandController { @Resource private OrderApplicationService orderApplicationService; - @Resource - private MarriageBountyOrderApplicationService marriageBountyOrderApplicationService; @ApiOperation("用户提交订单") @PostMapping("submit/order") @@ -57,11 +51,4 @@ public class OrderUserCommandController { productList.forEach(product -> product.setUserId(userId)); return orderApplicationService.submitMarriageBountyOrder(order, productList); } - - @ApiOperation("用户发起悬赏招亲退款") - @PostMapping("/refund/marriage-bounty-order") - public void refundMarriageBountyOrder(@RequestBody @Validated RefundMarriageBountyOrderDto dto, - @RequestParam Long userId) { - marriageBountyOrderApplicationService.refund(userId, dto.getMiId()); - } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java index 486ab58..e6723d4 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java @@ -1,6 +1,5 @@ package com.qniao.dam.api.query.order.user; -import com.qniao.dam.api.query.order.user.request.RefundMarriageBountyOrderDto; import com.qniao.dam.api.query.order.user.request.UserPageOrderByOperatorQueryParam; import com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo; import com.qniao.dam.api.query.order.user.response.UserOrderRecordVo; @@ -12,7 +11,6 @@ import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource;