|
|
@@ -2927,8 +2927,11 @@ class UserRepository extends BaseRepository
|
|
2927
|
2927
|
$data['annuity_yiqu'] = 123;
|
|
2928
|
2928
|
|
|
2929
|
2929
|
|
|
2930
|
|
-
|
|
2931
|
|
- $data["birthday60"] = $this->getFutureBirthday($birth_data,$old_age);
|
|
|
2930
|
+ if ($certification['card_type'] == 1) {
|
|
|
2931
|
+ $data["birthday60"] = $this->getFutureBirthday($birth_data,$old_age);
|
|
|
2932
|
+ }else{
|
|
|
2933
|
+ $data["birthday60"] = $this->getFutureBirthday($certification['birthday'],$old_age);
|
|
|
2934
|
+ }
|
|
2932
|
2935
|
}
|
|
2933
|
2936
|
$order_merchant_price= OrderMerchant::getInstance()->where('paid', 1)
|
|
2934
|
2937
|
->where(function ($query) use ($data) {
|