|
|
@@ -2939,8 +2939,11 @@ class UserRepository extends BaseRepository
|
|
2939
|
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
|
2948
|
$order_merchant_price= OrderMerchant::getInstance()->where('paid', 1)
|
|
2946
|
2949
|
->where(function ($query) use ($data) {
|