Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java

@@ -106,8 +106,7 @@
        Member member = memberService.getByUserId(userId);
        AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
        appBirthdayCardVo.setCheckBirthdayCard(0);
        if(member.getBindingFlag()==1){
            Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId());
            Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId(),member.getBindingFlag());
            if(check==1){
                appBirthdayCardVo.setCheckBirthdayCard(1);
                if(StringUtils.isNotBlank(member.getBirthday())){
@@ -118,6 +117,7 @@
                    int todayMonth = today.getMonthValue();
                    if (birthdayMonth == todayMonth) {
                        appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
                        appBirthdayCardVo.setCheckBirthdayCard(1);
                        appBirthdayCardVo.setHaveBirthdayFlag(1);
                        appBirthdayCardVo.setInBirthdayFlag(1);
                    } else {
@@ -128,7 +128,7 @@
                    appBirthdayCardVo.setHaveBirthdayFlag(0);
                }
            }
        }

        return R.ok(appBirthdayCardVo);
    }

@@ -158,7 +158,7 @@
    }

    @RequestMapping(value = "/pageAppMemberPrize", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取用户奖品列表")
    @ApiOperation(value = "分页获取用户奖品列表【2.0】")
    public R<Page<AppMemberPrizePageVo>> pageAppMemberPrize(@RequestBody AppPageDto appPageDto) {
        Long userId = SecurityUtils.getUserId();
        appPageDto.setUserId(userId);