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

admin/control/merchant.php

@@ -1382,12 +1382,17 @@ class merchantControl extends SystemControl
 
     public function readdOp()
     {
-        $param_getter = function ($refill_info, $order_info) {
+        $param_getter = function ($refill_info, $order_info, $quality) {
             $order = refill\order::from_db($refill_info,$order_info);
             $params = $order->queue_params();
             $params['order_time'] = time();
 
-            unset($params['quality']);
+            if($quality > 0) {
+                $params['quality'] = $quality;
+            } else {
+                unset($params['quality']);
+            }
+
             unset($params['match_ratio']);
             unset($params['commit_times']);
 
@@ -1395,6 +1400,11 @@ class merchantControl extends SystemControl
         };
 
         $order_id = $_GET['order_id'];
+        $quality = intval($_GET['quality'] ?? 0);
+
+        Log::record(__METHOD__ . " quality=$quality", Log::DEBUG);
+
+
         $mod_order = Model('vr_order');
         $mod_refill = Model('refill_order');
         $tran = new trans_wapper($mod_refill, __METHOD__);
@@ -1421,7 +1431,7 @@ class merchantControl extends SystemControl
                 $mod_refill->edit($order_id, ['is_retrying' => 1]);
                 $tran->commit();
 
-                $params = $param_getter($refill_info,$order_info);
+                $params = $param_getter($refill_info, $order_info, $quality);
                 Log::record(json_encode($params),Log::DEBUG);
                 refill\util::push_add($params);
             }
@@ -1437,11 +1447,16 @@ class merchantControl extends SystemControl
 
     public function readd_batchOp()
     {
-        $param_getter = function ($refill_info, $order_info) {
+        $param_getter = function ($refill_info, $order_info, $quality) {
             $order = refill\order::from_db($refill_info,$order_info);
             $params = $order->queue_params();
             $params['order_time'] = time();
-            unset($params['quality']);
+            if($quality > 0) {
+                $params['quality'] = $quality;
+            } else {
+                unset($params['quality']);
+            }
+
             unset($params['match_ratio']);
             unset($params['commit_times']);
 
@@ -1449,7 +1464,7 @@ class merchantControl extends SystemControl
         };
 
 
-        $readder = function ($order_id) use ($param_getter)
+        $readder = function ($order_id, $quality) use ($param_getter)
         {
             $mod_order = Model('vr_order');
             $mod_refill = Model('refill_order');
@@ -1473,7 +1488,7 @@ class merchantControl extends SystemControl
                     $mod_refill->edit($order_id, ['is_retrying' => 1]);
                     $tran->commit();
 
-                    $params = $param_getter($refill_info,$order_info);
+                    $params = $param_getter($refill_info,$order_info,$quality);
                     refill\util::push_add($params);
                 }
 
@@ -1486,10 +1501,13 @@ class merchantControl extends SystemControl
         };
 
         $order_ids = $_GET['order_ids'];
+        $quality = intval($_GET['quality'] ?? 0);
+        Log::record(__METHOD__ . " quality=$quality", Log::DEBUG);
+
         $order_ids = explode(',', $order_ids);
         foreach ($order_ids as $order_id) {
             $order_id =intval(trim($order_id));
-            $readder($order_id);
+            $readder($order_id, $quality);
             Log::record(__METHOD__ . " order_id=$order_id",Log::DEBUG);
         }
 

admin/templates/default/monitor_transfer.php

@@ -208,10 +208,15 @@
             </tr>
             <tr>
                 <td>
-                    <a href="#" class="btns readd">
+                    <a href="#" class="btns readd" >
                         <span><i class="icon-edit"></i>批量补充</span>
                     </a>
                 </td>
+                <td>
+                    <a href="#" class="btns qreadd">
+                        <span><i class="icon-edit"></i>批量快补</span>
+                    </a>
+                </td>
             </tr>
         </table>
     </form>
@@ -349,7 +354,8 @@
                     <td class="align-left" class="ch_trade_no"><?php echo $order['ch_trade_no']; ?></td>
                     <td class="align-left"><?php echo $order['channel_name']; ?></td>
                     <td class="w144 align-center">
-                        <a href="index.php?act=merchant&op=readd&order_id=<?php echo $order['order_id']; ?>">重新补充</a>
+                        <a href="index.php?act=merchant&op=readd&quality=0&order_id=<?php echo $order['order_id']; ?>">重新补充</a> |
+                        <a href="index.php?act=merchant&op=readd&quality=2&order_id=<?php echo $order['order_id']; ?>">快补</a>
                     </td>
                 </tr>
             <?php } ?>
@@ -485,6 +491,30 @@
             }, function () {layer.msg('批量补充操作成功');});
         })
 
+        //批量快补
+        $('.qreadd').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=merchant&op=readd_batch&quality=2&order_ids= ${strrr ? strrr : ''}`
+                } else if(!isNaN(number) && str !== '') {
+                    window.location.href = `index.php?act=merchant&op=readd_batch&quality=2&order_ids= ${str ? str : ''}`
+                } else {
+                    layer.msg('请还没有任何操作，请先选择');
+                }
+            }, function () {layer.msg('批量补充操作成功');});
+        })
+
         let isWring = '<?php echo $output['count'][1];?>';
         let setTimer
         let num