新增小程序商家端商家列表

lidongdong

2023-08-30 ea7afc2b5e325f37f60986c48513d5788e22e246

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

@@ -89,10 +89,16 @@
                     @RequestParam(value = "orderNumber", required = false) String orderNumber,
                     @RequestParam(value = "goodsName", required = false) String goodsName,
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName)
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId)
    {

        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,null,getLoginUserInfo().getUserId()+"","1");
                condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
    }

    /**
@@ -170,5 +176,27 @@
        return communityService.conditionData(id);
    }

    /*************************************************************************************
     *
     *      路北社区商家模块
     *
     **************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
                                      @RequestParam(value = "name", required = false) String name)
    {
        return communityService.volunteerMerchantGetList(pageNum, pageSize,merchantState,merchantType,name,getCommunityId()+"");
    }




}