Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 e6430287b40bbe8e8c6821219b96896b57f6b6d8

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -246,10 +246,13 @@
     * @return
     */
    @ApiOperation(value = "获取商家周围 n(km)的自提点数量")
    @ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true),
    @ApiImplicitParams({@ApiImplicitParam(name = "distance", value = "距离", required = false),
            @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)})
    @GetMapping("/point/findPointNumByDistance")
    public R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
    public R findPointNumByDistance(@RequestParam(value = "distance",required = false) Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) {
        if (null == distance){
            return R.ok(0);
        }
        return communityService.findPointNumByDistance(distance, lat, lng);
    }