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

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 $this->success($ret);
+    }
 }

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';
         //增值服务接口

app/Controller/v3/UserDeliveryAddressController.php → 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()

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();
+    }
 }

app/Service/v3/Implementations/UserAddressService.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace App\Service\v3\Implementations;
+use App\Model\v3\UserAddress;
+use App\Service\v3\Interfaces\UserAddressServiceInterface;
+
+class UserAddressService implements UserAddressServiceInterface
+{
+
+    public function do($userAddressId,$user_id,$user_name,$address,$doorplate,$gender,$lat,$lng,$tel,$tags)
+    {
+        $userAddress = UserAddress::query()->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);
+    }
+}

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();
 }

app/Service/v3/Interfaces/UserAddressServiceInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+
+namespace App\Service\v3\Interfaces;
+
+
+interface UserAddressServiceInterface
+{
+    public function do($userAddressId,$user_id,$user_name,$address,$doorplate,$gender,$lat,$lng,$tel,$tags);
+    public function check();
+    public function undo($userAddressId);
+    public function getDefault($userId);
+    public function getList($userId);
+}

config/autoload/dependencies.php

@@ -68,4 +68,5 @@ return [
     \App\Service\v3\Interfaces\WithdrawalListServiceInterface::class => \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,
 ];

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]]);
 
 // 需要登录的路由
@@ -122,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]]);