From e3269131e6a35b4733360a588322ec8b07f6843f Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 5 Sep 2020 20:02:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/LocationController.php | 9 +++++++++ app/Service/v3/Implementations/LocationService.php | 6 ++++++ app/Service/v3/Interfaces/LocationServiceInterface.php | 1 + config/routes.php | 1 + 4 files changed, 17 insertions(+) diff --git a/app/Controller/v3/LocationController.php b/app/Controller/v3/LocationController.php index b46ceac..bee31f0 100644 --- a/app/Controller/v3/LocationController.php +++ b/app/Controller/v3/LocationController.php @@ -49,4 +49,13 @@ class LocationController extends BaseController $cityIds = [2163,2189]; return $this->success($this->locationService->getMarketListByLocation($cityIds)); } + + public function getMarketsInfo() + { + $ret = []; + $ret['service_time']='8:30-20:00'; + $ret['markets_info']=$this->locationService->getMarketsInfo(); + + return $ret; + } } \ No newline at end of file diff --git a/app/Service/v3/Implementations/LocationService.php b/app/Service/v3/Implementations/LocationService.php index c922c74..f34afb6 100644 --- a/app/Service/v3/Implementations/LocationService.php +++ b/app/Service/v3/Implementations/LocationService.php @@ -72,4 +72,10 @@ class LocationService implements LocationServiceInterface return round($distance, $decimal); } + + //获取服务站信息 + function getMarketsInfo() + { + return Market::where('status',1)->get(); + } } \ No newline at end of file diff --git a/app/Service/v3/Interfaces/LocationServiceInterface.php b/app/Service/v3/Interfaces/LocationServiceInterface.php index 6bed48b..688ae98 100644 --- a/app/Service/v3/Interfaces/LocationServiceInterface.php +++ b/app/Service/v3/Interfaces/LocationServiceInterface.php @@ -11,4 +11,5 @@ interface LocationServiceInterface public function undo(); public function getMarketListByLocation($cityIds); public function searchMarket($key,$cityId = 2163); + public function getMarketsInfo(); } \ No newline at end of file diff --git a/config/routes.php b/config/routes.php index 52d47e7..0d898fc 100644 --- a/config/routes.php +++ b/config/routes.php @@ -91,6 +91,7 @@ Router::addGroup('/v3/', function () { Router::post('goodsRecommend/getByTab', 'App\Controller\v3\GoodsRecommendController@getByTab'); Router::post('store/index', 'App\Controller\v3\StoreController@index'); Router::post('Search/market', 'App\Controller\v3\SearchController@market'); + Router::post('market/services', 'App\Controller\v3\LocationController@getMarketsInfo'); },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class]]); // 需要登录的路由 From 44d15fe127896c6398078787853cb85fa5e1b07f Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Sat, 5 Sep 2020 20:09:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/OrderOnlineController.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index 3a04c5a..a2cd5e7 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -7,7 +7,7 @@ use App\Controller\BaseController; use App\Exception\ErrorCodeException; use App\Request\v3\OrderOnlineDetailRequest; use App\Request\v3\OrderOnlineRequest; -use App\Service\CouponServiceInterface; +use App\Service\v3\Interfaces\CouponRecServiceInterface; use App\Service\v3\Interfaces\ShopCartServiceInterface; use Hyperf\Di\Annotation\Inject; use App\Service\v3\Interfaces\OrderOnlineServiceInterface; @@ -25,9 +25,9 @@ class OrderOnlineController extends BaseController protected $userBindTelService; /** * @Inject - * @var CouponServiceInterface + * @var CouponRecServiceInterface */ - protected $couponService; + protected $couponRecService; /** * @Inject * @var AppointmentTimeServiceInterface @@ -70,7 +70,8 @@ class OrderOnlineController extends BaseController // $res['store_list'] = $this->shopCartService->do(); //获取用户优惠券 - $res['coupon'] = $this->couponService->getUserAvailableCoupons('',$params['user_id'],'',2,'',''); + $res['coupon']['available'] = $this->couponRecService->allForOrderOlAvailable('181.02',$params['user_id'],'',1,'',''); + $res['coupon']['not_available'] = $this->couponRecService->allForOrderOlAvailable('181.02',$params['user_id'],'',1,'',''); //获取配送费 $res['distribution_price'] = '5.0'; //增值服务接口 From 10b04c9b530b72d44b18c4ecedebe953e071a85b Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 5 Sep 2020 20:17:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=BAsuccess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/LocationController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controller/v3/LocationController.php b/app/Controller/v3/LocationController.php index bee31f0..8fbffae 100644 --- a/app/Controller/v3/LocationController.php +++ b/app/Controller/v3/LocationController.php @@ -56,6 +56,6 @@ class LocationController extends BaseController $ret['service_time']='8:30-20:00'; $ret['markets_info']=$this->locationService->getMarketsInfo(); - return $ret; + return $this->success($ret); } } \ No newline at end of file From 5ac052b4d12d0ec28c73611ef9015e0e3906b7fe Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Sat, 5 Sep 2020 20:38:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntroller.php => UserAddressController.php} | 42 +++++++++++------ .../v3/Implementations/UserAddressService.php | 46 +++++++++++++++++++ .../UserAddressServiceInterface.php | 14 ++++++ config/autoload/dependencies.php | 1 + config/routes.php | 1 + 5 files changed, 89 insertions(+), 15 deletions(-) rename app/Controller/v3/{UserDeliveryAddressController.php => UserAddressController.php} (50%) create mode 100644 app/Service/v3/Implementations/UserAddressService.php create mode 100644 app/Service/v3/Interfaces/UserAddressServiceInterface.php diff --git a/app/Controller/v3/UserDeliveryAddressController.php b/app/Controller/v3/UserAddressController.php similarity index 50% rename from app/Controller/v3/UserDeliveryAddressController.php rename to app/Controller/v3/UserAddressController.php index 872b120..8d9a431 100644 --- a/app/Controller/v3/UserDeliveryAddressController.php +++ b/app/Controller/v3/UserAddressController.php @@ -4,32 +4,44 @@ namespace App\Controller\v3; use App\Controller\BaseController; - -class UserDeliveryAddressController extends BaseController +use App\Service\v3\Interfaces\UserAddressServiceInterface; +use Hyperf\Di\Annotation\Inject; +class UserAddressController extends BaseController { + /** + * @Inject + * @var UserAddressServiceInterface + */ + protected $userAddressService; + public function update() { - return $this->success(true); + $userAddressId = $this->request->input('user_address_id',''); + $user_id = $this->request->input('user_id',''); + $user_name = $this->request->input('user_name',''); + $address = $this->request->input('address',''); + $doorplate = $this->request->input('doorplate',''); + $gender = $this->request->input('gender',''); + $lat = $this->request->input('lat',''); + $lng = $this->request->input('lng',''); + $tel = $this->request->input('tel',''); + $tags = $this->request->input('tags',''); + $res = $this->userAddressService->do($userAddressId,$user_id,$user_name,$address,$doorplate,$gender,$lat,$lng,$tel,$tags); + return $this->success($res); } public function get() { - return $this->success( - [ - 'id' => 1, - 'name' => '李小龙', - 'sex' => '1', - 'tel' => '15677455632', - 'address' => '南宁市青秀区金湖北路59号地王国际商会中心', - 'detailed_address' => 'A栋805', - 'tag' => '同事家' - ] - ); + $userId = $this->request->input('user_id'); + $res = $this->userAddressService->getDefault($userId); + return $this->success($res); } public function delete() { - return $this->success(true); + $userAddressId = $this->request->input('user_address_id'); + $res = $this->userAddressService->undo($userAddressId); + return $this->success($res); } public function getList() diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php new file mode 100644 index 0000000..eb1b24f --- /dev/null +++ b/app/Service/v3/Implementations/UserAddressService.php @@ -0,0 +1,46 @@ +find($userAddressId); + $userAddress->user_id = $user_id; + $userAddress->user_name = $user_name; + $userAddress->address = $address; + $userAddress->doorplate = $doorplate; + $userAddress->gender = $gender; + $userAddress->lat = $lat; + $userAddress->lng = $lng; + $userAddress->tel = $tel; + $userAddress->tags = $tags; + return $userAddress->create(); + } + + public function check() + { + + } + + public function undo($userAddressId) + { + $userAddress = UserAddress::query()->find($userAddressId); + return $userAddress->delete(); + } + + public function getDefault($userId) + { + return UserAddress::query()->where('is_default',1)->find($userId); + } + + public function getList($userId) + { + return UserAddress::query()->find($userId); + } +} \ No newline at end of file diff --git a/app/Service/v3/Interfaces/UserAddressServiceInterface.php b/app/Service/v3/Interfaces/UserAddressServiceInterface.php new file mode 100644 index 0000000..fdc108f --- /dev/null +++ b/app/Service/v3/Interfaces/UserAddressServiceInterface.php @@ -0,0 +1,14 @@ + \App\Service\v3\Implementations\WithdrawalListService::class, \App\Service\v3\Interfaces\OrderOfflineServiceInterface::class => \App\Service\v3\Implementations\OrderOfflineService::class, \App\Service\v3\Interfaces\BusinessHoursServiceInterface::class => \App\Service\v3\Implementations\BusinessHoursService::class, + \App\Service\v3\Interfaces\UserAddressServiceInterface::class => \App\Service\v3\Implementations\UserAddressService::class, ]; diff --git a/config/routes.php b/config/routes.php index 0d898fc..fade882 100644 --- a/config/routes.php +++ b/config/routes.php @@ -123,4 +123,5 @@ Router::addGroup('/v3/', function () { Router::post('payment/wechatpayOnline', 'App\Controller\v3\PaymentController@wechatpayOnline'); Router::post('store/getBusinessHours', 'App\Controller\v3\StoreController@getBusinessHours'); Router::post('store/updateBusinessHours', 'App\Controller\v3\StoreController@updateBusinessHours'); + Router::post('userAddress/update', 'App\Controller\v3\UserAddressController@update'); },['middleware' => [\App\Middleware\Auth\ApiMiddleware::class, \App\Middleware\Auth\UserMiddleware::class]]); \ No newline at end of file