|
|
@@ -687,7 +687,7 @@ class User Extends Model
|
|
|
// self::RecentlyPrice(); //更新价格
|
|
|
$count = self::designerByWhere($user_id,$design_classifi,$keywords,$city,$date,$price_section_start,$price_section_end)->count();
|
|
|
if ($count){
|
|
|
- $field = ['id','phone','name','nickname','headimg','price','design_classifi','skills_label','good_type','good_style','evaluation','works','province','city','area','work_experience','work_year'];
|
|
|
+ $field = ['id','phone','name','nickname','headimg','price','design_classifi','skills_label','good_type','good_style','evaluation','works','province','city','area','work_experience','work_year','signature'];
|
|
|
if ($lat && $log){
|
|
|
$field['ROUND(6378.138 * 2 * ASIN(SQRT(POW( SIN( ( ' . $lat . ' * PI( ) / 180 - wd * PI( ) / 180 ) / 2 ), 2 ) + COS( ' . $lat . ' * PI( ) / 180 ) * COS( wd * PI( ) / 180 ) * POW( SIN( ( ' . $log . ' * PI( ) / 180 - jd * PI( ) / 180 ) / 2 ), 2 ))) * 1000)'] = 'distance';
|
|
|
}
|
|
|
@@ -1704,7 +1704,7 @@ class User Extends Model
|
|
|
* @param int $user_id 会员ID
|
|
|
* @param string $memo 备注
|
|
|
*/
|
|
|
- public static function money($money, $user_id, $memo, $pm = 0)
|
|
|
+ public static function money($money, $user_id, $memo, $pm = 0, $link_id = 0)
|
|
|
{
|
|
|
$user = self::get($user_id);
|
|
|
if ($user)
|
|
|
@@ -1718,7 +1718,7 @@ class User Extends Model
|
|
|
//更新会员信息
|
|
|
$user->save(['money' => $after]);
|
|
|
//写入日志
|
|
|
- MoneyLog::create(['user_id' => $user_id,'pm' => $pm, 'change_money' => $money, 'before' => $before, 'after' => $after, 'title' => $memo]);
|
|
|
+ MoneyLog::create(['user_id' => $user_id,'pm' => $pm, 'change_money' => $money, 'before' => $before, 'after' => $after, 'title' => $memo,'link_id'=>$link_id]);
|
|
|
}
|
|
|
}
|
|
|
|
songxingwei