一个错误修复

app/OrderPackage.php

@@ -216,21 +216,12 @@ class OrderPackage extends Model
     public function fetchAllFromOracle()
     {
         if (empty($this->oracleInfo)) return null;
-        /*        $this->fetchOwnerFromOracle();
-                $this->fetchLogisticFromOracle();*/
-        /*        $this['recipient'] = $this->oracleInfo['consigneename'];
-                $this['order_code'] = $this->oracleInfo['orderno'];*/
         $this['batch_rule'] = $this->oracleInfo['descr'];
-        /*        $this['recipient_mobile'] = $this->oracleInfo['c_tel2']??$this->oracleInfo['c_tel1'];
-                if(!$this['logistic_number']&&$this->oracleInfo['soreference5'])
-                    $this['logistic_number'] = $this->oracleInfo['soreference5'];*/
         $this['batch_number'] = $this->oracleInfo['waveno'] ?? null;
     }
 
     static public function createPackagesFromBatchCode($batchCode, $weight)
     {
-
-
         $queryBuilder = OracleDOCOrderHeader::query()->select(self::$oracleOrderHeaderFields);
         $queryBuilder->where('doc_order_header.waveno', $batchCode);
         $queryBuilder->leftJoin('act_allocation_details', 'act_allocation_details.orderno', 'doc_order_header.orderno');
@@ -281,9 +272,6 @@ class OrderPackage extends Model
         DB::transaction(function () use ($newPackages) {
             OrderPackage::query()->insert($newPackages);
         });
-
-
-        app('LogService')->log(__METHOD__, "批量录入包裹成功", json_encode($packages), Auth::user()['id']);
     }
 
     public function unifyThisMeasureUnderSameBatch()

app/Services/RejectedBillService.php

@@ -354,7 +354,7 @@ class RejectedBillService
         $service = app("OwnerPriceOperationService");
         foreach ($stores as $store){
             $GLOBALS["FEE_INFO"] = [];
-            list($id,$money,$taxFee) = $service->matching($store, Feature::MAPPING["store"], $store->owner_id, "入库",0);
+            list($id,$money,$taxFee) = $service->matching(substr($rejectedBill->updated_at,0,7),$store, Feature::MAPPING["store"], $store->owner_id, "入库",0);
             $bill = OwnerFeeDetail::query()->where("outer_id",$store->id)->where("outer_table_name","stores")->first();
             if ($bill)app("StoreService")->clearFeeInfo($store->asn_code);
             if ($bill) $bill->update([