采购-计算询价截止时间

app/Services/ProcurementService.php

@@ -34,10 +34,17 @@ class ProcurementService
         $configurationService=app(ConfigurationService::class);
         $enquiry_time=$configurationService->getEnquiryTime();
         $date=Carbon::parse($time)->toDateString();
-        if ($time<$date." 09:00:00")$deadline=Carbon::parse($date." 09:00:00")->subHours(-$enquiry_time);
-        if($time>=$date." 09:00:00" && $time<$date." 14:00:00") $deadline=Carbon::parse($time)->subHours(-$enquiry_time);
-        if ($time>=$date." 14:00:00")$deadline=Carbon::parse($time)->subHours(-15-$enquiry_time);
-        if ($deadline) return $deadline;
+        $date_tom=Carbon::parse($time)->subDays(-1)->toDateString();
+        $hour=Carbon::parse($time)->format('H');
+        if ($hour < 9)return Carbon::parse($date." 09:00:00")->subHours(-$enquiry_time)->toDateTimeString();
+        if ($hour >=9 && $hour <12)return Carbon::parse($time)->subHours(-$enquiry_time-1)->toDateTimeString();
+        if ($hour ==12)return Carbon::parse($date." 13:00:00")->subHours(-$enquiry_time)->toDateTimeString();
+        if ($hour >12 && $hour < 18){
+            if (18-$hour>=$enquiry_time) return Carbon::parse($date." ".$hour.":00:00")->subHours(-$enquiry_time)->toDateTimeString();
+            return Carbon::parse($date_tom." 09:00:00")->subHours(-$enquiry_time+(18-$hour))->toDateTimeString();
+        }
+        if ($hour>=18)return Carbon::parse($date_tom." 09:00:00")->subHours(-$enquiry_time)->toDateTimeString();
+
     }
     public function screenSupplier($user,$material)
     {

app/Services/ProcurementWeiXinSendMessageService.php

@@ -24,9 +24,9 @@ class ProcurementWeiXinSendMessageService
             $params['mp_template_msg'] = $param['mp_template_msg'];
             $res = $this -> send_message($params);
         } catch (\Exception $e) {
-            $this->error('发送模板消息失败！');
+            LogService::log(__METHOD__,"发送模板消息失败",$params." | ".$e->getMessage());
         }
-        $this->success('发送模板消息成功！');
+        LogService::log(__METHOD__,"发送模板消息成功",$params);
     }
 
     /**

resources/views/procurement/procurement/index.blade.php

@@ -406,7 +406,7 @@
                     this.specification = '';this.quantity = '';
                     this.amount = '';this.unit_price = '';
                     this.total_price = '';this.procurement_id='';
-                    this.supplier_id='',this.offer='';
+                    this.supplier_id='';this.offer='';
                 },
                 procurementExport(selectAll) {
                     let url = '{{url('procurement/procurement/procurementExport')}}';