Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

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

@@ -369,6 +369,17 @@
    }

    /**
     * 获取便民服务商家详情
     *
     * @param userId
     * @return
     */
    @GetMapping("/merchant/getMerchantByUserId")
    public R getMerchantByUserId(@RequestParam("userId") Long userId) {
        return convenientMerchantService.getMerchantByUserId(userId);
    }

    /**
     * 禁用/启用便民服务商家
     *
     * @param disableOrEnableConvenientMerchantDTO
@@ -409,6 +420,17 @@
    @GetMapping("/getUserMerchantInfoByAccount")
    public R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account) {
        return convenientMerchantService.getUserMerchantInfoByAccount(account);
    }

    /**
     * 获取用户便民服务商家详情
     *
     * @param account 商家绑定账号
     * @return
     */
    @GetMapping("/getMerchantInfoByAccount")
    public R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account) {
        return convenientMerchantService.getMerchantInfoByAccount(account);
    }

    /**
@@ -840,4 +862,16 @@
    public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
        return convenientElevatingPointService.findPointByMerchantId(merchantId, lat, lng);
    }


    /**
     * 获取商家周围 n(km)的自提点数量
     *
     * @param distance
     * @return
     */
    @GetMapping("/point/findPointNumByDistance")
    public R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
        return convenientElevatingPointService.findPointNumByDistance(distance, lat, lng);
    }
}