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

admin/control/merchant.php

@@ -1382,17 +1382,12 @@ class merchantControl extends SystemControl
 
     public function readdOp()
     {
-        $param_getter = function ($refill_info, $order_info, $quality) {
+        $param_getter = function ($refill_info, $order_info) {
             $order = refill\order::from_db($refill_info,$order_info);
             $params = $order->queue_params();
-            $params['order_time'] = time();
-
-            if($quality > 0) {
-                $params['quality'] = $quality;
-            } else {
-                unset($params['quality']);
-            }
+//            $params['order_time'] = time();
 
+            unset($params['quality']);
             unset($params['match_ratio']);
             unset($params['commit_times']);
 
@@ -1431,7 +1426,14 @@ class merchantControl extends SystemControl
                 $mod_refill->edit($order_id, ['is_retrying' => 1]);
                 $tran->commit();
 
-                $params = $param_getter($refill_info, $order_info, $quality);
+                $params = $param_getter($refill_info, $order_info);
+
+                if($quality > 0) {
+                    $mchid = $refill_info['mchid'];
+                    $mch_order = $refill_info['mch_order'];
+                    refill\util::set_next_order($mchid, $mch_order);
+                }
+
                 Log::record(json_encode($params),Log::DEBUG);
                 refill\util::push_add($params);
             }
@@ -1447,16 +1449,12 @@ class merchantControl extends SystemControl
 
     public function readd_batchOp()
     {
-        $param_getter = function ($refill_info, $order_info, $quality) {
+        $param_getter = function ($refill_info, $order_info) {
             $order = refill\order::from_db($refill_info,$order_info);
             $params = $order->queue_params();
-            $params['order_time'] = time();
-            if($quality > 0) {
-                $params['quality'] = $quality;
-            } else {
-                unset($params['quality']);
-            }
+//            $params['order_time'] = time();
 
+            unset($params['quality']);
             unset($params['match_ratio']);
             unset($params['commit_times']);
 
@@ -1488,7 +1486,13 @@ class merchantControl extends SystemControl
                     $mod_refill->edit($order_id, ['is_retrying' => 1]);
                     $tran->commit();
 
-                    $params = $param_getter($refill_info,$order_info,$quality);
+                    if($quality > 0) {
+                        $mchid = $refill_info['mchid'];
+                        $mch_order = $refill_info['mch_order'];
+                        refill\util::set_next_order($mchid, $mch_order);
+                    }
+
+                    $params = $param_getter($refill_info,$order_info);
                     refill\util::push_add($params);
                 }