lidongdong
2023-08-30 b1f3e95844ee460b0b9ba3a8cf6e9a7a40a8f5c7
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -78,30 +78,6 @@
     ***********************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
                     @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 = "communityId", required = false) String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
    }
    /**
     * 查询详情
     * @param id
     * @return
@@ -212,7 +188,7 @@
    /***********************************************************************************************************
     *
     *
     *                   订单兑换
     *                   商家订单兑换
     *
     *
     ***********************************************************************************************************/
@@ -231,7 +207,7 @@
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "communityId", required = false) String orderType)
                     @RequestParam(value = "orderType", required = false) String orderType)
    {
        if(StringUtils.isEmpty(communityId))
        {