库存同步

app/Console/Commands/SyncOrderToMj.php

@@ -7,6 +7,7 @@ use App\Order;
 use App\OrderScript;
 use App\FxOrder;
 use App\GoodsSkus;
+use App\OrderGoodsSkus;
 use App\Goods;
 
 class SyncOrderToMj extends Command {
@@ -43,12 +44,20 @@ class SyncOrderToMj extends Command {
                 if($mjOrder['status'] == '已取消'){
                     $res = $this->updateOrderToMj($id);
                     echo "\n订单ID:".$id." 卖家取消订单重新更新";
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 }
             }else{
                 $res = $this->syncOrderToMj($id);
                 if(!$res){
                     echo "\n订单ID:".$id." 同步失败";
                 }else{
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                     echo "\n订单ID:".$id." 同步成功";
                 }
             }

app/Http/Controllers/Admin/GoodsController.php

@@ -382,6 +382,11 @@ class GoodsController extends Controller
         $name = trim($request->input('name'));
         $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
+        foreach($result as $k=>&$v){
+            //计算实际库存 -还未到卖家云的量
+            $w_num = DB::table('order_goods_skus')->where('sku_id', $v['sku_id'])->where('is_del',0)->where('mj_status',0)->sum('num');
+            $v['quantity'] = $v['quantity'] - $w_num;
+        }
 
         if(empty($result)) exit('0');
         exit(json_encode($result));

app/Http/Controllers/Admin/OrderController.php

@@ -532,7 +532,7 @@ class OrderController extends Controller
 
         //redis防重复数据
         $phone = $request->input('receiverMobile');
-    
+        
         $redisKey = 'seafood.order_phone_add.'.$phone;
         $res = RedisModel::setnx($redisKey, 1);
         if( $res == 0 ){
@@ -767,10 +767,13 @@ class OrderController extends Controller
 
         $skus = array_keys($order_skus);
         if(!empty($skus)){
-            $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->whereIn('gs.id', $skus)->orderBy('goods.id', 'desc')->get();
+            $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh', 'gs.is_white', 'gs.quantity')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->whereIn('gs.id', $skus)->orderBy('goods.id', 'desc')->get();
             $goods = json_decode(json_encode($goods),true);
             foreach($goods as $k=>&$v){
                 $v['num'] = $order_skus[$v['sku_id']];
+                //计算实际库存 -还未到卖家云的量
+                $w_num = DB::table('order_goods_skus')->where('sku_id', $v['sku_id'])->where('is_del',0)->where('order_id','!=',$id)->where('mj_status',0)->sum('num');
+                $v['quantity'] = $v['quantity'] - $w_num;
             }
             $order['goods'] = $goods;
         }
@@ -1122,6 +1125,11 @@ class OrderController extends Controller
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
+                #更新order_goods_skus状态
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1188,6 +1196,11 @@ class OrderController extends Controller
                     $balance = $cust->balance + $order->receivedAmount;
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
+
+                #更新order_goods_skus状态,退回库存
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 
                 #记录操作日志
                 $self_id = session('admin_id');
@@ -1272,6 +1285,10 @@ class OrderController extends Controller
                     if( $syncMj == false ){
                         throw new Exception("订单同步到卖家云失败");
                     }
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 }
             }