admin update

admin/control/merchant.php

@@ -1689,9 +1689,16 @@ class merchantControl extends SystemControl
         $url = BASE_SITE_URL . '/plot/paths?time_stamp='.$_GET['timestamp'];
         Log::record("successful get where url : {$url}", Log::DEBUG);
         $data = http_request($url);
+        if(empty($data)){
+            echo(json_encode([]));
+            exit;
+        }
         preg_match_all('/\d{10}\/[a-z]+\/\d{1,2}\/\d\/\d{2,4}/', $data, $matches);
         $conds = $matches[0];
-        if(empty($conds)) return [];
+        if(empty($conds)){
+            echo(json_encode([]));
+            exit;
+        }
         foreach ($conds as $cond) {
             $arr = explode('/',$cond);
             $chname[] = $arr[1];

admin/control/provider_group.php

@@ -49,6 +49,29 @@ class provider_groupControl extends SystemControl
         Tpl::showpage('provider.group.add');
     }
 
+    public function editOp()
+    {
+        $group_id = $_GET['group_id'] ?? $_POST['group_id'];
+        $mod = Model('provider_group');
+        $group = $mod->getProviderGroup(['group_id' => $group_id]);
+        if(empty($group)) {
+            showMessage('通道组不存在');
+        }
+        if(chksubmit()) {
+            $updata['group_name'] = trim($_POST['group_name']);
+            $updata['bz'] = trim($_POST['bz']);
+            $result = $mod->editGroup($group_id, $updata);
+            if ($result) {
+                showMessage('编辑成功', 'index.php?act=provider_group&op=index');
+            } else {
+                showMessage('编辑失败');
+            }
+        }else{
+            Tpl::output('group', $group);
+            Tpl::showpage('provider.group.edit');
+        }
+    }
+
     public function provider_chooseOp()
     {
         $group_id = $_GET['group_id'];

admin/include/menu.php

@@ -103,7 +103,7 @@ $arr = array(
 					array('args'=>'stats,card_key,merchant',				'text'=>'卡密管理'),
 					array('args'=>'index,refill_stock,merchant',			'text'=>'库存管理'),
 					array('args'=>'provider_successful,merchant,merchant',	'text'=>'成功率监控'),
-					
+
 				)
 			),
 			4 => array(

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

@@ -0,0 +1,74 @@
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>通道组管理</h3>
+            <ul class="tab-base">
+                <li><a href="index.php?act=provider_group&op=index"><span><?php echo $lang['nc_manage'] ?></span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_update'] ?></span></a></li>
+            </ul>
+        </div>
+    </div>
+    <div class="fixed-empty"></div>
+    <form id="user_form" enctype="multipart/form-data" method="post">
+        <input type="hidden" name="form_submit" value="ok"/>
+        <input type="hidden" name="group_id" value="<?php echo $_GET['group_id'];?>">
+        <table class="table tb-type2">
+            <tbody>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="name">通道组名称:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="<?php echo $output['group']['group_name'];?>" name="group_name" id="group_name" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+
+            <tr>
+                <td colspan="2" class="required"><label>备注信息:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><textarea name="bz" rows="6" class="tarea"><?php echo $output['group']['bz'];?></textarea></td>
+                <td class="vatop tips">通道组备注信息</td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr class="tfoot">
+                <td colspan="15"><a href="JavaScript:void(0);" class="btn" id="submitBtn"><span><?php echo $lang['nc_submit']; ?></span></a></td>
+            </tr>
+            </tfoot>
+        </table>
+    </form>
+</div>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/dialog/dialog.js" id="dialog_js"
+        charset="utf-8"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/jquery.ui.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/ajaxfileupload/ajaxfileupload.js"></script>
+<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.js"></script>
+<link href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery.Jcrop/jquery.Jcrop.min.css" rel="stylesheet" type="text/css"
+      id="cssfile2"/>
+<script type="text/javascript">
+    $(function () {
+        //按钮先执行验证再提交表单
+        $("#submitBtn").click(function () {
+            if ($("#user_form").valid()) {
+                $("#user_form").submit();
+            }
+        });
+        $('#user_form').validate({
+            errorPlacement: function (error, element) {
+                error.appendTo(element.parent().parent().prev().find('td:first'));
+            },
+            rules: {
+                group_name: {
+                    required: true
+                }
+            },
+            messages: {
+                group_name: {
+                    required: '通道组名称不能为空',
+                },
+            }
+        });
+    });
+</script>

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

@@ -51,6 +51,7 @@
             <tr class="thead">
                 <th>通道组ID</th>
                 <th>通道组名称</th>
+                <th>备注信息</th>
                 <th class="align-center">添加日期</th>
                 <th class="align-center">操作</th>
             </tr>
@@ -61,9 +62,11 @@
                     <tr class="trFlex">
                         <td><?php echo $v['group_id']; ?></td>
                         <td><?php echo $v['group_name']; ?></td>
+                        <td><?php echo $v['bz']; ?></td>
                         <td class="nowarp align-center"><?php echo $v['add_time'] ? date('Y-m-d H:i', $v['add_time']) : $lang['no_limit']; ?></td>
                         <td class="align-center w200">
-                           <a href="index.php?act=provider_group&op=provider_choose&group_id=<?php echo $v['group_id'] ?>">编辑组内通道</a>
+                            <a href="index.php?act=provider_group&op=edit&group_id=<?php echo $v['group_id'] ?>">编辑</a>
+                           | <a href="index.php?act=provider_group&op=provider_choose&group_id=<?php echo $v['group_id'] ?>">编辑组内通道</a>
                         </td>
                     </tr>
                 <?php } ?>

admin/templates/default/provider.successful.php

@@ -112,10 +112,11 @@
         let stamp = new Date(timestr).getTime()/1000
         $("select[name=time_stamp]").val(stamp)
         $("select[name=time_hour]").val(hour)
-        // console.log('frontOneHour', frontOneHour,hour, stamp);
+        console.log('frontOneHour', frontOneHour,hour, stamp);
         let t = stamp + hour*3600
         let interval = $("select[name=interval]").val()
         let s = window.location.origin + "/plot/index?time_stamp=" + t + "&interval=" + interval
+        TimeGetWhere(stamp)
         $.get( s, function (data){
             if (!data) {
                 return
@@ -123,10 +124,8 @@
             $('iframe').attr('src',s)
         });
 
-        $('#timeSelect').change(function () {
-            let val = $(this).val()
-            // console.log('val', val);
-            $.get("index.php?act=merchant&op=successful_time_get_where&timestamp="+val, function (data){
+        function TimeGetWhere(time){
+            $.get("index.php?act=merchant&op=successful_time_get_where&timestamp="+time, function (data){
                 if (!data) {
                     return
                 }
@@ -156,6 +155,12 @@
                 }
                 // console.log('data1', data);
             });
+        }
+
+        $('#timeSelect').change(function () {
+            let val = $(this).val()
+            // console.log('val', val);
+            TimeGetWhere(val);
         })
         $('#ncsubmit').click(function () {
             let time_stamp = $("select[name=time_stamp]").val()

data/model/provider_group.model.php

@@ -19,6 +19,10 @@ class provider_groupModel extends Model
         return $this->insert($insert);
     }
 
+    public function editGroup($group_id, $data){
+        return $this->where(['group_id' => $group_id])->update($data);
+    }
+
     public function getGroupList($condition, $page = null, $order = '', $field = '*', $limit = '')
     {
         return $this->field($field)->where($condition)->order($order)->limit($limit)->page($page)->select();