调整即时账单逻辑

app/Http/Controllers/TestController.php

@@ -166,8 +166,7 @@ class TestController extends Controller
 
     public function test()
     {
-        $service = new OrderService();
-        dd($service->createInstantBill(Order::query()->find(2617624)));
+        throw new Exception();
         return view("test");
     }
 

app/Jobs/OrderCreateInstantBill.php

@@ -32,6 +32,7 @@ class OrderCreateInstantBill implements ShouldQueue
      *
      * @param OrderService $service
      * @return void
+     * @throws
      */
     public function handle(OrderService $service)
     {
@@ -40,6 +41,7 @@ class OrderCreateInstantBill implements ShouldQueue
                 LogService::log(__METHOD__,"ERROR-订单生成即时账单",$this->order->toJson());
         }catch (\Exception $e){
             LogService::log(__METHOD__,"ERROR-订单生成即时账单",$this->order->toJson()." | ".$e->getMessage());
+            throw new \Exception($e->getMessage());
         }
     }
 }

app/Jobs/ProcessCreateInstantBill.php

@@ -32,6 +32,7 @@ class ProcessCreateInstantBill implements ShouldQueue
      *
      * @param ProcessService $service
      * @return void
+     * @throws
      */
     public function handle(ProcessService $service)
     {
@@ -39,6 +40,7 @@ class ProcessCreateInstantBill implements ShouldQueue
             $service->createInstantBill($this->process);
         }catch (\Exception $e){
             LogService::log(__METHOD__,"ERROR-入库生成即时账单",$this->process->toJson()." | ".$e->getMessage());
+            throw new \Exception($e->getMessage());
         }
     }
 }

app/Jobs/RejectedBillCreateInstantBill.php

@@ -31,6 +31,7 @@ class RejectedBillCreateInstantBill implements ShouldQueue
      * Execute the job.
      *
      * @return void
+     * @throws
      */
     public function handle()
     {
@@ -38,6 +39,7 @@ class RejectedBillCreateInstantBill implements ShouldQueue
             app("RejectedBillService")->buildInstantBill($this->rejected);
         }catch(\Exception $exception){
             LogService::log(__CLASS__,"退货单建立即时账单",$exception->getMessage()." | ".json_encode($this->rejected));
+            throw new \Exception($e->getMessage());
         }
     }
 }

app/Jobs/ResetInstantBill.php

@@ -48,92 +48,7 @@ class ResetInstantBill implements ShouldQueue
     {
         switch ($this->detail->outer_table_name){
             case "orders":
-                /** @var \stdClass $order */
-                $order = Order::query()->find($this->detail->outer_id);
-                $key = date("Y-m")."_".$order->owner_id;
-                if (Cache::has($key))Cache::increment($key);
-                else Cache::put($key,1,2678400);
 
-                $order->loadMissing(["logistic","shop","packages.commodities.commodity","batch"]);
-
-                /** @var OwnerPriceExpressService $service */
-                $service = app("OwnerPriceExpressService");
-                $logistic_fee = 0;
-                $commodities = [];
-                $amount = 0;
-                $volume = 0;
-                $weight = 0;
-                $logistic_bill = "";
-
-                if (!$order->logistic || $order->logistic->type != "快递")$logistic_fee = null;
-
-                $items = [];
-                foreach ($order->packages as &$package){
-                    $logistic_bill .= $package->logistic_number.",";
-                    $volume += $package->bulk;
-                    $weight += $package->weight;
-
-                    // 四维转二维
-                    $partAmount = 0;
-                    foreach($package->commodities as &$commodity){
-                        $commodity["commodity_name"] = $commodity->commodity ? $commodity->commodity->name : '';
-                        $commodity["sku"] = $commodity->commodity ? $commodity->commodity->sku : '';
-                        $partAmount += $commodity->amount;
-                    }
-                    $amount += $partAmount;
-                    $commodities = array_merge($commodities,$package->commodities->toArray());
-
-                    $provinceName = mb_substr($order->province,0,2);
-                    $province = app(CacheService::class)->getOrExecute("province_".$provinceName,function ()use($provinceName){
-                        return Province::query()->where("name","like",$provinceName."%")->first();
-                    },86400);
-                    if ($province){
-                        $fee = $service->matching($package->weight, $order->owner_id, $order->logistic_id, $province->id);
-                    }else{
-                        $logistic_fee = null;
-                        $fee = null;
-                    }
-
-                    $items[] = [
-                        "amount" => $partAmount,
-                        "logistic_bill" => $package->logistic_number,
-                        "volume"=>$package->bulk,
-                        "weight"=>$package->weight,
-                        "logistic_fee" => $fee>0 ? $fee : null,
-                    ];
-                    if ($logistic_fee!==null){
-                        if ($fee<0)$logistic_fee = null;
-                        else $logistic_fee += $fee;
-                    }
-                }
-                if ($logistic_fee!==null && $logistic_fee<0)$logistic_fee = null;
-
-                $object = ["commodities"=>$commodities,
-                    "logistic_name"=>($order->logistic ? $order->logistic->name : ''),
-                    "shop_name"=>($order->shop ? $order->shop->name : ''),
-                    "order_type"=>$order->order_type,
-                    "batch_type" => $order->batch ? $order->batch->wms_type : '',
-                    "owner_id"=>$order->owner_id];
-                $mapping = ["packages"=>"commodities","商品名称"=>"commodity_name",
-                    "承运商"=>"logistic_name","店铺类型"=>"shop_name","订单类型"=>"order_type",
-                    "波次类型"=>"batch_type"];
-
-                /** @var OwnerPriceOperationService $service */
-                $service = app("OwnerPriceOperationService");
-                $result = $service->matching($object,$mapping,$order->owner_id,"出库");
-
-
-                $detail = $this->detail->update([
-                    "work_fee"          => is_array($result) ? ($result["money"]>0 ? $result["money"] : null) : null,
-                    "logistic_fee"      => $logistic_fee,
-                ]);
-                if ($detail){
-                    foreach ($items as $item){
-                        OwnerFeeDetailLogistic::query()->where("owner_fee_detail_id",$detail->id)
-                            ->where("logistic_bill",$item["logistic_bill"])
-                            ->update($item);
-                    }
-                }
                 break;
             case "processes":
                 /** @var \stdClass $process */

app/Jobs/StoreCreateInstantBill.php

@@ -33,6 +33,7 @@ class StoreCreateInstantBill implements ShouldQueue
      *
      * @param StoreService $service
      * @return void
+     * @throws
      */
     public function handle(StoreService $service)
     {
@@ -40,6 +41,7 @@ class StoreCreateInstantBill implements ShouldQueue
             $service->createInstantBill($this->store);
         }catch (\Exception $e){
             LogService::log(__METHOD__,"ERROR-入库生成即时账单",$this->store->toJson()." | ".$e->getMessage());
+            throw new \Exception($e->getMessage());
         }
     }
 }

app/Jobs/WaybillCreateInstantBill.php

@@ -33,6 +33,7 @@ class WaybillCreateInstantBill implements ShouldQueue
      *
      * @param WaybillService $service
      * @return void
+     * @throws
      */
     public function handle(WaybillService $service)
     {
@@ -40,6 +41,7 @@ class WaybillCreateInstantBill implements ShouldQueue
             $service->createInstantBill($this->waybill);
         }catch (\Exception $e){
             LogService::log(__METHOD__,"ERROR-运输计算运费失败",$this->waybill->toJson()." | ".$e->getMessage());
+            throw new \Exception($e->getMessage());
         }
     }
 }

app/Services/OrderService.php

@@ -1067,7 +1067,7 @@ sql
         if ($isToB)$type = "|B|";
         else $type = "|C|";
         if (!Cache::has($date.$type.$owner))$this->orderQuantityCompensationLogic($owner);
-        return Cache::get($date.$type.$owner);
+        return Cache::get($date.$type.$owner)+1;//+1是算本单
     }
 
     /**
@@ -1083,8 +1083,6 @@ sql
         if (!$order || $order->wms_status != "订单完成")return true;
         if (OwnerFeeDetail::query()->where("outer_table_name","orders")->where("outer_id",$order->id)->first())return true;
 
-        $this->setOrderQuantity($order->owner_id,$order->logistic_id);
-
         $order->loadMissing(["logistic","shop","packages.commodities.commodity","batch"]);
 
         /** @var OwnerPriceExpressService $service */
@@ -1161,6 +1159,7 @@ sql
        if ($detail){
             foreach ($items as &$item)$item["owner_fee_detail_id"] = $detail->id;
             if (count($items)>1)OwnerFeeDetailLogistic::query()->insert($items);
+            $this->setOrderQuantity($order->owner_id,$order->logistic_id);
             return true;
        }
        return false;