OrderPackageCommoditiesService 测试修改

tests/Services/OrderPackageCommoditiesService/RegroupOrderCommoditiesTest.php

@@ -2,11 +2,13 @@
 
 namespace Tests\Services\OrderPackageCommoditiesService\RegroupOrderCommoditiesTest;
 
+use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderPackage;
 use App\OrderPackageCommodities;
 use App\Services\OracleDOCOrderHeaderService;
 use App\Services\OrderPackageCommoditiesService;
+use App\Services\OrderService;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithFaker;
@@ -14,51 +16,49 @@ use Tests\TestCase;
 
 class RegroupOrderCommoditiesTest extends TestCase
 {
+    use RefreshDatabase;
+
     /**
      * @var OrderPackageCommoditiesService $service
      * @var OracleDOCOrderHeaderService $orderHeaderService
+     * @var OrderService $orderService
      */
-    public $service;
-    public $orderHeaderService;
+    private $service;
+    private $orderHeaderService;
+    private $orderService;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->service = app('OrderPackageCommoditiesService');
+        $this->orderService = app('OrderService');
         $this->orderHeaderService = app('OracleDocOrderHeaderService');
     }
 
     public function testRegroupOrderCommodities()
     {
-        /*
-        * createOrderPackage($orderHeaders,$orders,$packages)
-        * */
-        $carbon =Carbon::now()->subHours(10);
-        $date = '2020-06-18 18:13:50';
-        $orderHeaders = $this->orderHeaderService->getWMSOrderOnStartDate($date);
-        if($orderHeaders->count()==0){
-            var_dump('查询数据为空');
-            return;
+        $orderHeader = OracleDOCOrderHeader::query()->where('sostatus',99)->orderByDesc('AddTime')->first();
+        if(!$orderHeader){
+            $this->assertNull($orderHeader);
+            return ;
         }
-        $order_nos = Order::all()->map(function($order){
-            return $order->code;
-        });
-        dd(Order::all()->map(function($order){
-            return $order->created_at;
-        }));
 
+        $orderHeaders = OracleDOCOrderHeader::query()->where('sostatus',99)
+            ->where('addtime','>=',$orderHeader->addtime)
+            ->get();
+
+        $this->orderService->syncOrder($orderHeaders);
         $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);
             });
         })->get();
-        $orders = Order::query()->whereIn('code',$order_nos)->get();
-
 
-        $order = Order::query()->whereIn('code',$order_nos)->sql();
         $params = $this->service->regroupOrderCommodities($order_commodities);
+
         $_params = [];
+
         $orderHeaders->each(function($order_header)use(&$_params){
             $order_header->actAllocationDetails->each(function($detail)use(&$_params){
                 $order_no = $detail->orderno;
@@ -78,10 +78,8 @@ class RegroupOrderCommoditiesTest extends TestCase
                 }
             });
         });
-
         foreach ($_params as $key=>$param) {
             $this->assertNotEmpty($params[$key]);
         }
-
     }
 }