mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -107,13 +107,15 @@
            communityId=getCommunityId()+"";
        }
        String userId=null;
        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
            userId=getUserId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType,merchantId);
                condition,userName,communityId,userId,orderType,merchantId);
    }
    /**
@@ -505,7 +507,51 @@
        {
            communityId=getCommunityId()+"";
        }
        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }
        return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }
    /***************************************************************************************************************
     *
     *                               路北社区系统配置   商家折扣      兑换地点信息
     *
     ****************************************************************************************************************/
    /**
     * 详情
     * @param
     * @return
     */
    @GetMapping("/Community/Config/getData")
    public R ConfiggetData(@RequestParam("communityId") String communityId)
    {
        return communityService.ConfiggetData(communityId);
    }
    /*******************************************************************************************************************
     *
     *
     *                         社区折扣
     *
     *
     ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/community/discount/getList")
    public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
    {
        return communityService.CommunityDiscountgetList(communityId);
    }
}