lidongdong
2023-09-06 29e6855302b602f8dc3fac25c5e123d2646cf552
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -106,12 +106,6 @@
        {
            communityId=getCommunityId()+"";
        }
        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType,merchantId);
    }
@@ -506,7 +500,33 @@
            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);
    }
}