feat: #10000 暂存

app/Filters/BusinessGoodsSkuFilter.php

@@ -14,7 +14,7 @@ class BusinessGoodsSkuFilter extends Filters
         return $this->builder->where('goods_name', '=', trim($value));
     }
 
-    protected function shipId($value)
+    protected function shopId($value)
     {
         return $this->builder->where('shop_id', '=', trim($value));
     }

app/Filters/BusinessOrderFilter.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filters;
+
+class BusinessOrderFilter extends Filters
+{
+    protected function participateNo($value)
+    {
+        return $this->builder->where('participate_no', '=', trim($value));
+    }
+
+
+    protected function shopId($value)
+    {
+        return $this->builder->where('shop_id', '=', trim($value));
+    }
+}

app/Http/Controllers/Business/BusinessOrderController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Business;
+
+use App\Http\Controllers\Controller;
+use App\Models\BusinessOrder;
+use Illuminate\Http\Request;
+use App\Http\Resources\BusinessOrderResource;
+
+class BusinessOrderController extends Controller
+{
+    public function index(Request $request)
+    {
+        $businessOrders = BusinessOrder::query()
+            ->filter()
+            ->with(['shop:id,name'])
+            ->paginate($request->get('per_page'));
+
+        return BusinessOrderResource::collection($businessOrders);
+    }
+
+    public function exportOrderBlank(Request $request)
+    {
+
+    }
+}

app/Http/Resources/BusinessOrderResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class BusinessOrderResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}

app/Models/BusinessGoodsSku.php

@@ -64,6 +64,6 @@ class BusinessGoodsSku extends Model
 
     public function shop()
     {
-        return $this->hasOne(Shop::class, 'id', 'shop_id');
+        return $this->belongsTo(Shop::class, 'shop_id', 'id');
     }
 }

app/Models/BusinessOrder.php

@@ -4,6 +4,11 @@ namespace App\Models;
 
 class BusinessOrder extends Model
 {
+    public $fieldSearchable = [
+        'participate_no',
+        'shop_id'
+    ];
+
     protected $fillable = [
         'shop_id',
         'receiver_address_detail',
@@ -45,4 +50,9 @@ class BusinessOrder extends Model
     {
         return $this->hasMany(BusinessOrderItem::class, 'business_order_id');
     }
+
+    public function shop()
+    {
+        return $this->belongsTo(Shop::class, 'shop_id', 'id');
+    }
 }

app/Models/BusinessOrderItem.php

@@ -32,11 +32,11 @@ class BusinessOrderItem extends Model
 
     public function order()
     {
-        return $this->hasOne(BusinessOrder::class, 'id', 'business_order_id');
+        return $this->belongsTo(BusinessOrder::class, 'business_order_id', 'id');
     }
 
     public function shop()
     {
-        return $this->hasOne(Shop::class, 'id', 'shop_id');
+        return $this->belongsTo(Shop::class, 'shop_id', 'id');
     }
 }

app/Models/Goods.php

@@ -42,11 +42,11 @@ class Goods extends Model
 
     public function brand()
     {
-        return $this->hasOne(GoodsBrand::class, 'id', 'brand_id');
+        return $this->belongsTo(GoodsBrand::class, 'brand_id', 'id');
     }
 
     public function type()
     {
-        return $this->hasOne(GoodsType::class, 'id', 'type_id');
+        return $this->belongsTo(GoodsType::class, 'type_id', 'id');
     }
 }

app/Models/GoodsSku.php

@@ -64,7 +64,7 @@ class GoodsSku extends Model
      */
     public function goods()
     {
-        return $this->hasOne(Goods::class, 'id', 'goods_id');
+        return $this->belongsTo(Goods::class, 'goods_id', 'id');
     }
 
     /**
@@ -74,9 +74,4 @@ class GoodsSku extends Model
     {
         return $this->hasOne(DailyStockRecord::class, 'sku_id', 'id');
     }
-
-    public function order()
-    {
-        return $this->hasOne(BusinessOrderItem::class, 'external_sku_id', 'id');
-    }
 }

app/Models/Groups.php

@@ -63,6 +63,6 @@ class Groups extends Model
 
     public function shop()
     {
-        return $this->hasOne(Shop::class, 'id', 'shop_id');
+        return $this->belongsTo(Shop::class, 'shop_id', 'id');
     }
 }

app/Models/Log.php

@@ -122,6 +122,6 @@ class Log extends Model
 
     public function user()
     {
-        return $this->hasOne(User::class, 'id', 'user_id');
+        return $this->belongsTo(User::class, 'user_id', 'id');
     }
 }

app/Models/Model.php

@@ -12,7 +12,7 @@ class Model extends EloquentModel
         return $query->orderBy('id', 'desc');
     }
 
-    public function scopeOlder($query)
+    public function scopeOrder($query)
     {
         return $query->orderBy('id', 'asc');
     }

database/seeds/MenusTableSeeder.php

@@ -34,6 +34,7 @@ class MenusTableSeeder extends Seeder
         $id = DB::table('menus')->insertGetId(['parent_id' => 0, 'code' => 'PLAT', 'name' => '平台', 'seq' => 40]);
         DB::table('menus')->insert([
             ['parent_id' => $id, 'code' => 'PLAT_GOODS_LIST', 'name' => '货品列表', 'seq' => 0],
+            ['parent_id' => $id, 'code' => 'PLAT_ORDER_LIST', 'name' => '订单列表', 'seq' => 1],
         ]);
         // 团购
         DB::table('menus')->insertGetId(['parent_id' => 0, 'code' => 'GROUP_MANAGEMENT', 'name' => '团购管理', 'seq' => 1]);

resources/frontend/src/router/list.js

@@ -70,6 +70,11 @@ const list = [
         name: "货品列表",
         component: () => import("../views/plat/goodsList.vue"),
       },
+      {
+        path: "PLAT_ORDER_LIST",
+        name: "订单列表",
+        component: () => import("../views/plat/orderList.vue"),
+      },
       {
         path: "GROUP_MANAGEMENT",
         name: "团购管理",

resources/frontend/vue.config.js

@@ -11,8 +11,8 @@ module.exports = {
     proxy: {
       // 配置代理
       "/api": {
-        // target: "http://172.23.134.136:81",
+        target: "http://192.168.247.186:81",
-        target: "http://erp.chutang66.com",
+        // target: "http://erp.chutang66.com",
         changeOrigin: true, // 开启代理
         pathRewrite: {
           // 重命名

resources/lang/zh-CN/permission.php

@@ -282,6 +282,16 @@ return [
         'name' => '同步库存',
         'parent_id' => 120,
     ],
+    'PLAT_ORDER_LIST' => [
+        'id' => 14,
+        'name' => '订单列表',
+        'parent_id' => 12,
+    ],
+    'plat_orders.index' => [
+        'id' => 140,
+        'name' => '订单列表',
+        'parent_id' => 14,
+    ],
     // 团购管理
     'GROUP_MANAGEMENT' => [
         'id' => 13,

routes/api.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Shop\ShopsController;
 use App\Http\Controllers\Goods\GoodsSkusController;
 use App\Http\Controllers\Business\BusinessGoodsSkusController;
 use App\Http\Controllers\Group\GroupsController;
+use App\Http\Controllers\Business\BusinessOrderController;
 
 /*
 |--------------------------------------------------------------------------
@@ -46,6 +47,7 @@ Route::middleware(['auth:api', 'check.permissions'])->group(function () {
     ]]);
     // 平台
     Route::resource('plat_goods', 'Business\BusinessGoodsSkusController', ['only' => ['index', 'update', 'destroy']]);
+    Route::get('plat_orders', [BusinessOrderController::class, 'index']);
     Route::post('plat/sync/{id}/stock', [BusinessGoodsSkusController::class, 'syncStock'])->name('plat.sync.stock');
     // 团购
     Route::resource('group', 'Group\GroupsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);