dev

admin/config/config.ini.php

@@ -49,7 +49,8 @@ elseif(defined('COMPANY_NAME') && COMPANY_NAME === 'ZY_COMPANY')
 {
     $config['receive_bank'] = [
         '榜样民生',
-        '榜样宁波银行'
+        '榜样宁波银行',
+        '飞鸢招行'
     ];
     $config['WEB_COMPANY_NAME'] = '北京榜样在线科技有限公司';
 }

crontab/control/minutes.php

@@ -147,47 +147,40 @@ class minutesControl extends BaseCronControl
 
     private function _check_merchant_alarm_amount()
     {
-        if(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY')
-        {
-            $mch_cache = rcache("merchant-notify" , 'refill-');
-            $caches = empty($mch_cache['data']) ? [] : unserialize($mch_cache['data']);
+        $mch_cache = rcache("merchant-notify", 'refill-');
+        $caches = empty($mch_cache['data']) ? [] : unserialize($mch_cache['data']);
 
-            $new_caches = [];
-            $merchants = Model('merchant')->getMerchantList(['merchant.merchant_state'=>1],'','',true,'merchant.*,member.available_predeposit' ,"0,1000");
-            foreach ($merchants as $merchant)
-            {
-                $mchid = $merchant['mchid'];
-                $phones = empty($merchant['warning_phone']) ? [] : unserialize($merchant['warning_phone']);
-                $available_pd = intval($merchant['available_predeposit']);
-                $alarm_pd = intval($merchant['alarm_amount']);
+        $new_caches = [];
+        $merchants = Model('merchant')->getMerchantList(['merchant.merchant_state' => 1], '', '', true, 'merchant.*,member.available_predeposit', "0,1000");
+        foreach ($merchants as $merchant) {
+            $mchid = $merchant['mchid'];
+            $phones = empty($merchant['warning_phone']) ? [] : unserialize($merchant['warning_phone']);
+            $available_pd = intval($merchant['available_predeposit']);
+            $alarm_pd = intval($merchant['alarm_amount']);
 
-                if(array_key_exists($mchid,$caches)) {
-                    $mch_cache = $caches[$mchid];
-                }
-                else {
-                    $mch_cache = ['last_time' => 0, 'send_count' => 0];
-                }
-                if($available_pd < $alarm_pd || $available_pd < 10000)
-                {
-                    $counts =  $mch_cache['send_count'];
-                    if(($mch_cache['last_time'] + 300 < time()) && $counts < 2) {
-                        $mch_cache = ['last_time' => time(), 'send_count' => $counts + 1];
-                        foreach ($phones as $phone) {
-                            if(!empty($phone)){
-                                QueueClient::push('sendSMS', ['mobile'=>$phone,
-                                    'type'=>'balance_warning','datas' => [date("m月d日H时") , $merchant['available_predeposit']]]);
-                            }
+            if (array_key_exists($mchid, $caches)) {
+                $mch_cache = $caches[$mchid];
+            } else {
+                $mch_cache = ['last_time' => 0, 'send_count' => 0];
+            }
+            if ($available_pd < $alarm_pd || $available_pd < 10000) {
+                $counts = $mch_cache['send_count'];
+                if (($mch_cache['last_time'] + 300 < time()) && $counts < 2) {
+                    $mch_cache = ['last_time' => time(), 'send_count' => $counts + 1];
+                    foreach ($phones as $phone) {
+                        if (!empty($phone)) {
+                            QueueClient::push('sendSMS', ['mobile' => $phone,
+                                'type' => 'balance_warning', 'datas' => [date("m月d日H时"), $merchant['available_predeposit']]]);
                         }
                     }
                 }
-                else {
-                    $mch_cache = ['last_time' => 0, 'send_count' => 0];
-                }
-                $new_caches[$mchid] = $mch_cache;
+            } else {
+                $mch_cache = ['last_time' => 0, 'send_count' => 0];
             }
-
-            wcache("merchant-notify", ['data' => serialize($new_caches)], 'refill-');
+            $new_caches[$mchid] = $mch_cache;
         }
+
+        wcache("merchant-notify", ['data' => serialize($new_caches)], 'refill-');
     }
 
     public function check_refill_order_limit()

helper/fcgisrv/MobileServer.php

@@ -108,7 +108,7 @@ class MobileServer extends BaseServer
                     Log::record("Call {$file}",Log::DEBUG);
                     include $file;
                 }
-                elseif(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY')
+                elseif(defined('COMPANY_NAME') && in_array(COMPANY_NAME,['XYZ_COMPANY','ZY_COMPANY']))
                 {
                     //部分控制器不需要使用session.
                     $act = $_GET['act'];

mchsrv/control/refill_evidence.php

@@ -59,8 +59,9 @@ class refill_evidenceControl extends mbMerchantControl
         $data['is_bank'] = 1;
 
         $ret = $model_merchant->addRefillEvidence($data);
-        if ($ret) {
-            if(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY') {
+        if ($ret)
+        {
+            if(defined('COMPANY_NAME') && in_array(COMPANY_NAME,['XYZ_COMPANY','ZY_COMPANY'])) {
                 global $config;
                 $phones = $config['system_manager_phones'];
                 foreach ($phones as $phone) {

mobile/control/refill_evidence.php

@@ -58,8 +58,9 @@ class refill_evidenceControl extends mbMerchantControl
         $data['add_time'] = time();
 
         $ret = $model_merchant->addRefillEvidence($data);
-        if ($ret) {
-            if(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY') {
+        if ($ret)
+        {
+            if(defined('COMPANY_NAME') && in_array(COMPANY_NAME,['XYZ_COMPANY','ZY_COMPANY'])) {
                 global $config;
                 $phones = $config['system_manager_phones'];
                 foreach ($phones as $phone) {