关闭福利账户创建

app/admin/controller/member/AccountController.php

@@ -17,7 +17,7 @@ class AccountController extends Curd
 
     public function my($id)
     {
-        $account = MemberAccount::where('join_account_member_id', $id)->get()->toArray();
+        $account = MemberAccount::where('join_account_member_id', $id)->where('member_account_status','ACTIVED')->get()->toArray();
         if (!$account) {
             // 账户表
             $accountData = [

app/admin/service/member/MemberService.php

@@ -672,18 +672,18 @@ class MemberService
             // 现金/余额账户
             MemberAccount::insert($accountData);
             // 福利账户
-            if (!empty($params['member_classify']) && $params['member_classify'] == 'EMPLOY'){
-                $welfareData = [
-                    'join_account_member_id'=>$memberId,
-                    'member_account_classify'=>'WELFARE',
-                    'member_account_status'=>'ACTIVED',
-                    'member_account_category'=>'NORMAL',
-                    'member_account_nbr'=>$memberId.'-WELFARE',
-                    'member_account_name'=>'福利账户',
-                    'member_account_addtimes'=>time()
-                ];
-                MemberAccount::insert($welfareData);
-            }
+//            if (!empty($params['member_classify']) && $params['member_classify'] == 'EMPLOY'){
+//                $welfareData = [
+//                    'join_account_member_id'=>$memberId,
+//                    'member_account_classify'=>'WELFARE',
+//                    'member_account_status'=>'ACTIVED',
+//                    'member_account_category'=>'NORMAL',
+//                    'member_account_nbr'=>$memberId.'-WELFARE',
+//                    'member_account_name'=>'福利账户',
+//                    'member_account_addtimes'=>time()
+//                ];
+//                MemberAccount::insert($welfareData);
+//            }
 
             // member cert
             $certData = [
@@ -802,18 +802,18 @@ class MemberService
                 MemberInfo::where('join_info_member_id', $params['member_id'])->update($infoData);
             }
             // 福利账户
-            if (!empty($params['member_classify']) && $params['member_classify'] == 'EMPLOY' && !MemberAccount::where('member_account_nbr',$memberId.'-WELFARE')->exists()){
-                $welfareData = [
-                    'join_account_member_id'=>$memberId,
-                    'member_account_classify'=>'WELFARE',
-                    'member_account_status'=>'ACTIVED',
-                    'member_account_category'=>'NORMAL',
-                    'member_account_nbr'=>$memberId.'-WELFARE',
-                    'member_account_name'=>'福利账户',
-                    'member_account_addtimes'=>time()
-                ];
-                MemberAccount::insert($welfareData);
-            }
+//            if (!empty($params['member_classify']) && $params['member_classify'] == 'EMPLOY' && !MemberAccount::where('member_account_nbr',$memberId.'-WELFARE')->exists()){
+//                $welfareData = [
+//                    'join_account_member_id'=>$memberId,
+//                    'member_account_classify'=>'WELFARE',
+//                    'member_account_status'=>'ACTIVED',
+//                    'member_account_category'=>'NORMAL',
+//                    'member_account_nbr'=>$memberId.'-WELFARE',
+//                    'member_account_name'=>'福利账户',
+//                    'member_account_addtimes'=>time()
+//                ];
+//                MemberAccount::insert($welfareData);
+//            }
 
             Db::commit();
         } catch (\Exception $e) {