cqp преди 1 седмица
родител
ревизия
8d9d8648e9
променени са 2 файла, в които са добавени 8 реда и са изтрити 0 реда
  1. 4 0
      app/Model/FreightFee.php
  2. 4 0
      app/Service/StatisticsService.php

+ 4 - 0
app/Model/FreightFee.php

@@ -13,6 +13,10 @@ class FreightFee extends UseScopeBaseModel
     const businessTypeReturn = 66;
     const deliveryModeNormal = 70519;
     const deliveryModeRightNow = 70536;
+    public static $delivery = [
+        self::deliveryModeNormal => '纯自提',
+        self::deliveryModeRightNow => '当日达',
+    ];
 
     const employee_column = 'employee_id_1';
 

+ 4 - 0
app/Service/StatisticsService.php

@@ -658,6 +658,10 @@ class StatisticsService extends Service
                 foreach ($val as $key => $row) {
                     $order_time = $row['order_time'] ? date('Y-m-d',$row['order_time']) : '';
                     $val[$key]['order_time_show'] = $order_time;
+                    $val[$key]['is_present_show'] = $row['is_present'] ? '是' : '否';
+                    $delivery_mode_show = FreightFee::$delivery[$row['delivery_mode']] ?? "";
+                    $val[$key]['delivery_mode_show'] = $delivery_mode_show;
+                    $val[$key]['area_range_show'] = $row['area_range'] == 1 ? '1~5吨' : '5吨以上';
                     foreach ($sumFields as $field) {
                         $sumRow[$field] = isset($sumRow[$field])
                             ? bcadd($sumRow[$field], $row[$field], 2)