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

admin/control/refill_order_manual.php

@@ -469,12 +469,12 @@ class refill_order_manualControl extends SystemControl
             return [];
         }
 
-        $condition['vr_order.add_time&vr_order.add_time'] = ['_multi' => true,
-            ['egt', $start_day],
-            ['lt', $cur_time]];
-        $condition['refill_order.order_time&refill_order.order_time'] = ['_multi' => true,
-            ['egt', $start_day],
-            ['lt', $cur_time]];
+//        $condition['vr_order.add_time&vr_order.add_time'] = ['_multi' => true,
+//            ['egt', $start_day],
+//            ['lt', $cur_time]];
+//        $condition['refill_order.order_time&refill_order.order_time'] = ['_multi' => true,
+//            ['egt', $start_day],
+//            ['lt', $cur_time]];
 
         $merchant_list = $this->merchants(['mchid' => ['in', $mchids]]);
         $order_list = $mod->getMerchantOrderList($condition, 200, 0,'refill_order.*,vr_order.order_state', 'refill_order.order_time desc');
@@ -510,9 +510,12 @@ class refill_order_manualControl extends SystemControl
                 refill\util::set_next_order($mchid, $mch_order);
                 $this->log("预回调订单转快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             }
-            elseif ($type === 'cancel_order_retry') {
+            elseif ($type === 'canceled_order_retry') {
                 [$succ,$err] = refill\util::retry_canceled_order($order_id);
-                $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid} err:{$err}");
+                $this->log("预回调订单失败补充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid} err:{$err}");
+            }
+            elseif ($type === 'canceled_order_retry_next') {
+                $this->log("预回调订单失败补快充，订单号:{$order['order_sn']}，商家单号:{$mch_order}，机构编码:{$mchid}");
             } else {
                 continue;
             }

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

@@ -129,7 +129,12 @@
         <table class="tb-type1 noborder search">
             <tr>
                 <td>
-                    <a href="#" class="btns" id="hFail">
+                    <a href="#" class="btns" id="canceled_order_retry">
+                        <span><i class="icon-edit"></i>批量补充</span>
+                    </a>
+                </td>
+                <td>
+                    <a href="#" class="btns" id="canceled_order_retry_next">
                         <span><i class="icon-edit"></i>批量补快充</span>
                     </a>
                 </td>
@@ -200,8 +205,11 @@
                     <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=cancel_order_retry&order_ids=<?php echo $order['order_id']; ?>" id="hdFail">
+                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=canceled_order_retry&order_ids=<?php echo $order['order_id']; ?>" id="hdFail">
                             补充</a>
+                        |
+                        <a href="index.php?act=refill_order_manual&op=transfer_order_dispose&type=canceled_order_retry_next&order_ids=<?php echo $order['order_id']; ?>" id="hdFail">
+                            补快充</a>
                     </td>
                 </tr>
             <?php } ?>
@@ -293,7 +301,7 @@
         })
 
         //批量
-        $('#hFail').click(function() {
+        $('#canceled_order_retry').click(function() {
             layer.confirm('您确定要批量补充吗', {
                 btn: ['确定', '取消'],
                 title: '批量补充'
@@ -307,9 +315,33 @@
                 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=cancel_order_retry&order_ids= ${strrr ? strrr : ''}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=canceled_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=canceled_order_retry&order_ids= ${str ? str : ''}`
+                } else {
+                    layer.msg('请还没有任何操作，请先选择');
+                }
+            }, function() {});
+        })
+
+        //批量
+        $('#canceled_order_retry_next').click(function() {
+            layer.confirm('您确定要批量补快充吗', {
+                btn: ['确定', '取消'],
+                title: '批量补快充'
+            }, function() {
+                let arr = [];
+                $("input:checkbox:checked").each(function(i) {
+                    arr[i] = $(this).val();
+                })
+                let str = arr.join(",");
+                let strr = str.substring(0, 1);
+                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=canceled_order_retry_next&order_ids= ${strrr ? strrr : ''}`
                 } else if (!isNaN(number) && str !== '') {
-                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=cancel_order_retry&order_ids= ${str ? str : ''}`
+                    window.location.href = `index.php?act=refill_order_manual&op=transfer_order_dispose&type=canceled_order_retry_next&order_ids= ${str ? str : ''}`
                 } else {
                     layer.msg('请还没有任何操作，请先选择');
                 }