Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -105,6 +105,11 @@
        Long userId = SecurityUtils.getUserId();
        Member member = memberService.getByUserId(userId);
        AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
        appBirthdayCardVo.setCheckBirthdayCard(0);
        if(member.getBindingFlag()==1){
            Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId());
            if(check==1){
                appBirthdayCardVo.setCheckBirthdayCard(1);
        if(StringUtils.isNotBlank(member.getBirthday())){
            appBirthdayCardVo.setHaveBirthdayFlag(1);
            String birthday = member.getBirthday();
@@ -122,6 +127,8 @@
        }else{
            appBirthdayCardVo.setHaveBirthdayFlag(0);
        }
            }
        }
        return R.ok(appBirthdayCardVo);
    }