Просмотр исходного кода

fix(user):修复用户生日计算逻辑

- 根据证件类型判断生日数据来源
- 当证件类型为1时使用原有birth_data计算
- 其他证件类型使用认证信息中的birthday字段- 确保不同证件类型的用户都能正确计算60岁生日
shichen месяцев назад: 10
Родитель
Сommit
d670f35d09
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      app/common/repositories/user/UserRepository.php

+ 5 - 2
app/common/repositories/user/UserRepository.php

@@ -2939,8 +2939,11 @@ class UserRepository extends BaseRepository
2939
             $data['annuity_yiqu'] = 123;
2939
             $data['annuity_yiqu'] = 123;
2940
 
2940
 
2941
 
2941
 
2942
-
2943
-            $data["birthday60"] =  $this->getFutureBirthday($birth_data,$old_age);
2942
+            if ($certification['card_type'] == 1) {
2943
+                $data["birthday60"] =  $this->getFutureBirthday($birth_data,$old_age);
2944
+            }else{
2945
+                $data["birthday60"] =  $this->getFutureBirthday($certification['birthday'],$old_age);
2946
+            }
2944
         }
2947
         }
2945
         $order_merchant_price= OrderMerchant::getInstance()->where('paid', 1)
2948
         $order_merchant_price= OrderMerchant::getInstance()->where('paid', 1)
2946
             ->where(function ($query) use ($data) {
2949
             ->where(function ($query) use ($data) {