Merge branch 'rmaster' into rthrid

admin/control/merchant.php

@@ -924,7 +924,12 @@ class merchantControl extends SystemControl
             $tmp[] = array('data'=>$v['card_no']);
             $tmp[] = array('data'=>$this->scard_type($v['card_type']));
             $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['order_time']));
-            $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['notify_time']));
+            if(empty($v['notify_time'])) {
+                $tmp[] = array('data'=>'');
+            }else{
+                $tmp[] = array('data'=>date('Y-m-d H:i:s',$v['notify_time']));
+            }
+
             $tmp[] = array('data'=>$v['official_sn']);
             $tmp[] = array('data'=>orderState($v));
             $tmp[] = array('data'=>$v['mch_amount']);
@@ -1479,9 +1484,11 @@ class merchantControl extends SystemControl
         $condition['vr_order.order_state'] = ORDER_STATE_SEND;
 
         $condition['refill_order.order_time'] = ['lt', (time() - 1800)];
-        $merchant_list = Model('')->table('merchant')->limit(1000)->select();
-        foreach ($merchant_list as $key => $value) {
-            $merchants[$value['mchid']] = $value;
+        if (!empty($_GET['mchid'])) {
+            $condition['refill_order.mchid'] = $_GET['mchid'];
+        }
+        if (!empty($_GET['store_id'])) {
+            $condition['vr_order.store_id'] = $_GET['store_id'];
         }
         $time_cond = [
             ['between', [(time() - 3600), (time() - 1800)]],
@@ -1531,6 +1538,11 @@ class merchantControl extends SystemControl
             ->field('count(*) as order_count ,sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
             ->where($condition)->find();
         $count = $this->refill_stat($condition,$time_cond);
+
+        $merchant_list = Model('')->table('merchant')->limit(1000)->select();
+        foreach ($merchant_list as $key => $value) {
+            $merchants[$value['mchid']] = $value;
+        }
         foreach ($order_list as $order_id => $order_info) {
             $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
             $order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];

admin/templates/default/provider.group.set.php

@@ -24,6 +24,9 @@
                 <th>
                 <a href="JavaScript:void(0);" class="btn" id="emptyBtn"><span>清空</span></a>
                 </th>
+                <th class="w50 align-center">
+                    全选
+                </th>
                 <?php foreach ($output['amounts'] as $amount){?>
                 <th class="w50 align-center"><?php echo $amount;?></th>
                 <?php }?>
@@ -34,9 +37,12 @@
                     <?php foreach ($output['providers'] as $provider){?>
                         <tr class="trFlex">
                             <td class="w180"><?php echo $provider['name'];?></td>
+                            <td class="w50 align-center">
+                                <input type="checkbox" class="w50 checkAll">
+                            </td>
                             <?php foreach ($output['amounts'] as $amount){?>
                             <td class="w50 align-center">
-                                <input type="checkbox" class="w50" name="info[]" style="vertical-align: middle;"
+                                <input type="checkbox" class="w50 input" name="info[]" style="vertical-align: middle;"
                                        value="<?php echo "{$_GET['quality']}-{$provider['provider_name']}-{$provider['card_type']}-{$amount}-{$provider['provider_id']}";?>"
                                        <?php if(in_array("{$_GET['quality']}-{$provider['provider_name']}-{$provider['card_type']}-{$amount}-{$provider['provider_id']}", $output['sel_data'])){ echo 'checked';}?>
                                 />
@@ -84,5 +90,24 @@
                 }
             })
         })
+        // 全选
+        $('.checkAll').click(function () {
+            let hang = $(this).parent().parent().prevAll().length + 1
+            if ($(this).is(':checked')) {
+                $('.input').each(function () {
+                    let inputH = $(this).parent().parent().prevAll().length + 1
+                    if (hang == inputH) {
+                        $(this).attr("checked",true)
+                    }
+                })
+            } else {
+                $('.input').each(function () {
+                    let inputH = $(this).parent().parent().prevAll().length + 1
+                    if (hang == inputH) {
+                        $(this).attr("checked",false)
+                    }
+                })
+            }
+        })
     });
 </script>

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

@@ -378,6 +378,7 @@
             $('input[name="export"]').val('1');
             $('input[name="op"]').val('refill_order');
             $('#formSearch').submit();
+            $('input[name="export"]').val('');
         })
         // 日期选择器
         laydate.render({

docker/conf/nginx/nginx-win-http.conf

@@ -29,7 +29,7 @@ http
     {
     	listen       80;
         set  $folder_name /var/www/html;
-        server_name 192.168.1.195;
+        server_name 192.168.1.195 www.xyxy.com;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;
@@ -83,4 +83,10 @@ http
             include        fastcgi_params;
         }
     }
+
+    server {
+        listen       80;
+        server_name xyxyxy.com;
+        return 301 http://www.xyxy.com;
+    }
 }

docker/conf/nginx/nginx-xyz-https.conf

@@ -131,150 +131,9 @@ http
         }
     }
 
-    server
-        {
-            listen       443 ssl;
-            set  $folder_name /var/www/html;
-            server_name xyzshops.cn;
-            root $folder_name;
-
-            ssl_certificate      cert/www.xyzshops.cn.pem;
-            ssl_certificate_key  cert/www.xyzshops.cn.key;
-
-            ssl_session_cache    shared:SSL:1m;
-            ssl_session_timeout  5m;
-
-            ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;  #使用此加密套件。
-            ssl_protocols TLSv1 TLSv1.1 TLSv1.2;   #使用该协议进行配置。
-            ssl_prefer_server_ciphers on;
-
-            index index.html index.php;
-            client_max_body_size 100m;
-            proxy_connect_timeout 500s;
-            proxy_read_timeout 500s;
-            proxy_send_timeout 500s;
-            fastcgi_connect_timeout 75;
-            fastcgi_read_timeout 600;
-            fastcgi_send_timeout 600;
-
-            charset utf-8;
-
-            location /logs {
-                deny all;
-                return 403;
-            }
-
-            location /data/log {
-                deny all;
-                return 403;
-            }
-            location / {
-                index  index.html index.htm index.php;
-            }
-
-            location /mshop {
-                root $folder_name;
-                autoindex on;
-                index  index.html index.htm index.php;
-                try_files $uri $uri/ /mshop/index.html;
-            }
-
-            location /plot {
-                root $folder_name;
-                proxy_pass         http://172.26.105.127:5000;
-                  proxy_redirect     off;
-
-                proxy_set_header   Host                 $host;
-                proxy_set_header   X-Real-IP            $remote_addr;
-                proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
-                proxy_set_header   X-Forwarded-Proto    $scheme;
-            }
-
-            location /merchant {
-                root $folder_name;
-                autoindex on;
-                index  index.html index.htm index.php;
-                try_files $uri $uri/ /merchant/index.html;
-            }
-            location ~ /mobile/[/\w]+\.php$ {
-                root           $folder_name;
-                fastcgi_pass   docker.hostip:9100;
-                fastcgi_index  index.php;
-                fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-                fastcgi_param  SIGN $http_sign;
-                include fastcgi_params;
-            }
-
-            location ~ /mobile/[/\w]+\.html$ {
-                try_files $uri $uri/ /mobile/index.html;
-            }
-
-            location ~ /racc/[/\w]+\.php$ {
-                root           $folder_name;
-                fastcgi_pass   docker.hostip:9101;
-                fastcgi_index  index.php;
-                fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-                fastcgi_param  SIGN $http_sign;
-                include fastcgi_params;
-            }
-
-            location ~ /mchsrv/[/\w]+\.php$ {
-                root           $folder_name;
-                fastcgi_pass   docker.hostip:9102;
-                fastcgi_index  index.php;
-                fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-                fastcgi_param SIGN $http_sign;
-                include fastcgi_params;
-            }
-
-            location ~ \.php$ {
-                add_header Cache-Control no-store;
-                root           $folder_name;
-                fastcgi_pass   docker.hostip:9000;
-                fastcgi_index  index.php;
-                fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-                include        fastcgi_params;
-            }
-        }
-
-    server
-        {
-            listen       80;
-            set  $folder_name /var/www/html;
-            server_name 121.89.223.81 www.xyzshops.cn xyzshops.cn;
-            root $folder_name;
-
-            index index.html index.php;
-            client_max_body_size 100m;
-            proxy_connect_timeout 500s;
-            proxy_read_timeout 500s;
-            proxy_send_timeout 500s;
-            fastcgi_connect_timeout 75;
-            fastcgi_read_timeout 600;
-            fastcgi_send_timeout 600;
-
-            charset utf-8;
-
-            location /logs {
-                deny all;
-                return 403;
-            }
-
-            location /data/log {
-                deny all;
-                return 403;
-            }
-            location / {
-                index  index.html index.htm index.php;
-            }
-
-            location ~ \.php$ {
-                add_header Cache-Control no-store;
-                root           $folder_name;
-                fastcgi_pass   docker.hostip:9000;
-                fastcgi_index  index.php;
-                fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-                include        fastcgi_params;
-            }
-        }
-}
+    server {
+        listen       443 ssl;
+        server_name xyzshops.cn;
+        return 301 https://www.xyzshops.cn;
+    }
+}

helper/refill/policy/xyz/policy.php

@@ -72,6 +72,9 @@ class policy extends ProviderManager implements IPolicy
                 if (empty($ret)) {
                     return [[],false];
                 }
+                else {
+                    $names = $ret;
+                }
             }
         }