admin update

admin/control/ordersendlist.php

@@ -111,6 +111,9 @@ class ordersendlistControl extends SystemControl
     public function neterr_orderOp()
     {
         $model_refill_order = Model('refill_order');
+        if(!empty($_GET['store_id'])) {
+            $condition['vr_order.store_id'] = $_GET['store_id'];
+        }
         $condition['refill_order.inner_status'] = 0;
         $condition['refill_order.neterr'] = 1;
         $condition['vr_order.order_state'] = ORDER_STATE_PAY;
@@ -119,6 +122,14 @@ class ordersendlistControl extends SystemControl
         $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
         $order_list = $this->orderFormat($order_list,$merchant_list);
 
+        $provider_list = Model('')->table('refill_provider,store')
+            ->field('refill_provider.*,store.store_name')
+            ->join('inner')
+            ->on('store.store_id=refill_provider.store_id')
+            ->order('name asc')
+            ->limit(1000)
+            ->select();
+        Tpl::output('provider_list', $provider_list);
         Tpl::output('order_list', $order_list);
         Tpl::output('show_page', $model_refill_order->showpage());
         Tpl::showpage('refill.order.neterr.index');

admin/control/refill_order.php

@@ -306,22 +306,6 @@ class refill_orderControl extends SystemControl
         exit(json_encode($res));
     }
 
-    public function batch_disposeOp()
-    {
-        $model_refill_order = Model('refill_order');
-        $condition = [];
-        $condition['refill_order.mchid'] = 10153;
-        $condition['refill_order.card_type'] = mtopcard\ChinaMobileCard;
-        $condition['vr_order.store_id'] = 60;
-        $condition['vr_order.order_state'] = ORDER_STATE_SEND;
-        $condition['refill_order.order_time'] = [['egt', 1624377600], ['lt', 1624521600], 'and'];
-        $order_list = $model_refill_order->getMerchantOrderList($condition);
-//        foreach ($order_list as $order) {
-//            refill\util::manual_success($order['order_id']);
-//        }
-        showMessage('操作成功');
-    }
-
     public function showOrdersOp()
     {
         $order_sn = $_GET['order_sn'] ?? '';

admin/control/refill_order_manual.php

@@ -71,4 +71,43 @@ class refill_order_manualControl extends SystemControl
 
         showMessage('操作成功');
     }
+
+    public function refill_order_batchOp()
+    {
+        if (chksubmit()) {
+            $model_refill_order = Model('refill_order');
+            $condition = [];
+            $type = $_POST['type'];
+            $order_sn = $_POST['order_sn'];
+            $order_sn = str_replace(["\r\n", "\r", "\n"], ",", $order_sn);
+            $condition['refill_order.order_sn'] = ['in', $order_sn];
+
+            if($type != 'notify') {
+                $condition['vr_order.order_state'] = ORDER_STATE_SEND;
+            }
+            $order_list = $model_refill_order->getMerchantOrderList($condition,'','refill_order.*,vr_order.order_state');
+            if($type == 'success') {
+                foreach ($order_list as $order) {
+                    refill\util::manual_success($order['order_id']);
+                }
+            } elseif ($type == 'cancel') {
+                foreach ($order_list as $order) {
+                    refill\util::manual_cancel($order['order_id']);
+                }
+            } elseif ($type == 'notify'){
+                foreach ($order_list as $order) {
+                    if ($order['order_state'] == ORDER_STATE_SEND) {
+                        QueueClient::push("QueryRefillState", ['order_id' => $order['order_id']]);
+                    } else {
+                        QueueClient::push("NotifyMerchantComplete", ['order_id' => $order['order_id'], 'manual' => true]);
+                    }
+                }
+            } else {
+                showMessage('手动操作类型错误');
+            }
+            showMessage('操作成功');
+        } else {
+            Tpl::showpage('refill.order.batch');
+        }
+    }
 }

admin/templates/default/merchant.edit.php

@@ -17,17 +17,17 @@
         <table class="table tb-type2">
             <tbody>
             <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation" for="name">机构账号:</label></td>
+                <td colspan="2" class="required"><label class="validation" for="name">机构公司名称:</label></td>
             </tr>
             <tr class="noborder">
-                <td class="vatop"><?php echo $output['merchant']['name'];?></td>
+                <td class="vatop"><input type="text" value="<?php echo $output['merchant']['company_name'];?>" name="company_name" id="company_name" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
             <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation" for="name">机构公司名称:</label></td>
+                <td colspan="2" class="required"><label class="validation" for="name">机构账号:</label></td>
             </tr>
             <tr class="noborder">
-                <td class="vatop"><input type="text" value="<?php echo $output['merchant']['company_name'];?>" name="company_name" id="company_name" class="txt"></td>
+                <td class="vatop"><?php echo $output['merchant']['name'];?></td>
                 <td class="vatop tips"></td>
             </tr>
             <tr>

admin/templates/default/provider.evidence.add.php

@@ -160,6 +160,7 @@ $(function(){
             var form = layui.form;
             form.on('select(provider_id)', function (data) {
                 let category = data.value;
+                console.log(category);
                 form.render('select')
                 $.get('index.php?act=provider_info&op=get_provider_info&provider_id='+ category,function(data) {
                     data = JSON.parse(data)

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

@@ -0,0 +1,80 @@
+<?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=refill_order_manual&op=index"><span>订单手动处理</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>订单批量处理</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="type" value=""/>
+        <table class="table tb-type2">
+            <tbody>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="order_sn">订单号码:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform">
+                    <textarea style="height: 344px" name="order_sn" id="order_sn" cols="30" rows="10"></textarea>
+                </td>
+                <td class="vatop tips"></td>
+            </tr>
+            </tbody>
+            <tfoot>
+            <tr class="tfoot">
+                <td colspan="15">
+                    <a href="JavaScript:void(0);" class="submitBtn" data-type="success">
+                        <span>全部手动成功</span>
+                    </a>
+                    <a href="JavaScript:void(0);" class="submitBtn" data-type="cancel">
+                        <span>全部手动失败</span>
+                    </a>
+                    <a href="JavaScript:void(0);" class="submitBtn" data-type="notify">
+                        <span>全部回调</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()) {
+                const type = $(this).attr('data-type');
+                $("input[name='type']").val(type)
+                $("#user_form").submit();
+            }
+        });
+        $('#user_form').validate({
+            errorPlacement: function (error, element) {
+                error.appendTo(element.parent().parent().prev().find('td:first'));
+            },
+            rules: {
+                order_sn: {
+                    required: true,
+                }
+            },
+            messages: {
+                order_sn: {
+                    required: '不能为空',
+                }
+            }
+        });
+    });
+</script>

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

@@ -38,7 +38,8 @@
         <div class="item-title">
             <h3>订单列表</h3>
             <ul class="tab-base">
-                <li><a href="JavaScript:void(0);" class="current"><span>管理</span></a></li>
+                <li><a href="JavaScript:void(0);" class="current"><span>手动处理订单</span></a></li>
+                <li><a href="index.php?act=refill_order_manual&op=refill_order_batch"><span>订单批量处理</span></a></li>
             </ul>
         </div>
     </div>

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

@@ -61,18 +61,43 @@
         </div>
     </div>
     <div class="fixed-empty"></div>
-    <table class="tb-type1 noborder search">
-        <tr>
-            <td>
-                <a href="#" class="btns" onclick="hCopyChannel(event)">
-                    <span><i class="icon-edit"></i>拷贝订单号</span>
-                </a>
-                <a href="#" class="btns" onclick="hCopyCardNo(event)">
-                    <span><i class="icon-edit"></i>拷贝充值卡号</span>
-                </a>
-            </td>
-        </tr>
-    </table>
+    <form method="get" action="index.php" name="formSearch" id="formSearch">
+        <input type="hidden" name="act" value="OrderSendList"/>
+        <input type="hidden" name="op" value="neterr_order"/>
+        <table class="tb-type1 noborder search">
+            <tr>
+                <th><label class="lefto">供方名称</label></th>
+                <td  class="layui-form">
+                    <select name="store_id" class="querySelect" lay-verify="" lay-search>
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <?php foreach ($output['provider_list'] as $provider) { ?>
+                            <option value="<?php echo $provider['store_id'] ?>"
+                                    <?php if ($_GET['store_id'] == $provider['store_id']){ ?>selected<?php } ?>
+                                    data-color="<?php echo $provider['opened'] ?>" class="textColor"><?php echo $provider['store_name'] ?>
+                            </option>
+                        <?php } ?>
+                    </select>
+                </td>
+                <td>
+                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
+                       title="<?php echo $lang['nc_query']; ?>">&nbsp;
+                    </a>
+                </td>
+            </tr>
+        </table>
+        <table class="tb-type1 noborder search">
+            <tr>
+                <td>
+                    <a href="#" class="btns" onclick="hCopyChannel(event)">
+                        <span><i class="icon-edit"></i>拷贝订单号</span>
+                    </a>
+                    <a href="#" class="btns" onclick="hCopyCardNo(event)">
+                        <span><i class="icon-edit"></i>拷贝充值卡号</span>
+                    </a>
+                </td>
+            </tr>
+        </table>
+    </form>
     <table class="table tb-type2 nobdb">
         <thead>
         <tr class="thead">

test/TestRefill.php

@@ -296,7 +296,20 @@ class TestRefill extends TestCase
     public function testTongyPhone()
     {
         $providers = new refill\tongy\RefillPhone([]);
-        $resp = $providers->add('18500608333', 5, 30, ['order_sn' => '690653407667699667', 'order_id' => 248, 'buyer_id' => 52667]);
+//        $resp = $providers->add('18500608333', 5, 30, ['order_sn' => '690653407667699667', 'order_id' => 248, 'buyer_id' => 52667]);
+        $params['UserId'] = '100857';
+        $params['ShopId'] = '300000';
+        $params['SysOrderId'] = '21070121300710085700006';
+        $params['OrderId'] = '0677060678490206991511';
+        $params['State'] = '5';
+        $params['Timestamp'] = '1625146271363';
+        $params['sign'] = '3C78D29D8EDF5760BD67E4443F3F2DDE';
+        $params['ParValue'] = 50.0000;
+        $params['VoucherType'] = '';
+        $params['VoucherContent'] = '';
+        $params['CreateTime'] = '2021-07-01 21:30:07';
+        $params['CompleteTime'] = '2021-07-01 21:31:11';
+        refill\RefillFactory::instance()->notify('tongy',$params);
     }
 
     public function testWeiyiPhone()