diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java index f681f1b..602c897 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java @@ -18,6 +18,12 @@ import java.util.List; @TableName("da_product") public class Product extends Entity { + @ApiModelProperty("用户标识") + private Long userId; + + @ApiModelProperty("征婚资料标识") + private Long miId; + @ApiModelProperty("产品类型(实物、虚拟物品)") private ProductTypeEnum productType; 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 872155b..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 @@ -6,12 +6,14 @@ import com.qniao.dam.api.command.order.user.request.UserSubmitOrderDto; import com.qniao.dam.api.command.order.user.response.UserSubmitOrderVo; import com.qniao.dam.application.service.order.OrderApplicationService; 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.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; @RestController @RequestMapping("user") @@ -45,6 +47,8 @@ public class OrderUserCommandController { @RequestParam("userId") Long userId) { Order order = dto.trans2Domain(); order.setUserId(userId); - return orderApplicationService.submitMarriageBountyOrder(order, dto.trans2Product()); + List productList = dto.trans2Product(); + productList.forEach(product -> product.setUserId(userId)); + return orderApplicationService.submitMarriageBountyOrder(order, productList); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java index 8c1cffa..16c938c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java @@ -46,6 +46,7 @@ public class UserSubmitMarriageBountyOrderDto implements Trans2DomainAssembler list = new ArrayList<>(); //见面费用 Product meetingFeeProduct = new Product(); + meetingFeeProduct.setMiId(miId); meetingFeeProduct.setProductType(ProductTypeEnum.CUSTOMER_VIRTUAL); meetingFeeProduct.setMainCategory(ProductMainCategoryEnum.MARRIAGE_BOUNTY); meetingFeeProduct.setSubCategory(ProductSubCategoryEnum.MARRIAGE_BOUNTY_MEETING_FEE); @@ -59,6 +60,7 @@ public class UserSubmitMarriageBountyOrderDto implements Trans2DomainAssembler