bug
jiangqs
2023-08-02 bb58e108a9da48d84b84d30b73c01106dd642550
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
@@ -105,22 +105,29 @@
        Long userId = SecurityUtils.getUserId();
        Member member = memberService.getByUserId(userId);
        AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
        if(StringUtils.isNotBlank(member.getBirthday())){
            appBirthdayCardVo.setHaveBirthdayFlag(1);
            String birthday = member.getBirthday();
            LocalDate today = LocalDate.now();
            int birthdayMonth = Integer.parseInt(birthday.split("-")[1]);
            int todayMonth = today.getMonthValue();
            if (birthdayMonth == todayMonth) {
                appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
                appBirthdayCardVo.setHaveBirthdayFlag(1);
                appBirthdayCardVo.setInBirthdayFlag(1);
            } else {
                appBirthdayCardVo.setHaveBirthdayFlag(1);
                appBirthdayCardVo.setInBirthdayFlag(0);
        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();
                    LocalDate today = LocalDate.now();
                    int birthdayMonth = Integer.parseInt(birthday.split("-")[1]);
                    int todayMonth = today.getMonthValue();
                    if (birthdayMonth == todayMonth) {
                        appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
                        appBirthdayCardVo.setHaveBirthdayFlag(1);
                        appBirthdayCardVo.setInBirthdayFlag(1);
                    } else {
                        appBirthdayCardVo.setHaveBirthdayFlag(1);
                        appBirthdayCardVo.setInBirthdayFlag(0);
                    }
                }else{
                    appBirthdayCardVo.setHaveBirthdayFlag(0);
                }
            }
        }else{
            appBirthdayCardVo.setHaveBirthdayFlag(0);
        }
        return R.ok(appBirthdayCardVo);
    }