From bc26fc10e74db85f90b932783e9e131e70977673 Mon Sep 17 00:00:00 2001 From: Derran Date: Tue, 18 Mar 2025 15:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/aggregate/odc/entity/OrderDiscountConfig.java | 5 +++++ .../user/OrderDiscountConfigUserCommandController.java | 8 ++++++-- .../odc/user/response/UserPageOrderDiscountConfigVo.java | 7 +++++++ .../odc/OrderDiscountConfigApplicationService.java | 6 ++++++ .../resources/mapper/odc/OrderDiscountConfigMapper.xml | 2 ++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/odc/entity/OrderDiscountConfig.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/odc/entity/OrderDiscountConfig.java index c0c5382..115920c 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/odc/entity/OrderDiscountConfig.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/odc/entity/OrderDiscountConfig.java @@ -18,6 +18,11 @@ import java.math.BigDecimal; @TableName("da_order_discount_config") public class OrderDiscountConfig extends Entity { + @ApiModelProperty("创建人用户标识") + private Long creatorUserId; + + @ApiModelProperty("创建人名称") + private String creatorName; @ApiModelProperty("手机号码") private String phone; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/odc/user/OrderDiscountConfigUserCommandController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/odc/user/OrderDiscountConfigUserCommandController.java index 1a87369..50a6f73 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/odc/user/OrderDiscountConfigUserCommandController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/odc/user/OrderDiscountConfigUserCommandController.java @@ -2,6 +2,7 @@ package com.qniao.dam.api.command.odc.user; import com.qniao.dam.api.command.odc.user.request.*; import com.qniao.dam.application.service.odc.OrderDiscountConfigApplicationService; +import com.qniao.dam.domain.aggregate.odc.entity.OrderDiscountConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -19,8 +20,11 @@ public class OrderDiscountConfigUserCommandController { @ApiOperation("用户创建订单优惠配置") @PostMapping("create/order-discount-config") - public void userCreateOrderDiscountConfig(@RequestBody @Valid UserCreateOrderDiscountConfigDto dto) { - orderDiscountConfigApplicationService.create(dto.trans2Domain()); + public void userCreateOrderDiscountConfig(@RequestBody @Valid UserCreateOrderDiscountConfigDto dto, + @RequestParam("userId") Long userId) { + OrderDiscountConfig orderDiscountConfig = dto.trans2Domain(); + orderDiscountConfig.setCreatorUserId(userId); + orderDiscountConfigApplicationService.create(orderDiscountConfig); } @ApiOperation("用户编辑订单优惠配置") diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/odc/user/response/UserPageOrderDiscountConfigVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/odc/user/response/UserPageOrderDiscountConfigVo.java index 5f30b5d..2d1e302 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/odc/user/response/UserPageOrderDiscountConfigVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/odc/user/response/UserPageOrderDiscountConfigVo.java @@ -17,6 +17,13 @@ public class UserPageOrderDiscountConfigVo { @JsonSerialize(using = ToStringSerializer.class) private Long id; + @ApiModelProperty("创建人用户标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long creatorUserId; + + @ApiModelProperty("创建人名称") + private String creatorName; + @ApiModelProperty("手机号码") private String phone; diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/odc/OrderDiscountConfigApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/odc/OrderDiscountConfigApplicationService.java index 0539e0c..6e8e4e6 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/odc/OrderDiscountConfigApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/odc/OrderDiscountConfigApplicationService.java @@ -3,7 +3,9 @@ package com.qniao.dam.application.service.odc; import com.qniao.dam.domain.aggregate.odc.OrderDiscountConfigAggregate; import com.qniao.dam.domain.aggregate.odc.entity.OrderDiscountConfig; import com.qniao.dam.domain.aggregate.odc.repository.OrderDiscountConfigRepository; +import com.qniao.dam.infrastructure.persistent.dao.domain.UserDao; import com.qniao.dam.infrastructure.persistent.dao.odc.OrderDiscountConfigDao; +import com.qniao.dau.domain.aggregate.user.entity.User; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,8 +18,12 @@ public class OrderDiscountConfigApplicationService { private OrderDiscountConfigAggregate orderDiscountConfigAggregate; @Resource private OrderDiscountConfigRepository orderDiscountConfigRepository; + @Resource + private UserDao userDao; public void create(OrderDiscountConfig orderDiscountConfig) { + User creator = userDao.selectById(orderDiscountConfig.getCreatorUserId()); + orderDiscountConfig.setCreatorName(creator.getRealName()); orderDiscountConfigAggregate.create(orderDiscountConfig); } diff --git a/dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml index 97c7d78..d9f4d7f 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/odc/OrderDiscountConfigMapper.xml @@ -5,6 +5,8 @@