dev

admin/control/provider.php

@@ -27,7 +27,7 @@ class providerControl extends SystemControl
             $condition['type'] = $_GET['type'];
         }
 
-        $provider_list = $provider_model->table('refill_provider,store')
+        $provider_items = $provider_model->table('refill_provider,store')
             ->field('refill_provider.*,store.store_name,store.member_id')
             ->join('inner')
             ->on('store.store_id=refill_provider.store_id')
@@ -35,32 +35,41 @@ class providerControl extends SystemControl
             ->order('opened asc, name asc')
             ->page(100)
             ->select();
-        $account_ids = $members = [];
-        foreach ($provider_list as $provider) {
-            if(!empty($provider['account_id'])) {
-                $account_ids[$provider['provider_id']] = $provider['account_id'];
-            }
-        }
-        if(!empty($account_ids)) {
-            $member_id = implode(',', $account_ids);
-            $member_data = Model('member')->field('member_id,available_predeposit')->where(['member_id' => ['in',$member_id]])->select();
-            foreach ($member_data as $member) {
-                $members[$member_id] = $member['available_predeposit'];
+
+        $providers = [];
+        $mid_pids = [];
+        $mids = [];
+        foreach ($provider_items as $provider)
+        {
+            $pid = $provider['provider_id'];
+            $providers[$pid] = $provider;
+            $account_id = intval($provider['account_id']);
+            if($account_id > 0) {
+                $mid_pids[$account_id] = $pid;
+                $mids[] = $account_id;
             }
         }
-        foreach ($provider_list as $key => $value) {
-            $account_id = $value['account_id'];
-            if (!empty($members[$account_id]) && array_key_exists($account_id, $members)) {
-                $provider_list[$key]['available_predeposit'] = $members[$account_id];
-            } else {
-                $provider_list[$key]['available_predeposit'] = 0;
+
+        if(!empty($mids))
+        {
+            $member_data = Model('member')->field('member_id,available_predeposit')->where(['member_id' => ['in',$mids]])->select();
+            foreach ($member_data as $member)
+            {
+                $mid = intval($member['member_id']);
+                if(array_key_exists($mid,$mid_pids)) {
+                    $pid = $mid_pids[$mid];
+                    $providers[$pid]['available_predeposit'] = $member['available_predeposit'];
+                } else {
+                    $providers[$pid]['available_predeposit'] = 0;
+                }
             }
         }
+
         $opened_text = ['使用中', '已禁用'];
         $type_text = ['油卡', '手机充值卡', '增值业务'];
         Tpl::output('opened_text', $opened_text);
         Tpl::output('type_text', $type_text);
-        Tpl::output('provider_list', $provider_list);
+        Tpl::output('provider_list', $providers);
         Tpl::output('show_page', $provider_model->showpage());
         Tpl::showpage('provider.index');
     }

admin/control/provider_info.php

@@ -299,7 +299,7 @@ class provider_infoControl extends SystemControl
                 $mod = Model('provider_evidence');
                 $trans = new trans_wapper($mod, __METHOD__);
                 $add_evidence_res = $mod->addProviderEvidence($input);
-                $add_money_res = $this->add_money($amount, $store_info['member_id']);
+                $add_money_res = $this->add_money($amount, $provider_info['account_id']);
                 if(!$add_evidence_res || !$add_money_res) {
                     $trans->rollback();
                     showMessage('操作失败');
@@ -384,7 +384,6 @@ class provider_infoControl extends SystemControl
             $randnum = 'ProviderEvidenceImport_'.$time.str_pad(mt_rand(1, 99999), 5, '0', STR_PAD_LEFT);
             //上传后的文件名
             $name=$randnum.$extendLower;
-
             $upload_filename=$filePath.$name;//上传后的文件名地址
 
             $result=move_uploaded_file($tmp_name,$upload_filename);
@@ -426,7 +425,7 @@ class provider_infoControl extends SystemControl
                         $params['bz'] = $items[7];
                     }
                     $json_txt = json_encode($params);
-                    Log::record("import data: {$json_txt}",LOG::DEBUG);
+                    Log::record("import data: {$json_txt}",Log::DEBUG);
                     if(empty($params['store_id']) || empty($params['store_name'])) {
                         Log::record("provider evidence import err,not find store info, provider_id: {$provider_id}, amount: {$params['amount']}",LOG::DEBUG);
                     }
@@ -437,7 +436,6 @@ class provider_infoControl extends SystemControl
                 }
             }
             showMessage('操作完成');
-            exit;
         }
         else
         {