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

app/Controller/v3/OrderOnlineController.php

@@ -8,11 +8,13 @@ use App\Exception\ErrorCodeException;
 use App\Request\v3\OrderOnlineDetailRequest;
 use App\Request\v3\OrderOnlineRequest;
 use App\Service\CouponServiceInterface;
+use App\Service\v3\Interfaces\ShopCartServiceInterface;
 use Hyperf\Di\Annotation\Inject;
 use App\Service\v3\Interfaces\OrderOnlineServiceInterface;
 use App\Service\v3\Interfaces\UserBindTelServiceInterface;
 use App\Service\v3\Interfaces\AppointmentTimeServiceInterface;
 use Psr\Http\Message\ResponseInterface;
+use App\Model\v3\UserAddress;
 
 class OrderOnlineController extends BaseController
 {
@@ -38,6 +40,12 @@ class OrderOnlineController extends BaseController
      */
     protected $orderOnlineService;
 
+    /**
+     * @Inject
+     * @var ShopCartServiceInterface
+     */
+    protected $shopCartService;
+
     /*
      * 如果没有绑手机号去绑定页面
      * 收货地址接口
@@ -56,67 +64,15 @@ class OrderOnlineController extends BaseController
         //     throw new ErrorCodeException(ErrorCode::NOT_BIND_TEL_ERROR);
         // }
         //获取用户收货地址
-        $res['address'] = [
-            'address'   => '南宁市良庆区五象海尔·青啤联合广场',
-            'area'      => 'A栋八单元' ,
-            'lat'       => '22.759950637817383',
-            'lng'       => '108.3835678100586',
-            'sex'       => '1',
-            'tel'       => '15677717734',
-            'user_name' => '李小龙',
-            'user_id'   => '214'
-        ];
+        $res['address'] = UserAddress::query()->find(15);
         //返回预约送达时间 数组
         $res['appointment_time'] = $this->appointmentTimeService->do();
         //
-        $res['store_list'] = [
-            [
-                'store_nmae' => '五金杂货铺',
-                'price' => '100.00',
-                'note' => '多放辣椒',
-                'store_id' => 66,
-                'goods_list' =>
-                    [
-                        [
-                            'id' => 3971,
-                            'goods_id' => 1301,
-                            'name' => '半边手撕鸡',
-                            'num' => 4,
-                            'price' => '90.00',
-                            'total' => '360.00'
-                        ]
-                    ]
-            ],
-            [
-                'store_nmae' => '回味手撕鸡J009',
-                'note' => '手撕鸡加辣',
-                'store_price' => '720.00',
-                'store_id' => 123,
-                'goods_list' =>
-                    [
-                        [
-                            'id' => 3971,
-                            'goods_id' => 1301,
-                            'name' => '半边手撕鸡',
-                            'num' => 4,
-                            'price' => '90.00',
-                            'total' => '360.00'
-                        ],
-                        [
-                            'id' => 3971,
-                            'goods_id' => 1301,
-                            'name' => '半边手撕鸡',
-                            'num' => 4,
-                            'price' => '90.00',
-                            'total' => '360.00'
-                        ]
-                    ]
-            ],
-        ];
+        $res['store_list'] = $this->shopCartService->do();
         //获取用户优惠券
         $res['coupon'] = $this->couponService->getUserAvailableCoupons('',$params['user_id'],'',2,'','');
         //获取配送费
-        $res['distribution'] = '5.0';
+        $res['distribution_price'] = '5.0';
         //增值服务接口
         $res['value_added_service'] = [
             'select' => 1,

app/Model/v3/Goods.php

@@ -78,6 +78,15 @@ class Goods extends Model
         return $query->orderBy('price', $sort);
     }
 
+    public function getCoverImgAttribute($value)
+    {
+        if(strripos($value,"http") === false){
+            return config('alioss.img_host').'/'.$value;
+        }else{
+            return $value;
+        }
+    }
+
     public function getMonthSalesAttribute()
     {
         $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);