Merge branch 'rmaster' of 39.97.239.116:gyfl/xyzshop into rmaster

admin/control/refill_order.php

@@ -35,6 +35,9 @@ class refill_orderControl extends SystemControl
             $condition['refill_order.card_no'] = $_GET['card_no'];
             $fSingle = true;
         }
+        if (!empty($_GET['no_mchid'])) {
+            $condition['refill_order.mchid'] = ['not in', [$_GET['no_mchid']]];
+        }
 
         if (!empty($_GET['mchid'])) {
             $condition['refill_order.mchid'] = $_GET['mchid'];

admin/control/refill_successful.php

@@ -82,7 +82,7 @@ class refill_successfulControl extends SystemControl
                 $merchant_name = $merchants[$mchid]['company_name'] == '' ? $merchants[$mchid]['name'] : $merchants[$mchid]['company_name'];
                 $mchname[$mchid] = "{$mchid}-{$merchant_name}";
             }
-            sort($mchname);
+            asort($mchname);
             $result['chname'] = $mchname;
         }
         $amountData = array_unique($amount);

admin/templates/default/css/recharge.css

@@ -32,6 +32,7 @@
 .mw156 {min-width:156px;}
 .mw160 {min-width:160px;}
 .mw165 {min-width:165px;}
+.mw180 {min-width:180px;}
 .mw1250 {min-width:1250px;}
 
 /* 样式 */

admin/templates/default/merchant.sel.group.php

@@ -26,22 +26,22 @@
             <tr class="noborder">
                 <td colspan="2" class="required"><label class="validation" for="name">选择通道组:</label></td>
             </tr>
+            <?php if(!empty($output['group_list'])){?>
+            <?php foreach ($output['group_list'] as $group) {?>
             <tr class="noborder" style="display:block;height:auto">
-                <?php if(!empty($output['group_list'])){?>
-                <?php foreach ($output['group_list'] as $group) {?>
-                    <td class="w130 mw130 inblock">
-                        <span>
-                            <label>
-                                <?php echo $group['group_name'];?>：
-                                <input type="checkbox" name="sel[]" data-name="unicom" id="unicom_cb_all" value="<?php echo $group['group_id'];?>"
-                                       <?php if(in_array($group['group_id'], $output['group_ids'])){ echo 'checked';}?>
-                                >
-                            </label>
-                        </span>
-                    </td>
-                    <?php }?>
-                <?php }?>
+                <td class="w180 mw180 inblock">
+                    <span>
+                        <label>
+                            <input type="checkbox" name="sel[]" data-name="unicom" id="unicom_cb_all" value="<?php echo $group['group_id'];?>"
+                            <?php if(in_array($group['group_id'], $output['group_ids'])){ echo 'checked';}?>
+                            >
+                            <?php echo $group['group_name'];?>
+                        </label>
+                    </span>
+                </td>
             </tr>
+            <?php }?>
+            <?php }?>
             </tbody>
             <tfoot style="border-top: 1px solid #CBE9F3;">
             <tr class="tfoot w200" style="display: block;">

admin/templates/default/provider.successful.php

@@ -12,13 +12,14 @@
     <div style="margin-top: 10px;color: #e60d0d;">
         请先选择时间
     </div>
-    <form method="get" action="index.php" name="formSearch" id="formSearch">
+    <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
         <table class="tb-type1 noborder search tableFixed">
             <tr>
                 <th><label>起始日期</label></th>
                 <td>
                     <select name="time_stamp" id="timeSelect">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1621440000">2021-05-20</option>
                         <?php foreach ($output['days'] as $day => $txt) {?>
                             <option value="<?php echo $day; ?>"><?php echo $txt; ?></option>
                         <?php }?>
@@ -86,9 +87,9 @@
             </tr>
         </table>
     </form>
-    <div>
-        <iframe
-            src="" scrolling="no" id="Iframe" frameborder="0"></iframe>
+    <div id="box">
+        <!-- <iframe
+            src="https://www.xyzshops.cn/plot/index?time_stamp=1621488600&interval=60" scrolling="no" id="Iframe" frameborder="0"></iframe> -->
     </div>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
@@ -101,15 +102,16 @@
 <script type="text/javascript">
     $(function () {
 
-        $("#Iframe").load(function(){
-            $(this).css("min-height", '900px')
-            $(this).css("min-width", '1650px')
-            // var iframeHeight = $(this).contents().find("html").height();
-            // var iframeWidth = $(this).contents().find("html").scrollWidth;
-            // $(this).attr("height",iframeHeight) 
-            // $(this).attr("width",iframeWidth) 
-            // console.log('iframeHeight', iframeHeight, iframeWidth);
-        });
+        // $("#Iframe").load(function(){
+        //     $(this).css("min-height", '900px')
+        //     $(this).css("min-width", '1650px')
+        //     // var iframeHeight = $(this).contents().find("html").height();
+        //     // var iframeWidth = $(this).contents().find("html").scrollWidth;
+        //     // $(this).attr("height",iframeHeight) 
+        //     // $(this).attr("width",iframeWidth) 
+        //     // console.log('iframeHeight', iframeHeight, iframeWidth);
+        // });
+        
         //默认获取 当前日期 当前时间点前一个小时， 间隔15 900
         // 前15分钟
         let frontOneHour = new Date(new Date().getTime() - 15 * 60 * 1000)
@@ -132,7 +134,8 @@
             if (!data) {
                 return
             }
-            $('iframe').attr('src',s)
+            // $('iframe').attr('src',s)
+            $('#box').html(data)
         });
 
         function TimeGetWhere(time){
@@ -209,7 +212,8 @@
                 if (!data) {
                     return
                 }
-                $('iframe').attr('src',src)
+                // $('iframe').attr('src',src)
+                $('#box').html(data)
             });
         });
     })

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

@@ -69,6 +69,17 @@
                         <?php }?>
                     </select>
                 </td>
+                <th><label>不包含客户</label></th>
+                <td>
+                    <select name="no_mchid" class="querySelect">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <?php foreach($output['merchant_list'] as $merchant){?>
+                            <option value="<?php echo $merchant['mchid']?>"
+                                    <?php if ($_GET['no_mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
+                            </option>
+                        <?php }?>
+                    </select>
+                </td>
             </tr>
             <tr>
                 <th><label>充值卡卡号</label></th>

admin/templates/default/refill_stock.php

@@ -29,7 +29,7 @@
                     </label>
                 </td>
             </tr>
-            <tr class="noborder">
+            <tr class="noborder trStatus" style="margin-bottom:0;">
                 <?php foreach ($output['refill_oil_specs'] as $amount) {?>
                 <td class="moneySum w160">
                     <div class="align-center"><?php echo $amount;?></div>
@@ -54,7 +54,7 @@
                 </td>
                 <?php }?>
             </tr>
-            <tr class="noborder w500">
+            <tr class="noborder w500 trStatus" style="margin-bottom:0;">
                 <td>
                     余额：<span id="total"><?php echo $output['total_stock']['total'];?></span>
                 </td>

admin/templates/default/system.successful.php

@@ -12,7 +12,7 @@
     <div style="margin-top: 10px;color: #e60d0d;">
         请先选择时间
     </div>
-    <form method="get" action="index.php" name="formSearch" id="formSearch">
+    <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
         <table class="tb-type1 noborder search tableFixed">
             <tr>
                 <th><label>起始日期</label></th>
@@ -86,9 +86,9 @@
             </tr>
         </table>
     </form>
-    <div>
-        <iframe
-            src="" scrolling="no" id="Iframe" frameborder="0"></iframe>
+    <div id="box">
+        <!-- <iframe
+            src="" scrolling="no" id="Iframe" frameborder="0"></iframe> -->
     </div>
 </div>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/laydate/laydate.js"></script>
@@ -101,15 +101,16 @@
 <script type="text/javascript">
     $(function () {
 
-        $("#Iframe").load(function(){
-            $(this).css("min-height", '900px')
-            $(this).css("min-width", '1650px')
-            // var iframeHeight = $(this).contents().find("html").height();
-            // var iframeWidth = $(this).contents().find("html").scrollWidth;
-            // $(this).attr("height",iframeHeight) 
-            // $(this).attr("width",iframeWidth) 
-            // console.log('iframeHeight', iframeHeight, iframeWidth);
-        });
+        // $("#Iframe").load(function(){
+        //     $(this).css("min-height", '900px')
+        //     $(this).css("min-width", '1650px')
+        //     // var iframeHeight = $(this).contents().find("html").height();
+        //     // var iframeWidth = $(this).contents().find("html").scrollWidth;
+        //     // $(this).attr("height",iframeHeight) 
+        //     // $(this).attr("width",iframeWidth) 
+        //     // console.log('iframeHeight', iframeHeight, iframeWidth);
+        // });
+
         //默认获取 当前日期 当前时间点前一个小时， 间隔15 900
         // 前15分钟
         let frontOneHour = new Date(new Date().getTime() - 15 * 60 * 1000)
@@ -132,7 +133,8 @@
             if (!data) {
                 return
             }
-            $('iframe').attr('src',s)
+            // $('iframe').attr('src',s)
+            $('#box').html(data)
         });
 
         function TimeGetWhere(time){
@@ -209,7 +211,8 @@
                 if (!data) {
                     return
                 }
-                $('iframe').attr('src',src)
+                // $('iframe').attr('src',src)
+                $('#box').html(data)
             });
         });
     })

data/config/win/base.ini.php

@@ -10,11 +10,11 @@ define('BONUS_EXPIRY_DATE',true);
 define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
 define('CROSS_DOAMIN',true);
-define('COOKIE_DOMAIN','192.168.1.195');
+define('COOKIE_DOMAIN','192.168.1.232');
 define('COMPANY_NAME', 'XYZ_COMPANY');
 define('NET_IP','125.33.203.108');
 
-$SRV_HOST = 'http://192.168.1.195';
+$SRV_HOST = 'http://192.168.1.232';
 $REMOTE_IMG_HOST = $SRV_HOST;
 
 $config = [];

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 www.xyxy.com;
+        server_name 192.168.1.232 www.xyxy.com;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;

helper/fcgisrv/MerchantServer.php

@@ -61,7 +61,7 @@ class MerchantServer extends BaseServer
             if(file_exists($file))
             {
                 if(defined('CROSS_DOAMIN') && CROSS_DOAMIN == true) {
-                    $host = 'http://192.168.1.130:3333';
+                    $host = 'http://192.168.1.146:3333';
                     fcgi_header("Access-Control-Allow-Headers:DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type, Accept-Language, Origin, Accept-Encoding");
                     fcgi_header("Content-Type: text/html; charset=UTF-8");
                     fcgi_header("Access-Control-Allow-Credentials: true");

helper/refill/api/xyz/weiyi/RefillCallBack.php

@@ -36,10 +36,9 @@ class RefillCallBack implements refill\IRefillCallBack
             return [false, false, false,false];
         }
         $order_id = $order_info['order_id'];
-        
-        $data['official_sn'] = strtolower($params['serialno']) == 'null' ? '' : $params['serialno'];
 
         if ($status === 2) {
+            $data['official_sn'] = strtolower($params['serialno']) == 'null' ? '' : $params['serialno'];
             Model('refill_order')->edit($order_id, $data);
             return [$order_id, true, false,true];
         }

helper/refill/api/xyz/weiyi/RefillPhone.php

@@ -23,7 +23,7 @@ class RefillPhone extends refill\IRefillPhone
         $params['version'] = '1.0';
         $params['packcode'] = $amount;
         $params['mobile'] = $phone;
-        $params['flowtype'] = '1001';
+        $params['flowtype'] = 'fee_quick';
         $params['callback_url'] = config::NOTIFY_URL;
         return $params;
     }

helper/refill/api/xyz/weiyi/config.php

@@ -6,11 +6,11 @@ namespace refill\weiyi;
 
 class config
 {
-    const ORDER_URL = 'http://115.28.209.246:8081/api/charge.do';
-    const QUERY_URL = 'http://115.28.209.246:8081/api/query_chargestate.do';
+    const ORDER_URL = 'http://47.118.78.137:6066/fee/api/charge.do';
+    const QUERY_URL = 'http://47.118.78.137:6066/fee/api/query_state.do';
 
-    const USER_ID = '8177b4b1d0254c0699bc';
-    const KEY = '0fa29cd709df4ae4b592';
+    const USER_ID = '1f68bb3452134a6cbaa4';
+    const KEY = '8919a04a43b447ffae78';
     const NOTIFY_URL = BASE_SITE_URL . "/mobile/refill_weiyi.php";
 //    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/signature.php";
     const ExtHeaders = ['Content-Type: application/json'];

helper/refill/api/xyz/weiyi/维一接口.txt

@@ -0,0 +1,20 @@
+账户名：guoyanfanglue2
+
+编码：1f68bb3452134a6cbaa4
+
+密码：a123456
+
+秘钥：8919a04a43b447ffae78
+
+手工提单密码：1234512345
+
+
+
+商户登录地址：http://47.118.78.137:6066/fee/agent/login.do
+
+
+充值请求地址：47.118.78.137:6066
+
+订单查询地址：47.118.78.137:6066
+
+余额查询地址：47.118.78.137:6066

test/TestRefill.php

@@ -300,11 +300,11 @@ class TestRefill extends TestCase
     public function testWeiyiPhone()
     {
         $providers = new refill\weiyi\RefillPhone([]);
-        $resp = $providers->add(18500608333, 5, 100, ['order_sn' => $this->make_sn()]);
-//        $resp = $providers->query(['order_sn' => '59031616396534854303']);
-//        $body = '{"userid":"8177b4b1d0254c0699bc","ordernum":"59031616396534854303","mobile":"18500608333","timestamp":"20210322150437","state":"3","desc":"%E5%A4%B1%E8%B4%A5%3A%E5%A4%B1%E8%B4%A5","sign":"1d412f956c041bf4454357b209c93df6"}';
-//        $params = json_decode($body , true);
-//        refill\RefillFactory::instance()->notify('weiyi',$params);
+//        $resp = $providers->add(13699279618, 4, 50, ['order_sn' => $this->make_sn()]);
+//        $resp = $providers->query(['order_sn' => '90401621489214002876']);
+        $body = '{"userid":"1f68bb3452134a6cbaa4","ordernum":"90401621489214002876","mobile":"13699279618","timestamp":"20210520134039","state":"2","desc":"%E5%85%85%E5%80%BC%E6%88%90%E5%8A%9F","sign":"865e8d886b92e019df1d039fccf8df46"}';
+        $params = json_decode($body , true);
+        refill\RefillFactory::instance()->notify('weiyi',$params);
     }
 
     public function testWeiyimanPhone()