修改金汇社区资源清单筛选

lidongdong

2023-12-08 eb61ca85ef0f8c91afadfcf7763b307b87ac9a97

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

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import com.panzhihua.common.service.user.UserService;
@@ -540,9 +541,11 @@
    @GetMapping("/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId)
                                    @RequestParam(value = "communityId", required = false)String communityId,
                                    @RequestParam(value = "unitId", required = false)String unitId,
                                    @RequestParam(value = "meritId", required = false) String meritId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,unitId,meritId);
    }

    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
@@ -718,9 +721,9 @@
    @PostMapping("/orderAddData")
    public R orderAddData(@RequestBody NewFightShoppingOrderVO item)
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        item.setOrderType("1");
//        item.setCommunityId(getCommunityId()+"");
//        item.setUserId(getUserId()+"");
//        item.setOrderType("1");
        return newStriveForFeign.orderAddData(item);
    }

@@ -789,4 +792,22 @@
        return communityService.getIntegralUserRank(getCommunityId(),getUserId());
    }


    @ApiOperation(value = "是否是商家   如果是商家返回商家id")
    @GetMapping("/selectUserBind")
    public R selectUserBind()
    {
        return newStriveForFeign.selectUserBind(getCommunityId()+"",getUserId()+"");
    }



    @ApiOperation(value = "搜索用户", response = SysUserVO.class)
    @GetMapping("/selectUserList")
    public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
    {
        return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
    }


}