Wesmiler

app/Services/Api/SettleService.php

@@ -64,14 +64,14 @@ class SettleService extends BaseService
         }
 
         $storeInfo = StoreModel::where(['id'=> $storeId,'mark'=>1])->first();
-        $balance = isset($storeInfo['balance'])? $storeInfo['balance'] : 0;
+        $balance = isset($storeInfo['bonus_total'])? $storeInfo['bonus_total'] : 0;
         $storeUserId = isset($storeInfo['user_id'])? $storeInfo['user_id'] : 0;
         if($storeUserId<=0){
             $this->error = '企业账号错误';
             return false;
         }
 
-        if(!StoreModel::where(['id'=> $storeId])->update(['balance'=>DB::raw("balance + {$money}"),'income'=>DB::raw("income + {$money}"),'update_time'=>time()])){
+        if(!StoreModel::where(['id'=> $storeId])->update(['bonus_total'=>DB::raw("bonus_total + {$money}"),'update_time'=>time()])){
             $this->error = '收货错误，企业结算错误，请联系客服处理';
             return -1;
         }

app/Services/Common/StoreService.php

@@ -13,11 +13,7 @@ namespace App\Services\Common;
 
 use App\Models\StoreModel;
 use App\Models\UserModel;
-use App\Models\MemberModel;
 use App\Services\BaseService;
-use App\Services\RedisService;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 /**
  * 企业店铺管理-服务类
@@ -84,10 +80,9 @@ class StoreService extends BaseService
                 if (isset($item['avatar']) && $item['avatar']) {
                     $item['avatar'] = get_image_url($item['avatar']);
                 }
+
                 // 添加余额信息
                 $item['balance'] = isset($item['member']['balance']) ? $item['member']['balance'] : 0;
-                // 添加会员状态信息
-                $item['member_user_status'] = isset($item['member']['status']) ? $item['member']['status'] : 1;
             }
         }
 

app/Services/Common/UserService.php

@@ -141,10 +141,6 @@ class UserService extends BaseService
             return message($error, false);
         }
 
-        if($data['type'] == 2){
-            $data['role_ids'] = [6];
-        }
-
         // 删除已存在的用户角色关系数据
         $userRoleService = new UserRoleService();
         $userRoleService->deleteUserRole($result);