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 3a925ac..1aa1039 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 @@ -69,7 +69,7 @@ public class ProductUserQueryController { public QnPage userPageProductByMatchMaker(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam, @RequestParam("userId") Long userId) { - return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil,queryParam), UserPageProductByMatchmakerVo.class); + return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil, queryParam), UserPageProductByMatchmakerVo.class); } @GetMapping("get/product/by/customer/list") @@ -81,6 +81,6 @@ public class ProductUserQueryController { @GetMapping("get/matchmaker-franchise-info") @ApiOperation("用户给获取红娘加盟信息") public UserGetMatchmakerFranchiseInfoVo userGetMatchmakerFranchiseInfo() { - return null; + return productQueryService.getMatchmakerFranchiseInfo(); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetMatchmakerFranchiseInfoVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetMatchmakerFranchiseInfoVo.java index f84e1ee..431ad08 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetMatchmakerFranchiseInfoVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetMatchmakerFranchiseInfoVo.java @@ -1,8 +1,17 @@ package com.qniao.dam.api.query.product.user.response; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; -@Data +import java.math.BigDecimal; +@Data public class UserGetMatchmakerFranchiseInfoVo { + + @ApiModelProperty("售价") + private BigDecimal unitSellingPrice; + + @ApiModelProperty("服务") + private String servicePhone; + } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java index 22652f5..b8ad781 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java @@ -32,4 +32,5 @@ public interface ProductQueryService { List listProductSpecBy(Long productId); + UserGetMatchmakerFranchiseInfoVo getMatchmakerFranchiseInfo(); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java index 17c97a9..049479d 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java @@ -11,6 +11,7 @@ import com.qniao.dam.domain.aggregate.product.entity.Product; import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec; import com.qniao.dam.domain.aggregate.productspec.valueobj.ProductSpecTerm; import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; +import com.qniao.dam.domian.aggregate.product.constant.ProductTypeEnum; import com.qniao.dam.domian.aggregate.productspec.constant.ProductSpecTermNameEnum; import com.qniao.dam.domian.aggregate.productspec.constant.ProductSpecTermUnitEnum; import com.qniao.dam.infrastructure.persistent.dao.domain.ProductDao; @@ -20,6 +21,8 @@ import com.qniao.dam.infrastructure.persistent.dao.view.ProductViewDao; import com.qniao.dam.query.product.ProductQueryService; import com.qniao.framework.utils.PageUtil; import com.qniao.framework.utils.TypeConvertUtils; +import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -41,6 +44,8 @@ public class ProductQueryServiceImpl implements ProductQueryService { private ProductSpecDao productSpecDao; @Resource private ProductSpecTermDao productSpecTermDao; + @Value("${service-phone}") + private String servicePhone; @Override public IPage pageProductByOperator(PageUtil pageUtil, @@ -103,6 +108,24 @@ public class ProductQueryServiceImpl implements ProductQueryService { } return productSpecList; } + + @Override + public UserGetMatchmakerFranchiseInfoVo getMatchmakerFranchiseInfo() { + UserGetMatchmakerFranchiseInfoVo infoVo = new UserGetMatchmakerFranchiseInfoVo(); + infoVo.setServicePhone(servicePhone); + Product product = productDao.selectOne(new LambdaQueryWrapper() + .eq(Product::getProductType, ProductTypeEnum.MATCHMAKER_VIRTUAL) + .eq(Product::getStatus, true) + .last("limit 1")); + if (Objects.nonNull(product)) { + List productSpecList = listProductSpecBy(product.getId()); + if (CollUtil.isNotEmpty(productSpecList)) { + infoVo.setUnitSellingPrice(productSpecList.get(0).getUnitSellingPrice()); + } + } + return infoVo; + } + @Override public ProductSpecTerm getTermByName(List productSpecTermList, ProductSpecTermNameEnum name) { ProductSpecTerm productSpecTerm = null;