dev

admin/control/merchant.php

@@ -14,6 +14,7 @@ require_once(BASE_HELPER_PATH . '/refill/functional.php');
 require_once(BASE_CORE_PATH . '/framework/function/http.php');
 
 use refill\quality_ploy;
+use refill\util;
 
 class merchantControl extends SystemControl
 {
@@ -1378,4 +1379,50 @@ class merchantControl extends SystemControl
         }
         return $transfer_cfg;
     }
+
+    public function readdOp()
+    {
+        $param_getter = function ($refill_info, $order_info) {
+            $order = refill\order::from_db($refill_info,$order_info);
+            $params = $order->queue_params();
+            $params['order_time'] = time();
+
+            return $params;
+        };
+
+        $order_id = $_GET['order_id'];
+
+        try {
+            $mod_order = Model('vr_order');
+            $mod_refill = Model('refill_order');
+
+            $tran = new trans_wapper($mod_order, 'notify change order state trans');
+            $refill_info = $mod_refill->getOrderInfo(['order_id' => $order_id, 'inner_status' => 0, 'is_retrying' => 0], '*', true, true);
+            $order_info = $mod_order->getOrderInfo(['order_id' => $order_id], '*', true, true);
+
+            if(empty($refill_info) || empty($order_info)) {
+                $tran->commit();
+                return false;
+            }
+
+            $order_state = $order_info['order_state'];
+            if($order_state != ORDER_STATE_CANCEL) {
+                $tran->commit();
+                showMessage('只有失败的订单才可以重新补充', '');
+            }
+            else {
+                $mod_refill>edit($order_id, ['is_retrying' => 1]);
+                $tran->commit();
+
+                $params = $param_getter($refill_info,$order_info);
+                util::push_add($params);
+            }
+
+            showMessage('操作成功', '');
+        }
+        catch (Exception $ex) {
+            $tran->rollback();
+            return false;
+        }
+    }
 }

admin/control/ordersendlist.php

@@ -282,6 +282,7 @@ class ordersendlistControl extends SystemControl
         Tpl::output('merchant_list', $merchant_list);
         Tpl::output('except_stat', $this->except_stat());
         Tpl::output('show_page', $model_refill_order->showpage());
+
         Tpl::showpage('monitor_transfer');
     }
 

admin/templates/default/monitor_transfer.php

@@ -336,8 +336,11 @@
                     <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=notify_merchant&order_id=<?php echo $order['order_id']; ?>">回调</a>
+<!--                        <a href="index.php?act=merchant&op=notify_merchant&order_id=--><?php //echo $order['order_id']; ?><!--">重新补充</a>-->
+<!--                        <a href="index.php?act=refill_detail&op=order_dispose&type=cancel&id=--><?php //echo $order['order_id']; ?><!--" id="hdFail">手动成功</a>-->
+<!--                        |-->
+                        <a href="index.php?act=merchant&op=readd&order_id=<?php echo $order['order_id']; ?>">
+                            重新补充</a>
                     </td>
                 </tr>
             <?php } ?>