Merge branch 'ralbex' into rtest

admin/control/refill_evidence.php

@@ -101,7 +101,7 @@ class refill_evidenceControl extends SystemControl
         Tpl::output('stats', $stats);
         Tpl::output('receive_bank_text', $receive_bank_text);
         Tpl::output('evidence_list', $evidence_list);
-        Tpl::output('page', $model_merchant->showpage('2'));
+        Tpl::output('page', $model_merchant->showpage());
         Tpl::showpage('merchant.refill.evidence_list');
     }
 

admin/control/refill_third.php

@@ -131,11 +131,20 @@ class refill_thirdControl extends SystemControl
             } else {
                 $store = trim($_POST['store']);
                 $store = explode('-',$store);
+                $store_id = $store[0];
+                $channel_name = $store[1];
+                $goods_id = trim($_POST['goods_id']);
+                $channel_product = Model('thrid_refill')->getProviderProduct($store_id,$goods_id,$system_code);
+                if(!empty($channel_product)) {
+                    showMessage('此通道已关联过此产品');
+                    exit;
+                }
+
                 $mod = Model('refill_third');
-                $insert['channel_name'] = $store[1];
-                $insert['store_id'] = $store[0];
+                $insert['channel_name'] = $channel_name;
+                $insert['store_id'] = $store_id;
                 $insert['channel_product_name'] = trim($_POST['channel_product_name']);
-                $insert['goods_id'] = trim($_POST['goods_id']);
+                $insert['goods_id'] = $goods_id;
                 $insert['channel_code'] = trim($_POST['channel_code']);
                 $insert['channel_amount'] = trim($_POST['channel_amount']);
                 $insert['recharge_type'] = trim($_POST['recharge_type']);
@@ -154,4 +163,28 @@ class refill_thirdControl extends SystemControl
             Tpl::showpage('third.proprice.add');
         }
     }
+
+    public function third_proprice_editOp()
+    {
+        $system_code = $_GET['system_code'] ?? $_POST['system_code'];
+        $mod = Model('refill_third');
+        $third_product = $mod->findThirdProduct($system_code);
+        if(empty($third_product)) {
+            showMessage('产品不存在');
+        }
+        $store_id = $_GET['store_id'];
+        $goods_id = $_GET['goods_id'];
+        $channel_product = Model('thrid_refill')->getProviderProduct($store_id,$goods_id,$system_code);
+        if(empty($channel_product)) {
+            showMessage('此通道关联产品不存在');
+        }
+
+        if (chksubmit()) {
+
+        } else {
+            Tpl::output('third_product', $third_product);
+            Tpl::output('channel_product', $channel_product);
+            Tpl::showpage('third.proprice.edit');
+        }
+    }
 }

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

@@ -87,8 +87,8 @@
             <tr>
                 <th><label for="mchid">机构名称</label></th>
                 <td  class="layui-form">
-                    <select name="mchid" class="querySelect" lay-verify="" lay-search>
-                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                    <select id="mch_name" name="mchid" class="querySelect" lay-verify="" lay-search>
+                        <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['mchid'] == $merchant['mchid']){ ?>selected<?php } ?>><?php echo $merchant['company_name'] == '' ? $merchant['name'] : $merchant['company_name'];?>
@@ -98,7 +98,7 @@
                 </td>
                 <th><label for="state_sel">申请状态</label></th>
                 <td>
-                    <select name="state_sel">
+                    <select name="state_sel" id="state_text">
                         <option value="">请选择...</option>
                         <option value="1" <?php if($_GET['state_sel'] == '1'){ echo 'selected';}?>>申请中</option>
                         <option value="2" <?php if($_GET['state_sel'] == '2'){ echo 'selected';}?>>已通过</option>
@@ -108,7 +108,7 @@
                 </td>
                 <th><label for="add_type">预存类型</label></th>
                 <td>
-                    <select name="add_type">
+                    <select name="add_type" id="storage_text">
                         <option value="">请选择...</option>
                         <option value="1" <?php if($_GET['add_type'] == '1'){ echo 'selected';}?>>商户预存</option>
                         <option value="2" <?php if($_GET['add_type'] == '2'){ echo 'selected';}?>>后台手动预存</option>
@@ -117,14 +117,14 @@
                 </td>
                 <th><label for="is_bank">转款类型</label></th>
                 <td>
-                    <select name="is_bank">
+                    <select name="is_bank" id="transfer_text">
                         <option value="">请选择...</option>
                         <option value="1" <?php if($_GET['is_bank'] == '1'){ echo 'selected';}?>>银行转账</option>
                     </select>
                 </td>
                 <th><label for="receive_bank">收款银行</label></th>
                 <td>
-                    <select name="receive_bank">
+                    <select name="receive_bank" id="bank_text">
                         <option value="">请选择...</option>
                         <?php foreach($output['receive_bank_text'] as $key => $value){?>
                         <option value="<?php echo $key+1;?>" <?php if($_GET['receive_bank'] == ($key+1)){ echo 'selected';}?>><?php echo $value;?></option>
@@ -300,7 +300,8 @@
         // 日期选择器
         laydate.render({
             elem: '#startTime',
-            type: 'datetime'
+            type: 'datetime',
+
         });
         laydate.render({
             elem: '#endTime',
@@ -405,24 +406,47 @@
         $('#ncexport').click(function () {
             let starTime = $('input[name="query_start_time"]').val()
             let endTime = $('input[name="query_end_time"]').val()
-            let mch_name = $('input[name="mch_name"]').val();
-            let state_text = $('select option:selected').text();
-            let state_sel = $('select').val();
+            let mchid = $('#mch_name').val();
+            let state_sel = $('#state_text').val();
+            let add_type = $('#storage_text').val();
+            let is_bank = $('#transfer_text').val();
+            let receive_bank = $('#bank_text').val();
+
+            let mch_name = $('#mch_name option:selected').text();
+            let state_text = $('#state_text option:selected').text();
+            let storage_text = $('#storage_text option:selected').text();
+            let transfer_text = $('#transfer_text option:selected').text();
+            let bank_text = $('#bank_text option:selected').text();
+            console.log("机构", mch_name);
             $.get('index.php?act=refill_evidence&op=index&export=1', {
                 query_start_time: starTime,
                 query_end_time: endTime,
-                mch_name: mch_name,
-                state_sel: state_sel
+                mchid: mchid,
+                state_sel: state_sel,
+                add_type: add_type,
+                is_bank: is_bank,
+                receive_bank: receive_bank
             }, function (data) {
                 data = JSON.parse(data)
+                console.log(data);
                 if (data && data.data) {
                     let head = ['北京椰子电子商务有限责任公司']
                     if (mch_name) {
+                        
                         head.push('机构名称：' + mch_name)
                     }
-                    if (state_text && state_sel) {
+                    if (state_text && state_text != "请选择...") {
                         head.push('申请状态：' + state_text)
                     }
+                    if (storage_text  && storage_text != "请选择...") {
+                        head.push('预存类型：' + storage_text)
+                    }
+                    if (transfer_text  && transfer_text != "请选择...") {
+                        head.push('转款类型：' + transfer_text)
+                    }
+                    if (bank_text  && bank_text != "请选择...") {
+                        head.push('收款银行：' + bank_text)
+                    }
                     let time = ''
                     if (starTime && endTime) {
                         time = '下单时间：'+$('input[name="query_start_time"]').val()+' - '+$('input[name="query_end_time"]').val()

admin/templates/default/third.proprice.edit.php

@@ -0,0 +1,175 @@
+<?php defined('InShopNC') or exit('Access Invalid!'); ?>
+<style>
+    .layui-form-select .layui-input {
+        padding: 13px 5px;
+    }
+    .layui-form-select dl {
+        top: 29px !important;
+    }
+    .layui-form-select {
+        width: 85%;
+    }
+    .layui-select-title {
+        width: 100%;
+    }
+    .page .fixed-bar .item-title h3 {
+        margin-top: 18px !important;
+        margin-bottom: 10px !important;
+        font-weight: 700 !important;
+    }
+    .tab-base li span {
+        font-size: 12px !important;
+    }
+</style>
+<div class="page">
+    <div class="fixed-bar">
+        <div class="item-title">
+            <h3>增值业务管理</h3>
+            <ul class="tab-base">
+                <li><a href="index.php?act=refill_third&op=third_proprice&system_code=<?php echo $_GET['system_code'];?>"><span>通道产品列表</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"  class="layui-form">
+        <input type="hidden" name="form_submit" value="ok"/>
+        <table class="table tb-type2">
+            <tbody>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label for="product_name">产品名称:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><?php echo $output['third_product']['product_name'];?></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label for="refill_amount">产品面值:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td><?php echo $output['third_product']['refill_amount'];?></td>
+                <td class="vatop tips"></td>
+            </tr>
+
+            <tr class="noborder">
+                <td colspan="2" class="required"><label for="store">上游选择:</label></td>
+            </tr>
+            <tr class="">
+                <td class="vatop rowform"><?php echo $output['channel_product']['channel_name'];?></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="goods_id">商品ID:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="" name="goods_id" id="goods_id" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="channel_product_name">通道产品名称:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="" name="channel_product_name" id="channel_product_name" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="channel_code">通道code:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="" name="channel_code" id="channel_code" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr>
+                <td colspan="2" class="required"><label class="validation" for="channel_amount">折扣价格:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" id="channel_amount" name="channel_amount" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+
+            <tr>
+                <td colspan="2" class="required"><label class="validation" for="recharge_type">充值类型:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td>
+                    <select name="recharge_type" id="recharge_type">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1">直充</option>
+                        <option value="2">卡密</option>
+                        <option value="3">直充+卡密</option>
+                    </select>
+                </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>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
+<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: {
+                store: {
+                    required: true,
+                },
+                channel_product_name: {
+                    required: true,
+                },
+                goods_id: {
+                    required: true,
+                },
+                channel_code: {
+                    required: true,
+                },
+                channel_amount: {
+                    required: true,
+                },
+                recharge_type: {
+                    required: true,
+                },
+            },
+            messages: {
+                store: {
+                    required: '必须选择上游通道',
+                },
+                channel_product_name: {
+                    required: '通道产品名称不能为空',
+                },
+                goods_id: {
+                    required: '商品ID不能为空',
+                },
+                channel_code: {
+                    required: '通道code不能为空',
+                },
+                channel_amount: {
+                    required: '折扣价格不能为空',
+                },
+                recharge_type: {
+                    required: '充值类型不能为空',
+                },
+            }
+        });
+    });
+</script>

admin/templates/default/third.proprice.list.php

@@ -90,7 +90,7 @@
                         <td><?php echo $v['channel_amount']; ?></td>
                         <td><?php echo $output['recharge_type_text'][$v['recharge_type']-1]; ?></td>
                         <td class="align-center w200">
-<!--                            <a href="index.php?act=refill_third&op=third_proprice_edit&system_code=--><?php //echo $v['system_code'] ?><!--">编辑</a>-->
+<!--                            <a href="index.php?act=refill_third&op=third_proprice_edit&system_code=--><?php //echo $v['system_code'] ?><!--&store_id=--><?php //echo $v['store_id'];?><!--&goods_id=--><?php //echo $v['goods_id'];?><!--">编辑</a>-->
 <!--                           | <a href="index.php?act=refill_third&op=third_proprice&system_code=--><?php //echo $v['system_code'] ?><!--">编辑上游产品</a>-->
                         </td>
                     </tr>

data/config/win/refill.ini.php

@@ -849,16 +849,16 @@ $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '7',
-    'amount' => [
-        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '4',
+    'amount' => [
+        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 

data/config/xyz/refill.ini.php

@@ -849,16 +849,16 @@ $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '7',
-    'amount' => [
-        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '4',
+    'amount' => [
+        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 

data/config/xyzadm/refill.ini.php

@@ -849,16 +849,16 @@ $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '7',
-    'amount' => [
-        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 7, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+$jumi_phone = ['name' => 'jumikc', 'store_id' => 47, 'qualitys' => '4',
+    'amount' => [
+        10 => [['goods_id' => 6545, 'price' => 9.53, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        20 => [['goods_id' => 6546, 'price' => 19.06, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        30 => [['goods_id' => 6547, 'price' => 28.59, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6526, 'price' => 47.65, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6527, 'price' => 95.3, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6528, 'price' => 190.6, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6548, 'price' => 285.9, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6549, 'price' => 476.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];