m

app/Console/Commands/SyncOrderToMj.php

@@ -10,6 +10,7 @@ use App\GoodsSkus;
 use App\OrderGoodsSkus;
 use App\FxOrderGoodsSkus;
 use App\Goods;
+use App\Oplog;
 
 class SyncOrderToMj extends Command {
 
@@ -26,53 +27,49 @@ class SyncOrderToMj extends Command {
     public function handle()
     {
         $this->SyncOrder();
-        $this->SyncFxOrder();
+        //$this->SyncFxOrder();
     }
 
     public function SyncOrder(){
         //查询需要同步到卖家云的订单
         $today_date = date('Y-m-d');
         echo "\n订单同步时间: " . date('Y-m-d H:i:s');
-        $result = Order::where('delivery_date', '=', $today_date)->where('warehouse', 3)->where('is_del', 0)->whereIn('status', [2,3])->lists('id');
+        $result = Order::where('delivery_date', $today_date)->where('warehouse', 3)->where('is_del', 0)->whereIn('status', 2)->whereNull('orderCode')->lists('id');
 
         if(empty($result)){
             return;
         }
 
         foreach($result as $id){
-            $mjOrder = $this->getMjOrder($id);
-            if(!empty($mjOrder)){
-                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);
-
-                    // +++++ 减预占库存到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);
-                }
+            #再次判断订单是否可同步
+            $thisOrder = Order::where('delivery_date', $today_date)->where('id', $id)->where('warehouse', 3)->where('is_del', 0)->whereIn('status', 2)->whereNull('orderCode')->first();
+            if(empty($thisOrder)){
+                continue;
+            }
+            $res = $this->syncOrderToMj($id);
+            if(!$res){
+                echo "\n订单ID:".$id." 同步失败";
             }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);
+                #同步到卖家云，更新order_goods_skus状态
+                $mj_status = array();
+                $mj_status['mj_status'] = 1;
+                OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
 
-                    // +++++ 减预占库存到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);
-                    echo "\n订单ID:".$id." 同步成功";
-                }
+                // +++++ 减预占库存到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);
+                echo "\n订单ID:".$id." 同步成功";
             }
             
+            #记录操作日志               
+            $self_id = 0;
+            $self_name = '脚本';
+            $context = "同步订单到卖家云。返回结果：".json_encode($res);
+            $type = 0; 
+            $tables = 'order';
+            $data_id = $id;
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
         }
     }