Browse Source

Merge branch 'phoenix' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into phoenix

master
weigang 6 years ago
parent
commit
473eb07a18
  1. 3
      app/Controller/v3/OrderOnlineController.php
  2. 4
      app/Service/v3/Implementations/AppointmentTimeService.php
  3. 2
      app/Service/v3/Implementations/DistributionPriceService.php

3
app/Controller/v3/OrderOnlineController.php

@ -105,7 +105,8 @@ class OrderOnlineController extends BaseController
$res['value_added_service'] = [ $res['value_added_service'] = [
'text' => '买鸡买鸭,免费帮杀;买瓜买黇,包熟包甜', 'text' => '买鸡买鸭,免费帮杀;买瓜买黇,包熟包甜',
'select' => 1, 'select' => 1,
'price' => 3.50
'price' => 3.50,
'original_price' => 0.00
]; ];
$total = 0; $total = 0;
foreach ($res['store_list'] as $store) foreach ($res['store_list'] as $store)

4
app/Service/v3/Implementations/AppointmentTimeService.php

@ -70,7 +70,7 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
} }
$time2Min = min($time2Arr); $time2Min = min($time2Arr);
$length = ceil(($time2Min - $time1Max) / 1800); $length = ceil(($time2Min - $time1Max) / 1800);
for ($i=0;$i<$length;$i++){
for ($i=1;$i<=$length;$i++){
$addTime = $time1Max + (30*60*$i); $addTime = $time1Max + (30*60*$i);
$res[] = date('h:i',$addTime); $res[] = date('h:i',$addTime);
} }
@ -81,7 +81,7 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
} }
$time4Min = min($time4Arr); $time4Min = min($time4Arr);
$length = ceil(($time4Min - $time3Max) / 1800); $length = ceil(($time4Min - $time3Max) / 1800);
for ($i=0;$i<$length;$i++){
for ($i=1;$i<=$length;$i++){
$addTime = $time3Max + (30*60*$i); $addTime = $time3Max + (30*60*$i);
$res[] = date('H:i',$addTime); $res[] = date('H:i',$addTime);
} }

2
app/Service/v3/Implementations/DistributionPriceService.php

@ -31,7 +31,7 @@ class DistributionPriceService implements DistributionPriceServiceInterface
break; break;
} }
$distributionRrice = bcadd($distributionRrice,3.50,2); $distributionRrice = bcadd($distributionRrice,3.50,2);
return $distributionRrice;
return (float) $distributionRrice;
} }
public function check() public function check()

Loading…
Cancel
Save