浏览代码

transfer order buyback manuanl recharge

xiaoyu 2 年之前
父节点
当前提交
be3248304a
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 2 2
      admin/control/refill_order_manual.php
  2. 7 7
      admin/templates/default/transfer.order.recharge.php

+ 2 - 2
admin/control/refill_order_manual.php

@@ -536,10 +536,10 @@ class refill_order_manualControl extends SystemControl
                 [$succ,$err] = refill\util::retry_canceled_order($order_id,true);
                 $this->log("预回调订单失败补快充,订单号:{$order['order_sn']},商家单号:{$mch_order},机构编码:{$mchid} err:{$err}");
             }
-            elseif ($type === 'buyback') {
+            elseif ($type === 'buybacked') {
                 $this->log("预回调订单返销操作,订单号:{$order['order_sn']},商家单号:{$mch_order},机构编码:{$mchid} err:{$err}");
             }
-            elseif ($type === 'manual_recharge') {
+            elseif ($type === 'manual_recharged') {
                 $manual_recharge_amount = $_GET['manual_recharge_amount'] ?? 0;
                 $this->log("预回调订单手动补充录入,订单号:{$order['order_sn']},商家单号:{$mch_order},机构编码:{$mchid} err:{$err}");
             } else {

+ 7 - 7
admin/templates/default/transfer.order.recharge.php

@@ -161,7 +161,7 @@
             </tr>
             <tr>
                 <td>
-                    <a href="#" class="btns" id="buybacks">
+                    <a href="#" class="btns" id="buybacked">
                         <span><i class="icon-edit"></i>批量返销处理</span>
                     </a>
                 </td>
@@ -227,9 +227,9 @@
                     <td class="align-center"><?php echo $order['quality_text']; ?></td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="align-center">
-                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=buyback&order_ids=<?php echo $order['order_id']; ?>">返销</a>
+                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=buybacked&order_ids=<?php echo $order['order_id']; ?>">返销</a>
                         |
-                        <a href="#" data-order_id="<?php echo $order['order_id']; ?>" id="manual_recharge">已手动补充</a>
+                        <a href="#" data-order_id="<?php echo $order['order_id']; ?>" id="manual_recharged">已手动补充</a>
                     </td>
                     <td class="align-center">
                         <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=canceled_order_retry&order_ids=<?php echo $order['order_id']; ?>">
@@ -335,7 +335,7 @@
             $(this).val(result)
         })
 
-        $('#manual_recharge').on('click', function() {
+        $('#manual_recharged').on('click', function() {
             let order_id = $(this).attr('data-order_id');
             layui.use(['layer'], function() {
                 const manual_amountHTML = '<label class="createTaskDate"><span>手动补充金额:</span><input type="text" class="layui-input" id="manual_amount"></label>'
@@ -351,7 +351,7 @@
                     console.log(manual_recharge_amount)
                     console.log(order_id)
                     index = layer.load();
-                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=manual_recharge&order_ids=${order_id}&manual_recharge_amount=${manual_recharge_amount}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=manual_recharged&order_ids=${order_id}&manual_recharge_amount=${manual_recharge_amount}`
                     layer.close(index);
                 }, function() {
                     console.log('取消')
@@ -393,14 +393,14 @@
         })
 
         //批量
-        $('#buybacks').click(function () {
+        $('#buybacked').click(function () {
             layer.confirm('您确定要批量返销处理吗', {
                 btn: ['确定', '取消'],
                 title: '批量补快充'
             }, function () {
                 let order_ids = formatParams();
                 if (order_ids !== '') {
-                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=buyback&order_ids= ${order_ids}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=buybacked&order_ids= ${order_ids}`
                 } else {
                     layer.msg('请还没有任何操作,请先选择');
                 }