From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
index 63a63ab..2a0ac58 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
+++ b/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);
}
--
Gitblit v1.7.1