分销订单库存

app/Console/Commands/SyncOrderToMj.php

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

app/GoodsSkus.php

@@ -18,7 +18,8 @@ class GoodsSkus extends Model
     	//计算实际库存 -还未到卖家云的量
     	$sku_quantity = GoodsSkus::where('id', $sku_id)->pluck('quantity');
         $w_num = OrderGoodsSkus::where('sku_id', $sku_id)->where('is_del',0)->where('mj_status',0)->sum('num');
-        $quantity = $sku_quantity - $w_num;
+        $fx_num = FxOrderGoodsSkus::where('sku_id', $sku_id)->where('is_del',0)->where('mj_status',0)->sum('num');
+        $quantity = $sku_quantity - $w_num - $fx_num;
         return $quantity;
     }
    

app/Http/Controllers/Admin/FxOrderController.php

@@ -765,10 +765,17 @@ class FxOrderController 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']];
+                //计算实际库存 -还未到卖家云的量
+                $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
+                $v['quantity'] = $v['quantity'] + $v['num'];
+                $v['quantity_str'] = $v['quantity'];
+                if($v['is_white'] == 1){
+                    $v['quantity_str'] = '虚拟库存';
+                }
             }
             $order['goods'] = $goods;
         }
@@ -1120,6 +1127,11 @@ class FxOrderController extends Controller
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
+                #更新order_goods_skus状态
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1174,6 +1186,12 @@ class FxOrderController extends Controller
                         throw new Exception("订单同步到卖家云失败");
                     }
                 }
+
+                #更新order_goods_skus状态,退回库存
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1257,6 +1275,11 @@ class FxOrderController extends Controller
                     if( $syncMj == false ){
                         throw new Exception("订单同步到卖家云失败");
                     }
+
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 }
             }
 

app/Http/Controllers/Admin/GoodsController.php

@@ -387,8 +387,7 @@ class GoodsController extends Controller
         $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;
+            $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
         }
 
         if(empty($result)) exit('0');

app/Http/Controllers/Admin/OrderController.php

@@ -870,6 +870,11 @@ class OrderController extends Controller
                 $v['num'] = $order_skus[$v['sku_id']];
                 //计算实际库存 -还未到卖家云的量
                 $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
+                $v['quantity'] = $v['quantity'] + $v['num'];
+                $v['quantity_str'] = $v['quantity'];
+                if($v['is_white'] == 1){
+                    $v['quantity_str'] = '虚拟库存';
+                }
             }
             $order['goods'] = $goods;
         }

app/Http/Controllers/Api/OrderController.php

@@ -343,7 +343,7 @@ class OrderController extends Controller {
             return self::returnValue([],2000);
         }
 
-        $result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
+        $result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverDistrict', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
         $result = json_decode(json_encode($result), true);
         return self::returnValue(['data'=>$result]);
     }