生日

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java

@@ -239,13 +239,15 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
             return null;
         }
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper()
-                .eq(ShopUser::getUserId, userId).eq(ShopUser::getMainShopId, shopId).eq(ShopUser::getBirthDayRemind, 0));
+                .eq(ShopUser::getUserId, userId).isNotNull(ShopUser::getBirthDay)
+                .eq(ShopUser::getMainShopId, shopId).eq(ShopUser::getBirthDayRemind, 0));
         if (shopUser == null) {
             return null;
         }
         if (StrUtil.isBlank(birthdayGift.getConfigList())) {
             return null;
         }
+        try {
             //获取当天日期
             LocalDate current = DateUtil.date().toLocalDateTime().toLocalDate();
             // 解析用户生日（仅取月日）
@@ -289,6 +291,10 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
                     }
                 }
             }
+        } catch (Exception e) {
+            log.error("获取生日礼包配置失败, shopUser: {}", shopUser, e);
+            return null;
+        }
         return null;
     }