收货地址的你改为您 取消新增收货地址自动设为收货地址功能 更新用户信息失败 log

app/Controller/v3/OrderOnlineController.php

@@ -110,9 +110,9 @@ class OrderOnlineController extends BaseController
         $deliveryDistance = config('distance.delivery_distance');
         if(isset($distance) && $distance < $deliveryDistance){
             if($distance >= 1000){
-                $distance_text = '距你收货地址 ' . bcdiv($distance,1000,2) . 'km';
+                $distance_text = '距您收货地址 ' . bcdiv($distance,1000,2) . 'km';
             }else{
-                $distance_text = '距你收货地址 ' . $distance . 'm';
+                $distance_text = '距您收货地址 ' . $distance . 'm';
             }
             $distributionPrice = $this->distributionPriceService->do($distance);
             $res['location'] = [

app/Service/v3/Implementations/UserAddressService.php

@@ -39,13 +39,6 @@ class UserAddressService implements UserAddressServiceInterface
 				'tel' => $tel,
 				'tags' => $tags
 			]);
-        if(empty($userAddressId)){
-            $userAddressId = $userAddress->id;
-            Db::transaction(function () use ($user_id,$userAddressId) {
-                UserAddress::query()->where(['user_id'=> $user_id,'is_default'=> 1])->update(['is_default' => 0]);
-                UserAddress::query()->where('id',$userAddressId)->update(['is_default' => 1]);
-            });
-        }
 		return $userAddress;
     }
 
@@ -99,9 +92,9 @@ class UserAddressService implements UserAddressServiceInterface
         $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat);
         $distributionPrice = $this->distributionPriceService->do($distance);
         if($distance >= 1000){
-            $distance_text = '距你收货地址 ' . bcdiv($distance,1000,2) . 'km';
+            $distance_text = '距您收货地址 ' . bcdiv($distance,1000,2) . 'km';
         }else{
-            $distance_text = '距你收货地址 ' . $distance . 'm';
+            $distance_text = '距您收货地址 ' . $distance . 'm';
         }
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;

app/Service/v3/Implementations/UserInfoService.php

@@ -53,7 +53,13 @@ class UserInfoService implements UserInfoServiceInterface
         $res = $user->fill($data)->save();
 
         if (!$res) {
-            throw new ErrorCodeException(ErrorCode::USER_INFO_UPDATE_ERROR);
+            $logArr = [
+                'userId' => $userId,
+                'iv' => $iv,
+                'encryptedData' => $encryptedData,
+                '$decryptedData' => $decryptedData
+            ];
+            throw new ErrorCodeException(ErrorCode::USER_INFO_UPDATE_ERROR,'更新用户信息失败',$logArr);
         }
 
         return $res;