花城E+防疫修改

101captain

2022-04-19 00a59b93c16b24e7be77c6f1ce4866c75a2e0431

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;

import java.time.Instant;
import java.util.List;

import javax.annotation.Resource;
@@ -388,7 +389,7 @@
    }

    /**
     * 分页查询便民服务商家
     * 分页查询便民服务商家 运营后台
     * @param pageConvenientMerchantDTO
     * @return
     */
@@ -432,8 +433,8 @@
     * @return
     */
    @GetMapping("/service-category/all")
    public R getAllServiceCategories() {
        return convenientServiceCategoryService.getAllServiceCategories();
    public R getAllServiceCategories(@RequestParam("areaCode") String areaCode) {
        return convenientServiceCategoryService.getAllServiceCategories(areaCode);
    }

    /**
@@ -570,10 +571,11 @@
    /**
     * 获取所有产品分类
     * @return
     * @param merchantId
     */
    @GetMapping("/product-category/all")
    public R getAllProductCategory() {
        return convenientProductCategoryService.getAllProductCategory();
    public R getAllProductCategory(@RequestParam("merchantId") Long merchantId) {
        return convenientProductCategoryService.getAllProductCategory(merchantId);
    }

    /**
@@ -582,8 +584,8 @@
     * @return
     */
    @GetMapping("/service-category/suitable")
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId);
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId,areaCode);
    }

    /**