diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java index cda680b..5d07e7e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java @@ -2,6 +2,7 @@ package com.qniao.dam.api.query.product.user; import com.qniao.dam.api.query.product.user.request.UserPageProductByOperatorQueryParam; import com.qniao.dam.api.query.product.user.response.UserGetProductDetailByOperatorVo; +import com.qniao.dam.api.query.product.user.response.UserPageProductByCustomerVo; import com.qniao.dam.api.query.product.user.response.UserPageProductByOperatorVo; import com.qniao.dam.query.product.ProductQueryService; import com.qniao.dau.infrastructure.constant.RequestHeaderFields; @@ -31,13 +32,20 @@ public class ProductUserQueryController { return PageUtil.convert(productQueryService.pageProductByOperator(pageUtil, queryParam), UserPageProductByOperatorVo.class); } - @GetMapping("get/product-detail/by/operator/{id}") + @GetMapping("get/product-detail/by/operator/{productId}") @ApiOperation("运营获取商品详情") - public UserGetProductDetailByOperatorVo userGetProductDetailByOperator(@ApiParam("商品标识") @PathVariable Long id, + public UserGetProductDetailByOperatorVo userGetProductDetailByOperator(@ApiParam("商品标识") @PathVariable Long productId, @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) { - return productQueryService.getProductDetailByOperator(id); + return productQueryService.getProductDetailByOperator(productId); } - + @GetMapping("page/product/by/Customer") + @ApiOperation("客户获取商品分页列表") + public QnPage userPageProductByCustomer(PageUtil pageUtil, + UserPageProductByOperatorQueryParam queryParam, + @RequestParam("userId") Long userId) { + return null; + // return PageUtil.convert(productQueryService.pageProductByCustomer(pageUtil, queryParam), UserPageProductByOperatorVo.class); + } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByCustomerVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByCustomerVo.java new file mode 100644 index 0000000..768f58c --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserPageProductByCustomerVo.java @@ -0,0 +1,57 @@ +package com.qniao.dam.api.query.product.user.response; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.qniao.dam.domian.aggregate.product.constant.ProductMainCategoryEnum; +import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; +import com.qniao.dam.domian.aggregate.productspec.constant.ProductSpecTermUnitEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class UserPageProductByCustomerVo { + + @ApiModelProperty("商品标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long productId; + + @ApiModelProperty("商品规格标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long productSpecId; + + @ApiModelProperty("产品主分类") + private ProductMainCategoryEnum mainCategory; + + @ApiModelProperty("产品次分类") + private ProductSubCategoryEnum subCategory; + + @ApiModelProperty("产品标题") + private String productTitle; + + @ApiModelProperty("产品描述") + private String productDesc; + + @ApiModelProperty("详情描述") + private String detailDesc; + + @ApiModelProperty("原价") + private BigDecimal unitOriginalPrice; + + @ApiModelProperty("售价") + private BigDecimal unitSellingPrice; + + @ApiModelProperty("产品规格(周期、次数)") + private ProductSpecTermUnitEnum productSpecUnit; + + @ApiModelProperty("有效期") + private String validityPeriodValue; + + @ApiModelProperty("购买次数") + private String purchaseTimeValue; + + @ApiModelProperty("单日使用上限") + private String dailyUseLimitValue; + +}