部分方法的简单维护

app/Http/Controllers/TestController.php

@@ -65,6 +65,7 @@ use App\Warehouse;
 use App\Waybill;
 use Carbon\Carbon;
 use Exception;
+use Facade\Ignition\QueryRecorder\Query;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
@@ -832,11 +833,9 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         $service->updateByWmsOrders($orderHeaders);
     }
 
-    public function changeOrderIssue()
+    public function chageOrder()
     {
-        // $ids = [5419,5404,5402,5401,5400,5398,5397,5395,5388,5387,5383,5382,5379,5373,5370,5353,5329,5327];
 
-        // OrderIssue::query()->whereIn('id',$ids)->update(['is_new_rejecting'=>'无','rejecting_status'=>'未退回']);
     }
 
 }

app/OrderIssue.php

@@ -218,7 +218,8 @@ class OrderIssue extends Model
         return parent::delete();
     }
 
-    public function syncRejectedBill()// 同步退回单
+    // 同步退回单
+    public function syncRejectedBill()
     {
         if(!isset($this['logistic_number_return'])){
             $order = $this->order;
@@ -228,5 +229,4 @@ class OrderIssue extends Model
             }
         }
     }
-
 }

app/Services/common/DataHandlerService.php

@@ -75,7 +75,7 @@ class DataHandlerService
         return $mapKey;
     }
 
-    public function getKeyValue($keyValues,$data){
+    public function getKeyValue($keyValues,&$data){
          $mapkeys =  $data['mapkey'];
          $key = '';
          if(!$data){return null;}

tests/Services/OrderPackageCommoditiesService/RegroupOrderCommoditiesTest/RegroupOrderCommoditiesTest.php

@@ -34,25 +34,27 @@ class RegroupOrderCommoditiesTest extends TestCase
         * createOrderPackage($orderHeaders,$orders,$packages)
         * */
         $carbon =Carbon::now()->subHours(10);
-        $date = '2020-09-18 18:13:50';
-        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
+        $date = '2020-06-18 18:13:50';
+        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($date);
         if($orderHeaders->count()==0){
             var_dump('查询数据为空');
             return;
         }
+        $order_nos = Order::all()->map(function($order){
+            return $order->code;
+        });
+        dd(Order::all()->map(function($order){
+            return $order->created_at;
+        }));
+
         $order_nos = data_get($orderHeaders,'*.orderno');
         $order_commodities = OrderPackageCommodities::query()->with(['commodity','package.order'])->whereHas('package',function($query)use($order_nos){
             $query->whereHas('order',function ($query)use($order_nos){
                 $query->whereIn('code',$order_nos);
             });
-        })->sql();
-        $order_commodities = OrderPackageCommodities::query()->with(['commodity','package.order'])->whereHas('package.order',function($query)use($order_nos){
-            $query->whereIn('code',$order_nos);
         })->get();
+        $orders = Order::query()->whereIn('code',$order_nos)->get();
 
-        $package = OrderPackage::query()->with('order')->where('order',function($query)use($order_nos){
-            $query->whereIn('code',$order_nos);
-        })->sql();
 
         $order = Order::query()->whereIn('code',$order_nos)->sql();
         $params = $this->service->regroupOrderCommodities($order_commodities);

tests/Services/OrderService/CreateOrderInfoTest/CreateOrderInfoTest.php

@@ -21,18 +21,22 @@ class CreateOrderInfoTest extends TestCase
     {
         parent::setUp();
         $this->service=app('OrderService');
-        $this->orderHeaderService=app('OracleDOCOrderHeaderService');
+        $this->orderHeaderService=app('OracleDocOrderHeaderService');
     }
 
     public function testCreateOrderInfo()
     {
-        $carbon =Carbon::now()->subHours(10);
-        $date = '2020-09-18 18:13:50';
+        $carbon =Carbon::now()->subHours(1);
+        $date = '2020-05-18 18:13:50';
+        var_dump(((string)Carbon::now()));
+
         $orderHeader = $this->orderHeaderService->getWMSOrderOnStartDate($carbon);
-        $order_models = $this->service->createOrderInfo($orderHeader);
-        $this->assertNotNull($order_models);
-//        var_dump($orderHeader->count());
-//        var_dump($order_models);
+        var_dump($orderHeader->count());
+        var_dump((string)Carbon::now());
+
+        $this->service->createOrderInfo($orderHeader);
+        var_dump((string)Carbon::now());
+
         $order = $this->service->getByWmsOrders($orderHeader);
         $this->assertNotNull($order);
         $this->assertNotNull($orderHeader);