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

admin/control/refill_order_manual.php

@@ -498,6 +498,8 @@ class refill_order_manualControl extends SystemControl
             if ($type === 'set_next_order') {
                 refill\util::set_next_order($mchid, $mch_order);
                 $this->log("预回调订单转快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
+            } elseif ($type === 'cancel_order_retry'){
+                $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             } else {
                 continue;
             }

admin/templates/default/transfer.order.recharge.php

@@ -186,7 +186,7 @@
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="align-center">
                         <input type="hidden" value="<?php echo $order['can_cancel']; ?>">
-                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=&order_ids=<?php echo $order['order_id']; ?>" id="hdFail">
+                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=cancel_order_retry&order_ids=<?php echo $order['order_id']; ?>" id="hdFail">
                             补快充</a>
                     </td>
                 </tr>
@@ -277,9 +277,9 @@
                 let number = Number(strr);
                 if (isNaN(number)) {
                     let strrr = str.substring(1, str.length);
-                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=&order_ids= ${strrr ? strrr : ''}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=cancel_order_retry&order_ids= ${strrr ? strrr : ''}`
                 } else if (!isNaN(number) && str !== '') {
-                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=&order_ids= ${str ? str : ''}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=cancel_order_retry&order_ids= ${str ? str : ''}`
                 } else {
                     layer.msg('请还没有任何操作，请先选择');
                 }