Просмотр исходного кода

账单生成,队列重置BUG

Zhouzhendong 5 лет назад
Родитель
Сommit
0b5f0cbe85

+ 2 - 1
app/Http/Controllers/CustomerController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Components\AsyncResponse;
 use App\Jobs\OrderCreateInstantBill;
 use App\Jobs\ResetInstantBill;
+use App\Jobs\StoreCreateInstantBill;
 use App\Order;
 use App\Owner;
 use App\OwnerAreaReport;
@@ -571,7 +572,7 @@ class CustomerController extends Controller
             ->whereNotIn("id",OwnerFeeDetail::query()->select("outer_id")->where("outer_table_name","stores")
                 ->whereBetween("worked_at",["{$startData} 00:00:00","{$endDate} 23:59:59"]))->get();
         foreach ($stores->chunk(50) as $st){
-            dispatch(new OrderCreateInstantBill($st));
+            dispatch(new StoreCreateInstantBill($st));
         }
     }
     public function resetBillConfirmation()

+ 12 - 3
app/Http/Controllers/TestController.php

@@ -25,6 +25,7 @@ use App\Exceptions\ErrorException;
 use App\Events\CancelOrder;
 use App\Events\SendEmailEvent;
 use App\Exceptions\Exception;
+use App\Feature;
 use App\Http\Controllers\api\thirdPart\haiq\PickStationController;
 use App\Http\Controllers\api\thirdPart\hengli\PackageController;
 use App\Http\Controllers\api\thirdPart\weight\WeightBaseController;
@@ -174,14 +175,22 @@ class TestController extends Controller
     {
         return call_user_func([$this, $method], $request);
     }
-
     public function test()
     {
-        $order = Order::query()->where("code","SO210509003964")->first();
+        $startData = "2021-05-01";
+        $endDate = "2021-05-12";
+        $stores = Store::query()->where("status","已入库")->whereBetween("updated_at",["{$startData} 00:00:00","{$endDate} 23:59:59"])
+            ->whereNotIn("id",OwnerFeeDetail::query()->select("outer_id")->where("outer_table_name","stores")
+                ->whereBetween("worked_at",["{$startData} 00:00:00","{$endDate} 23:59:59"]))->get();
+        foreach ($stores->chunk(50) as $st){
+            dispatch(new StoreCreateInstantBill($st));
+        }
+        dd("OK");
+        $order = Order::query()->where("code","SO210511005663")->first();
         $ser = new OrderService();
         $ser->createInstantBill($order);
         dd();
-        $store = Store::query()->find(164944);
+        $store = Store::query()->find(171502);
         $ser = new StoreService();
         $ser->createInstantBill($store);
     }

+ 1 - 1
app/Jobs/ResetInstantBill.php

@@ -176,7 +176,7 @@ class ResetInstantBill implements ShouldQueue
                 /** @var \stdClass $store */
                 $store = Store::query()->find($this->detail->outer_id);
                 if (!$store || $store->status != "已入库") break;
-                $store->loadMissing(["storeItems","warehouse"]);
+                $store->loadMissing(["storeItems.commodity","warehouse"]);
 
                 /** @var OwnerPriceOperationService $service */
                 $service = app("OwnerPriceOperationService");