增值服务文案

app/Controller/v3/OrderOnlineController.php

@@ -103,7 +103,7 @@ class OrderOnlineController extends BaseController
         $res['coupon'] = $this->couponRecService->allForOnlineOrderAvailable($userId, $marketId);
         //增值服务接口
         $res['value_added_service'] = [
-            'text' => '买鸡买鸭,免费帮杀;买瓜买黇,包熟包甜',
+            'text' => '勾选本条款视为您同意接受懒族生活为您提供增值服务的费用，包括但不仅限于洗菜，切菜，装菜所产生的打包费用，送货上门等增值服务',
             'select' => 1,
             'price' => 3.50,
             'original_price' => 0.00

app/Service/v3/Implementations/StoreService.php

@@ -25,14 +25,15 @@ class StoreService implements StoreServiceInterface
             ->first();
         if(!empty($store)){
             $nowTime = time();
-            $time1 = strtotime(($store->time1));
+            $startTime = strtotime(($store->time1));
+            if(!empty($store->time3)  && !empty($store->time4)){
+                $time4 = strtotime(($store->time4));
+                $endTime = $time4;
+            }else{
                 $time2 = strtotime(($store->time2));
-            if($time1 < $nowTime && $nowTime < $time2){
-                return true;
+                $endTime = $time2;
             }
-            $time3 = strtotime(($store->time3));
-            $time4 = strtotime(($store->time4));
-            if($time3 < $nowTime && $nowTime < $time4){
+            if($nowTime > $startTime && $nowTime < $endTime){
                 return true;
             }
         }