add fensheng channel

admin/control/merchant.php

@@ -830,10 +830,8 @@ class merchantControl extends SystemControl
             $condition['refill_order.refill_amount'] = $_GET['refill_amount'];
         }
 
-
-        if (!empty($_GET['card_type']))
-        {
-            if(in_array($_GET['card_type'] , ['1' , '2' , '4' , '5' , '6'])) {
+        if (!empty($_GET['card_type'])) {
+            if (in_array($_GET['card_type'], ['1', '2', '4', '5', '6'])) {
                 $condition['refill_order.card_type'] = $_GET['card_type'];
             }
             if ($_GET['card_type'] == 'oil') {
@@ -845,7 +843,8 @@ class merchantControl extends SystemControl
         }
 
         $fToday = false;
-        if (!$fSingle) {
+        if (!$fSingle)
+        {
             $start_unixtime = intval(strtotime($_GET['query_start_time']));
             $end_unixtime = intval(strtotime($_GET['query_end_time']));
 

admin/templates/default/merchant.index.php

@@ -70,7 +70,7 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
             <tbody>
             <?php if (!empty($output['merchant_list']) && is_array($output['merchant_list'])) { ?>
                 <?php foreach ($output['merchant_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['mchid']; ?></td>
                         <td><?php echo $v['name']; ?></td>
                         <td><?php echo $v['company_name']; ?></td>
@@ -143,5 +143,13 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
             $('input[name="op"]').val('merchant');
             $('#formSearch').submit();
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

admin/templates/default/merchant.order.stats.php

@@ -92,7 +92,7 @@
             <tbody>
             <?php if (!empty($output['stats_list']) && is_array($output['stats_list'])) { ?>
                 <?php foreach ($output['stats_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['time_text']; ?></td>
                         <td><?php echo $v['cname']; ?></td>
                         <td><?php echo $v['cid']; ?></td>
@@ -157,5 +157,13 @@
             elem: '#endTime',
             type: 'datetime'
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

admin/templates/default/merchant.provider.evidence_list.php

@@ -66,7 +66,7 @@
             <tbody>
             <?php if (!empty($output['evidence_list']) && is_array($output['evidence_list'])) { ?>
                 <?php foreach ($output['evidence_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['apply_id']; ?></td>
                         <td><?php echo $v['store_name']; ?></td>
                         <td><?php echo $v['amount']*100%100==0 ? intval($v['amount']) : $v['amount']; ?> (<?php echo $v['amount']>=10000 ? $v['amount']/10000 .'万' : $v['amount'] . '元';?>)</td>
@@ -107,5 +107,14 @@
             $('input[name="op"]').val('provider_evidence');
             $('#formSearch').submit();
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
+    
 </script>

admin/templates/default/merchant.refill.evidence_list.php

@@ -74,7 +74,7 @@
             <tbody>
             <?php if (!empty($output['evidence_list']) && is_array($output['evidence_list'])) { ?>
                 <?php foreach ($output['evidence_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['apply_id']; ?></td>
                         <td><?php echo $v['mch_name']; ?></td>
                         <td><?php echo $v['amount']*100%100==0 ? intval($v['amount']) : $v['amount']; ?> (<?php echo $v['amount']>=10000 ? $v['amount']/10000 .'万' : $v['amount'] . '元';?>)</td>
@@ -164,5 +164,13 @@
             $('input[name="op"]').val('refill_evidence');
             $('#formSearch').submit();
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

admin/templates/default/provider.amount.control.php

@@ -196,7 +196,7 @@
 
                             <td style="text-align: center;width: 150px;min-width:150px;padding-right: 10px;" class="batch-td">
                                 <div style="width: 46px;display:inline-block">
-                                    <input type="text" class="input-one styleOne" name="speed[]"
+                                    <input type="text" class="input-one styleOne" name="speed[]" autocomplete="off"
                                            value="<?php echo $output['datas'][$provider['provider_id']][$key]['speed']?>"
                                            <?php if($output['datas'][$provider['provider_id']][$key]['has'] == 0){?>
                                                readOnly
@@ -210,7 +210,7 @@
                                     </div>
                                 </div>
                                 <div style="width: 40px;display:inline-block;">
-                                    <input type="text" class="input-tow styleTow" name="sort[]"
+                                    <input type="text" class="input-tow styleTow" name="sort[]" autocomplete="off"
                                            value="<?php echo $output['datas'][$provider['provider_id']][$key]['sort']?>"
                                            <?php if($output['datas'][$provider['provider_id']][$key]['has'] == 0){?>
                                                readOnly
@@ -224,7 +224,7 @@
                                     </div>
                                 </div>
                                 <div style="width: 40px;display:inline-block">
-                                    <input type="text" class="input-three styleTow" name="opened[]"
+                                    <input type="text" class="input-three styleTow" name="opened[]" autocomplete="off"
                                            value="<?php echo $output['datas'][$provider['provider_id']][$key]['opened']?>"
                                             <?php if($output['datas'][$provider['provider_id']][$key]['has'] == 0){?>
                                                 readOnly

admin/templates/default/provider.index.php

@@ -80,7 +80,7 @@
             <tbody>
             <?php if (!empty($output['provider_list']) && is_array($output['provider_list'])) { ?>
                 <?php foreach ($output['provider_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['provider_id']; ?></td>
                         <td><?php echo $v['name']; ?></td>
                         <td><?php echo $output['type_text'][$v['type']-1]; ?></td>
@@ -136,5 +136,13 @@
             $('input[name="op"]').val('provider');
             $('#formSearch').submit();
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

admin/templates/default/provider.order.stats.php

@@ -92,7 +92,7 @@
             <tbody>
             <?php if (!empty($output['stats_list']) && is_array($output['stats_list'])) { ?>
                 <?php foreach ($output['stats_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['time_text']; ?></td>
                         <td><?php echo $v['cname']; ?></td>
                         <td><?php echo $v['cid']; ?></td>
@@ -157,5 +157,13 @@
             elem: '#endTime',
             type: 'datetime'
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

admin/templates/default/refill.order.index.php

@@ -237,7 +237,7 @@
         <?php if (count($output['order_list']) > 0) { ?>
             <?php
             foreach ($output['order_list'] as $key => $order) { ?>
-                <tr class="hover">
+                <tr class="hover trFlex">
                     <td class="align-center"><?php echo $key+1;?></td>
                     <td class="align-left"><?php echo $order['order_sn']; ?></td>
                     <td class="align-center"><?php echo $order['mchid']; ?></td>
@@ -321,6 +321,14 @@
             elem: '#endTime',
             type: 'datetime'
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
     function hCopyChannel(e) {
         let str = ''

admin/templates/default/refill.order.send.index.php

@@ -69,7 +69,7 @@
         <?php if (count($output['order_list']) > 0) { ?>
             <?php
             foreach ($output['order_list'] as $key => $order) { ?>
-                <tr class="hover">
+                <tr class="hover trFlex">
                     <td class="align-center"><?php echo $key+1;?></td>
                     <td class="align-left"><?php echo $order['order_sn']; ?></td>
                     <td class="align-center"><?php echo $order['mchid']; ?></td>
@@ -167,6 +167,14 @@
                 window.location.reload();
             }, 60000);
         }
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
     function hCopyChannel(e) {
         let str = ''

admin/templates/default/system.order.stats.php

@@ -74,7 +74,7 @@
             <tbody>
             <?php if (!empty($output['stats_list']) && is_array($output['stats_list'])) { ?>
                 <?php foreach ($output['stats_list'] as $k => $v) { ?>
-                    <tr>
+                    <tr class="trFlex">
                         <td><?php echo $v['time_text']; ?></td>
                         <td><?php echo $v['cname']; ?></td>
                         <td><?php echo $v['cid']; ?></td>
@@ -125,5 +125,13 @@
             elem: '#endTime',
             type: 'datetime'
         });
+        // 表格hover时背景
+        $('.trFlex').each(function () {
+            $(this).hover(function () {
+                $(this)[0].style.backgroundColor = '#cbe9f3'
+            },function() {
+                $(this)[0].style.backgroundColor = '#fff'
+            })
+        })
     });
 </script>

helper/refill/api/lingzh/fensheng/RefillCallBack.php

@@ -19,23 +19,21 @@ class RefillCallBack implements refill\IRefillCallBack
     {
         $status = $params['status'];
         $order_sn = $params['consumerNo'];
+
         $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
         if (empty($order_info)) {
             return [false, false, false,false];
         }
-        $order_id = $order_info['order_id'];
-        
-        $data['official_sn'] = strtolower($params['voucherNo']) == 'null' ? '' : $params['voucherNo'];
 
+        $order_id = $order_info['order_id'];
         if ($status === '001') {
+            $data['official_sn'] = strtolower($params['voucherNo']) == 'null' ? '' : $params['voucherNo'];
             Model('refill_order')->edit($order_id, $data);
-            return [$order_id, true, false,true];
-        }
-        elseif ($status === '003') {
-            return [$order_id, false, false,true];
-        }
-        else {
-            return [$order_id, false, false,false];
+            return [$order_id, true, false, true];
+        } elseif ($status === '003') {
+            return [$order_id, false, false, true];
+        } else {
+            return [$order_id, false, false, false];
         }
     }
 }

helper/refill/api/lingzh/fensheng/RefillPhone.php

@@ -14,38 +14,46 @@ class RefillPhone extends refill\IRefillPhone
         parent::__construct($cfgs);
     }
 
-    private function req_params(int $phone, int $amount, string $order_sn)
+    private function req_params(int $phone, string $order_sn)
     {
         $params['account'] = config::ACCOUNT;
         $params['consumerNo'] = $order_sn;
         $params['mobile'] = $phone;
         $params['timestamp'] = date("YmdHis");
+
         return $params;
     }
 
     public function add($card_no, $card_type, $amount, $params)
     {
-        $params = $this->req_params($card_no, $amount, $params['order_sn']);
+        $params = $this->req_params($card_no, $params['order_sn']);
         $params['flowCode'] = config::ProductIDS[$card_type][$amount];
         if (empty($params['flowCode'])) {
             return [false, '产品编号错误', false];
         }
+
         $sign = $this->sign($params);
         $params['sign'] = $sign;
 
         $resp = http_request(config::ORDER_URL, $params);
         if ($resp === false) {
             return [false, '系统错误', true];
-        } else {
+        }
+        else
+        {
             Log::record($resp, Log::DEBUG);
             $resp = json_decode($resp ,true);
+
             if($resp === false) {
                 return [false, '系统错误', true];
             }
+
             if($resp['status'] === '001') {
                 return [true, $resp['orderNo'], false];
             }
-            return [false , $resp['status'], false];
+            else {
+                return [false , $resp['status'], false];
+            }
         }
     }
 
@@ -67,6 +75,7 @@ class RefillPhone extends refill\IRefillPhone
             if ($resp === false) {
                 return [false, '系统错误'];
             }
+
             $status = $resp['status'];
             if ($status === '001') {
                 $order_state = ORDER_STATE_SUCCESS;
@@ -76,12 +85,10 @@ class RefillPhone extends refill\IRefillPhone
                 $order_state = ORDER_STATE_CANCEL;
             } elseif ($status === '002') {
                 $order_state = ORDER_STATE_SEND;
-            } else{
-                $order_state = -1;
-            }
-            if ($order_state == -1) {
+            } else {
                 return [false, $status];
             }
+
             return [true, $order_state];
         }
     }