Browse Source

基础配置

master
张彭杰 1 year ago
parent
commit
33b0de89bd
4 changed files with 17 additions and 2 deletions
  1. 6
      dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/product/entity/Product.java
  2. 6
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java
  3. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMarriageBountyOrderDto.java
  4. 5
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/ProductUserCommandController.java

6
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<Product> {
@ApiModelProperty("用户标识")
private Long userId;
@ApiModelProperty("征婚资料标识")
private Long miId;
@ApiModelProperty("产品类型(实物、虚拟物品)")
private ProductTypeEnum productType;

6
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<Product> productList = dto.trans2Product();
productList.forEach(product -> product.setUserId(userId));
return orderApplicationService.submitMarriageBountyOrder(order, productList);
}
}

2
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<O
List<Product> 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<O
list.add(meetingFeeProduct);
//结果礼金
Product resultGiftProduct = new Product();
resultGiftProduct.setMiId(miId);
resultGiftProduct.setProductType(ProductTypeEnum.CUSTOMER_VIRTUAL);
resultGiftProduct.setMainCategory(ProductMainCategoryEnum.MARRIAGE_BOUNTY);
resultGiftProduct.setSubCategory(ProductSubCategoryEnum.MARRIAGE_BOUNTY_RESULT_GIFT);

5
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/product/user/ProductUserCommandController.java

@ -4,6 +4,7 @@ import com.qniao.dam.api.command.product.user.request.UserCreateProductDto;
import com.qniao.dam.api.command.product.user.request.UserEditProductDto;
import com.qniao.dam.api.command.product.user.request.UserOperateProductDto;
import com.qniao.dam.application.service.product.ProductApplicationService;
import com.qniao.dam.domain.aggregate.product.entity.Product;
import com.qniao.dau.infrastructure.constant.RequestHeaderFields;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -25,7 +26,9 @@ public class ProductUserCommandController {
public String userCreateProduct(@RequestBody @Valid UserCreateProductDto dto,
@RequestParam("userId") Long userId,
@RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) {
return productApplicationService.create(dto.trans2Domain(), dto.trans2ProductSpec()).toString();
Product product = dto.trans2Domain();
product.setUserId(userId);
return productApplicationService.create(product, dto.trans2ProductSpec()).toString();
}
@ApiOperation("用户编辑商品")

Loading…
Cancel
Save