m

app/Http/Controllers/Api/OrderController.php

@@ -427,9 +427,11 @@ class OrderController extends Controller {
             
             DB::commit();
             // +++++ 新加预占库存到redis
-            $sku_redis = OrderGoodsSkus::select(DB::raw('sum(num) as num, sku_id'))->where('order_id', $res)->where('is_del', 0)->groupBy('sku_id')->get();
-            $sku_redis = json_decode(json_encode($sku_redis),true);
-            Order::diffSkuToRedis('', $sku_redis);
+            if($order['status'] == 1){
+                $sku_redis = OrderGoodsSkus::select(DB::raw('sum(num) as num, sku_id'))->where('order_id', $res)->where('is_del', 0)->groupBy('sku_id')->get();
+                $sku_redis = json_decode(json_encode($sku_redis),true);
+                Order::diffSkuToRedis('', $sku_redis);
+            }
         }catch (Exception $e){
             DB::rollback();
         }   
@@ -761,11 +763,15 @@ class OrderController extends Controller {
 
             DB::commit();
             /** 新逻辑 统计预占库存 2.更新后 **/
-            if($old_order->orderCode == null){
+            if($old_order->orderCode == null && $old_order->status>=1){
                 $new_skus = OrderGoodsSkus::select(DB::raw('sum(num) as num, sku_id'))->where('order_id', $id)->where('is_del', 0)->groupBy('sku_id')->get();
                 $new_skus = json_decode(json_encode($new_skus), true);
                 Order::diffSkuToRedis($old_skus, $new_skus);
-            }    
+            }elseif($old_order->orderCode == null && $old_order->status == 0 && $order['status'] == 1){
+                $new_skus = OrderGoodsSkus::select(DB::raw('sum(num) as num, sku_id'))->where('order_id', $id)->where('is_del', 0)->groupBy('sku_id')->get();
+                $new_skus = json_decode(json_encode($new_skus),true);
+                Order::diffSkuToRedis('', $new_skus);
+            }        
             /** end **/
         }catch (Exception $e){
             DB::rollback();
@@ -825,6 +831,13 @@ class OrderController extends Controller {
                 $data_id = $id;
                 Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
 
+                if($order->status == 0 && $order->warehouse == 3){
+                    # 驳回 减预占 redis
+                    $sku_redis = OrderGoodsSkus::select(DB::raw('sum(num) as num, sku_id'))->where('order_id', $id)->where('is_del', 0)->groupBy('sku_id')->get();
+                    $sku_redis = json_decode(json_encode($sku_redis),true);
+                    Order::diffSkuToRedis('', $sku_redis, -1);             
+                }
+                
                 $today_date = date('Y-m-d');
                 #如果审核通过，c仓, 并且到预发货时间，同步卖家云
                 if($order->status == 2 && $order->warehouse == 3 && $order->delivery_date <= $today_date){