花城E+防疫修改

101captain

2022-04-19 00a59b93c16b24e7be77c6f1ce4866c75a2e0431

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

@@ -365,7 +365,6 @@
     */
    @PostMapping("/merchant/add")
    public R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
        log.error("catTimeStamp进入service_community" + convenientMerchantDTO.getAccount() + Instant.now().toEpochMilli());
        return convenientMerchantService.addMerchant(convenientMerchantDTO);
    }

@@ -434,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);
    }

    /**
@@ -585,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);
    }

    /**