后台-订单-撤回订单列表,撤回撤回订单

app/controller/admin/order/Order.php

@@ -516,14 +516,26 @@ class Order extends BaseController
     {
         $backupTable = 'backup_' . $table;
         $rows = Db::name($backupTable)->where($where)->select()->toArray();
-        if ($rows) {
-            foreach ($rows as &$row) {
-                unset($row['backup_time']);
-            }
-            Db::name($table)->insertAll($rows);
-            Db::name($backupTable)->where($where)->delete();
+        if (empty($rows)) {
+            return;
+        }
+        $cols = Db::query("SHOW COLUMNS FROM `{$table}`");
+        $targetCols = array_column($cols, 'Field');
+        $targetColsFlip = array_flip($targetCols);
+        foreach ($rows as &$row) {
+            if (isset($row['backup_time'])) unset($row['backup_time']);
+            if (isset($row['del_time'])) unset($row['del_time']);
+            $row = array_intersect_key($row, $targetColsFlip);
         }
+        unset($row);
+        $rows = array_filter($rows, function($r) { return !empty($r); });
+        if (empty($rows)) {
+            return;
+        }
+        Db::name($table)->insertAll($rows);
+        Db::name($backupTable)->where($where)->delete();
     }
+
     private function easterUserAward($table, array $where){
         $backupTable = 'backup_' . $table;
         $row = Db::name($backupTable)->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();