wesmiler vor 3 Monaten
Ursprung
Commit
fdc24870c3

+ 13 - 0
app/Http/Controllers/Api/v1/GoodsController.php

@@ -25,6 +25,19 @@ class GoodsController extends webApp
     }
     }
 
 
     /**
     /**
+     * 购买商品列表
+     * @return array
+     */
+    public function buyGoods()
+    {
+        $params =request()->post();
+        $goods = isset($params['goods']) && $params['goods'] ? $params['goods'] : [];
+        $ids = $goods ? array_column($goods, 'id') : [];
+        $datas = GoodsService::make()->getOrderGoods($ids, $goods, '', $this->userId);
+        return message(1010, true, $datas);
+    }
+
+    /**
      * 分类
      * 分类
      * @return array
      * @return array
      */
      */

+ 0 - 37
app/Http/Controllers/Api/v1/OrderController.php

@@ -31,18 +31,6 @@ class OrderController extends webApp
         return message(1010, true, $datas);
         return message(1010, true, $datas);
     }
     }
 
 
-    /**
-     * 验证订单状态
-     * @return array
-     */
-    public function check()
-    {
-        if ($data = OrderService::make()->checkOrderStatus($this->userId)) {
-            return showJson(1010, true, $data);
-        } else {
-            return showJson(1009, false);
-        }
-    }
 
 
     /**
     /**
      * 数量
      * 数量
@@ -55,31 +43,6 @@ class OrderController extends webApp
         return showJson(1010, true, $data);
         return showJson(1010, true, $data);
     }
     }
 
 
-
-    /**
-     * 详情
-     * @return array|mixed
-     */
-    public function info()
-    {
-        $params = request()->all();
-        $id = isset($params['id']) ? intval($params['id']) : 0;
-        $no = isset($params['order_no']) ? trim($params['order_no']) : '';
-        if ($id <= 0 && empty($no)) {
-            return showJson(1036, false);
-        }
-        if($no && preg_match("/^PR/", $no)){
-            $data = AccountService::make()->getPayOrderInfo($no);
-        }else{
-            $data = OrderService::make()->getOrderInfo($id, $no);
-        }
-
-        if (empty($data)) {
-            return showJson(1009, false);
-        }
-        return showJson(1010, true, $data);
-    }
-
     /**
     /**
      * 下单
      * 下单
      * @param OrderValidator $validator
      * @param OrderValidator $validator

+ 1 - 1
app/Services/Api/GoodsService.php

@@ -220,7 +220,7 @@ class GoodsService extends BaseService
      * @param $orderNo
      * @param $orderNo
      * @return array|false
      * @return array|false
      */
      */
-    public function getOrderGoods($ids, $goods, $orderNo, $userId=0)
+    public function getOrderGoods($ids, $goods, $orderNo='', $userId=0)
     {
     {
         $list = $this->model->whereIn('id', $ids)
         $list = $this->model->whereIn('id', $ids)
             ->where(['status'=>1,'mark'=>1])
             ->where(['status'=>1,'mark'=>1])

+ 1 - 0
routes/api.php

@@ -93,6 +93,7 @@ Route::prefix('v1')->middleware('web.login')->group(function() {
 
 
     // 商品
     // 商品
     Route::post('/goods/index', [\App\Http\Controllers\Api\v1\GoodsController::class, 'index']);
     Route::post('/goods/index', [\App\Http\Controllers\Api\v1\GoodsController::class, 'index']);
+    Route::post('/goods/buyGoods', [\App\Http\Controllers\Api\v1\GoodsController::class, 'buyGoods']);
     Route::post('/goods/info', [\App\Http\Controllers\Api\v1\GoodsController::class, 'info']);
     Route::post('/goods/info', [\App\Http\Controllers\Api\v1\GoodsController::class, 'info']);
     Route::post('/goods/collect', [\App\Http\Controllers\Api\v1\GoodsController::class, 'collect']);
     Route::post('/goods/collect', [\App\Http\Controllers\Api\v1\GoodsController::class, 'collect']);