结算修复

app/Http/Controllers/TestController.php

@@ -571,6 +571,6 @@ sql;
 
     public function calculationArrivedManNum()
     {
-        $this->dispatch(new CalculationArrivedManNumJob(\Illuminate\Support\Carbon::parse('2021-10-11')));
+        $this->dispatch(new CalculationArrivedManNumJob(\Illuminate\Support\Carbon::parse(now()->toDateString())));
     }
 }

app/Services/OwnerFeeTotalService.php

@@ -355,7 +355,9 @@ class OwnerFeeTotalService
             ->selectRaw("sum(baoshi_indemnity_money) as fee,owner_id,order_id")
             ->leftJoin('orders', 'order_issues.order_id', '=', 'orders.id')
             ->where('owner_id', $owner->id)
-            ->whereBetween('order_issues.created_at', [$start, $end])->first();
+            ->whereBetween('order_issues.created_at', [$start, $end])
+            ->whereBetween('orders.created_at', [$start, $end])
+            ->first();
         $ownerFeeTotal ['indemnityFee'] = [
             'fee' => $indemnityFee->fee ?? 0,
         ];

resources/views/finance/settlementBills/totalFee/index.blade.php

@@ -56,7 +56,10 @@
                 </tr>
              <template v-if="feeTotal['information']??false">
                  <tr>
-                     <td>仓储费</td>
+                     <td>
+                         <a target="_blank"
+                            href="{{ route('settlementBills.storageFee.index',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">仓储费</a>
+                     </td>
                      <td class="m-0 p-0">
                          <table class="table  m-0 p-0">
                              <tr v-for="item in feeTotal['information']['storageFee']">
@@ -96,7 +99,10 @@
                      </td>
                  </tr>
                  <tr>
-                     <td>入库费</td>
+                     <td>
+                         <a target="_blank"
+                            href="{{ route('settlementBills.storeFee.report',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">入库费</a>
+                     </td>
                      <td class="m-0 p-0">
                          <table class="table  m-0 p-0">
                              <tr v-for="item in feeTotal['information']['storeFee']">
@@ -139,7 +145,11 @@
                      </td>
                  </tr>
                  <tr>
-                     <td>出库费</td>
+                     <td>
+                         <a target="_blank"
+                            href="{{ route('settlementBills.storeOutFee.report',['owner_id' => $request['owner_id'],'year' => $request['year'],'month' => $request['month']]) }}">出库费</a>
+
+                     </td>
                      <td class="m-0 p-0">
                          <table class="table   m-0 p-0">
                              <tr v-for="item in feeTotal['information']['storeOutFee']">

routes/web.php

@@ -853,7 +853,7 @@ Route::group(['prefix'=>'package'],function(){
             });
             //仓储费
             Route::group(['prefix' => 'storageFee'], function () {
-                Route::get('','SettlementBillStorageFeeController@index');
+                Route::get('','SettlementBillStorageFeeController@index')->name('settlementBills.storageFee.index');
                 Route::post('confirmBill','SettlementBillStorageFeeController@confirmBill');
                 Route::any('export','SettlementBillStorageFeeController@export');
             });
@@ -864,7 +864,7 @@ Route::group(['prefix'=>'package'],function(){
                 Route::any('detail/export', 'SettlementBillStoreFeeDetailController@export');
                 Route::any('report/export', 'SettlementBillStoreFeeReportController@export');
                 Route::get('detail', 'SettlementBillStoreFeeDetailController@index');
-                Route::get('report', 'SettlementBillStoreFeeReportController@index');
+                Route::get('report', 'SettlementBillStoreFeeReportController@index')->name('settlementBills.storeFee.report');
             });
             //出库费
             Route::group(['prefix' => 'storeOutFee'], function () {
@@ -873,7 +873,7 @@ Route::group(['prefix'=>'package'],function(){
                 Route::any('detail/export', 'SettlementBillStoreOutFeeDetailController@export');
                 Route::any('report/export', 'SettlementBillStoreOutFeeReportController@export');
                 Route::get('detail', 'SettlementBillStoreOutFeeDetailController@index');
-                Route::get('report', 'SettlementBillStoreOutFeeReportController@index');
+                Route::get('report', 'SettlementBillStoreOutFeeReportController@index')->name('settlementBills.storeOutFee.report');
             });
             //杂项费
             Route::group(['prefix' => 'sundryFee'], function () {

tests/Services/OrderPackageReceivedSyncService/TestUpdate.php

@@ -69,23 +69,51 @@ class TestUpdate extends TestCase
         ];
 
         $this->service->update($data);
-        $this->assertDatabaseHas('order_packages',[
+        $this->assertDatabaseHas('order_packages', [
             'logistic_number' => 'SF1038651915891',
             'status' => '派送中',
             'received_at' => Carbon::now()->toDateTimeString(),
             'exception' => '否',
         ]);
-        $this->assertDatabaseHas('order_packages',[
+        $this->assertDatabaseHas('order_packages', [
             'logistic_number' => 'SF1038651413847',
             'status' => '派送中',
             'received_at' => Carbon::now()->toDateTimeString(),
             'exception' => '否',
         ]);
-        $this->assertDatabaseHas('order_packages',[
+        $this->assertDatabaseHas('order_packages', [
             'logistic_number' => 'SF1038611050071',
             'status' => '派送中',
             'received_at' => Carbon::now()->toDateTimeString(),
             'exception' => '否',
         ]);
     }
+
+    public function test_111()
+    {
+
+        $logistic_number = 'SF1038651915811';
+        OrderPackage::query()->where('logistic_number', $logistic_number)->delete();
+        $orderPackage = factory(OrderPackage::class)->create([
+            'logistic_number' => $logistic_number,
+            'is_manual_update' => true,
+            'exception_status' => '单号异常',
+            'status' => 2,
+        ]);
+
+        $data = [
+            [
+                'logistic_number' => $logistic_number,
+                'exception_status' => '延迟发货',
+            ],
+        ];
+        $this->service->update($data);
+//        OrderPackage::query()->where('logistic_number', $logistic_number)->update([
+//            'status' => 5,
+////            'exception_status' => 3,
+//        ]);
+
+        dump(OrderPackage::query()->where('logistic_number', $logistic_number)->get()->toArray());
+
+    }
 }