lidongdong
2023-08-29 63fae3904d7da86e15182bb8cd32b82f83114b08
修改积分兑换订单列表报错
2个文件已修改
19 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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");
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -102,10 +102,15 @@
                     @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 merchantService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,getCommunityId()+"",null,"1");
                condition,userName,communityId,null,"1");
    }
    /**