Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop
This commit is contained in:
		
						commit
						465bc5e62d
					
				| @ -86,14 +86,19 @@ func (a *FsAddressModel) SettingUserDefaultAddress(ctx context.Context, userId i | |||||||
| 
 | 
 | ||||||
| 		now := time.Now().UTC() | 		now := time.Now().UTC() | ||||||
| 
 | 
 | ||||||
| 		err = tx.Model(&FsAddress{}).Where(" `user_id` = ? and `status` = ? and `address_id` = ? ", userId, 1, addressId). | 		err = tx.Where("`user_id` = ? and `status` = 1 and `address_id` = ? ", userId, addressId).Take(nil).Error | ||||||
|  | 		if err != nil { | ||||||
|  | 			return err | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		err = tx.Where("`user_id` = ? and `status` = 1 and `address_id` = ? ", userId, addressId). | ||||||
| 			UpdateColumn("ltime", now.AddDate(250, 0, 0)). | 			UpdateColumn("ltime", now.AddDate(250, 0, 0)). | ||||||
| 			UpdateColumn("utime", now).Error | 			UpdateColumn("utime", now).Error | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		err = tx.Where(" `user_id` = ? and `status` = ? and `address_id` != ? and `ltime` > ? ", userId, 1, addressId, now.AddDate(10, 0, 0)). | 		err = tx.Where(" `user_id` = ? and `status` = 1 and `address_id` != ? and `ltime` > ? ", userId, addressId, now.AddDate(10, 0, 0)). | ||||||
| 			UpdateColumn("ltime", now).Error | 			UpdateColumn("ltime", now).Error | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			logx.Error(err) | 			logx.Error(err) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user