diff --git a/app/Model/v3/Feprint.php b/app/Model/v3/Feprint.php new file mode 100644 index 0000000..4a8bf22 --- /dev/null +++ b/app/Model/v3/Feprint.php @@ -0,0 +1,13 @@ + &$item) { // $item = (array)$item; // } - + $printSn = Feprint::query()->where('market_id',$data->market_id)->value('sn'); $content = $this->printFormat($data, 4, 14, 7, 7); - $res = $this->printMsg('920527381', $content, 1); + $res = $this->printMsg($printSn, $content, 1); return $res; } diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php index eef1807..cc2b283 100644 --- a/app/Service/v3/Implementations/UserAddressService.php +++ b/app/Service/v3/Implementations/UserAddressService.php @@ -89,7 +89,7 @@ class UserAddressService implements UserAddressServiceInterface throw new ErrorCodeException(ErrorCode::LOCATION_USER_ADDRESS); } - $distance = $this->locationService->getDistanceByTencent($address['address']->lng,$address['address']->lat,$market->lng,$market->lat); + $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat); $distributionPrice = $this->distributionPriceService->do($distance); $res['address'] = $address; $res['delivery_distance'] = $distance;