结算完善

app/command/PensionTasks.php

@@ -1573,16 +1573,16 @@ class PensionTasks extends Command
     public function huafeiOrderNew($timeLimit)
     {
         // 普通订单
-        $order_data = Db::name('order_huafei')->where('status', 3)->where('gzc' , 0)->select();
+        $order_data = Db::name('order_huafei')->where('status', 2)->where('gzc' , 0)->select();
         if($order_data) {
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < $online['finish_time']) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_huafei_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_huafei')->where('order_huafei_id', $online['order_huafei_id'])->update(['gzc' => 1 ,'modify_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_huafei')->where('order_huafei_id', $online['order_huafei_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1604,11 +1604,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s', $online['pay_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_pdd_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_pdd')->where('order_pdd_id', $online['order_pdd_id'])->update(['gzc' => 1 ,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_pdd')->where('order_pdd_id', $online['order_pdd_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1630,11 +1630,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < $online['finish_time']) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_jd_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_jd')->where('order_jd_id', $online['order_jd_id'])->update(['gzc' => 1 ,'modify_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_jd')->where('order_jd_id', $online['order_jd_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1651,16 +1651,16 @@ class PensionTasks extends Command
     public function suOrderNew($timeLimit)
     {
         // 普通订单
-        $order_data = Db::name('order_su')->where('status', 1)->where('gzc', 0)->select();
+        $order_data = Db::name('order_su')->where('status', '确认收货')->where('gzc', 0)->select();
         if($order_data) {
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['pay_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_su_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_su')->where('order_su_id', $online['order_su_id'])->update(['gzc' => 1 ,'settled_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_su')->where('order_su_id', $online['order_su_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1682,7 +1682,7 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['tk_earning_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_tb_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
@@ -1708,11 +1708,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['last_update_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_vip_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_vip')->where('order_vip_id', $online['order_vip_id'])->update(['gzc' => 1,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_vip')->where('order_vip_id', $online['order_vip_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1734,11 +1734,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['pay_success_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_dy_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_dy')->where('order_dy_id', $online['order_dy_id'])->update(['gzc' => 1,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_dy')->where('order_dy_id', $online['order_dy_id'])->update(['gzc' => 1]);
                 });
             }
         }