m

app/Http/Controllers/Admin/OrderController.php

@@ -1306,7 +1306,7 @@ class OrderController extends Controller
                 DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
             }
 
-            $mdate = date('Y-m-01', strtotime($old_order['create_time']));
+            $mdate = date('Y-m-01', strtotime($old_order->create_time));
             if($use_b_gift>0 && empty($order_b_gift_ids) ){
                 $b_gifts = DB::table('customer_month_gift')->where('mtime', $mdate)->where('type', 1)->get();
                 $b_gifts = json_decode(json_encode($b_gifts),true);
@@ -1390,14 +1390,14 @@ class OrderController extends Controller
                 $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
                 if(!empty($order_gifts)){
                     $order_m_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->pluck('id');
-                    $order_b_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->pluck('id');
+                    $order_b_gift_ids = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
                     if($order_m_gift_id>0){
                         DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
                         DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
                     }
-                    if($order_b_gift_id>0){
-                        DB::table('order_goods_skus')->where('gift_id', $order_b_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
-                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_b_gift_id)->update(['is_del'=>1]);
+                    if(!empty($order_b_gift_ids)){
+                        DB::table('order_goods_skus')->whereIn('gift_id', $order_b_gift_ids)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_type', 1)->update(['is_del'=>1]);
                     }
                 }
 
@@ -1476,14 +1476,14 @@ class OrderController extends Controller
                 $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
                 if(!empty($order_gifts)){
                     $order_m_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->pluck('id');
-                    $order_b_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->pluck('id');
+                    $order_b_gift_ids = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
                     if($order_m_gift_id>0){
                         DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
                         DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
                     }
-                    if($order_b_gift_id>0){
-                        DB::table('order_goods_skus')->where('gift_id', $order_b_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
-                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_b_gift_id)->update(['is_del'=>1]);
+                    if(!empty($order_b_gift_ids)){
+                        DB::table('order_goods_skus')->whereIn('gift_id', $order_b_gift_ids)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_type', 1)->update(['is_del'=>1]);
                     }
                 }