feat: #10000 暂存

This commit is contained in:
赵世界 2023-04-03 21:10:03 +08:00
parent 9734d058e3
commit 5295a48576
6 changed files with 54 additions and 5 deletions

View File

@ -54,7 +54,7 @@ class GoodsSkuLocationController extends Controller
return response()->json($this->res); return response()->json($this->res);
} }
public function importLocation(Request $request) public function import(Request $request)
{ {
if (!$request->hasFile('goodsSkuLocation')) { if (!$request->hasFile('goodsSkuLocation')) {
$this->res = [ $this->res = [

View File

@ -2,8 +2,12 @@
namespace App\Models; namespace App\Models;
use App\Models\traits\Filter;
class BusinessOrder extends Model class BusinessOrder extends Model
{ {
use Filter;
public $fieldSearchable = [ public $fieldSearchable = [
'participate_no', 'participate_no',
'shop_id' 'shop_id'

View File

@ -57,6 +57,8 @@ class CreateBusinessOrdersTable extends Migration
$table->timestamps(); $table->timestamps();
// 索引 // 索引
$table->unique(['shop_id', 'order_sn']); $table->unique(['shop_id', 'order_sn']);
$table->index(['shop_id', 'participate_no']);
$table->index(['shop_id', 'confirm_at', 'after_sales_status', 'cancel_status', 'is_supplier']);
}); });
} }

View File

@ -25,6 +25,8 @@ class CreateGoodsSkuLocationsTable extends Migration
$table->tinyInteger('status')->default(1); $table->tinyInteger('status')->default(1);
$table->string('note')->nullable(); $table->string('note')->nullable();
$table->timestamps(); $table->timestamps();
$table->unique('external_sku_id', 'location');
}); });
} }

View File

@ -122,6 +122,31 @@ return [
'name' => '删除', 'name' => '删除',
'parent_id' => 4, 'parent_id' => 4,
], ],
'GOODS_SKU_LOCATION' => [
'id' => 15,
'name' => '商品货架',
'parent_id' => 1,
],
'goods_sku_location.index' => [
'id' => 150,
'name' => '列表',
'parent_id' => 15,
],
'goods_sku_location.import' => [
'id' => 151,
'name' => '导入',
'parent_id' => 15,
],
'goods_sku_location.update' => [
'id' => 152,
'name' => '更新',
'parent_id' => 15,
],
'goods_sku_location.destroy' => [
'id' => 153,
'name' => '删除',
'parent_id' => 15,
],
// 店铺管理 // 店铺管理
'SHOP_MANAGE' => [ 'SHOP_MANAGE' => [
'id' => 5, 'id' => 5,
@ -282,16 +307,26 @@ return [
'name' => '同步库存', 'name' => '同步库存',
'parent_id' => 120, 'parent_id' => 120,
], ],
'plat.activity.list' => [
'id' => 1204,
'name' => '团购活动列表',
'parent_id' => 120,
],
'PLAT_ORDER_LIST' => [ 'PLAT_ORDER_LIST' => [
'id' => 14, 'id' => 14,
'name' => '订单列表', 'name' => '订单列表',
'parent_id' => 12, 'parent_id' => 12,
], ],
'plat_orders.index' => [ 'plat.orders.index' => [
'id' => 140, 'id' => 140,
'name' => '订单列表', 'name' => '订单列表',
'parent_id' => 14, 'parent_id' => 14,
], ],
'plat.orders.export' => [
'id' => 1400,
'name' => '配货单导出',
'parent_id' => 140,
],
// 团购管理 // 团购管理
'GROUP_MANAGEMENT' => [ 'GROUP_MANAGEMENT' => [
'id' => 13, 'id' => 13,

View File

@ -8,6 +8,7 @@ use App\Http\Controllers\Goods\GoodsSkusController;
use App\Http\Controllers\Business\BusinessGoodsSkusController; use App\Http\Controllers\Business\BusinessGoodsSkusController;
use App\Http\Controllers\Group\GroupsController; use App\Http\Controllers\Group\GroupsController;
use App\Http\Controllers\Business\BusinessOrderController; use App\Http\Controllers\Business\BusinessOrderController;
use App\Http\Controllers\Goods\GoodsSkuLocationController;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -47,11 +48,17 @@ Route::middleware(['auth:api', 'check.permissions'])->group(function () {
]]); ]]);
// 平台 // 平台
Route::resource('plat_goods', 'Business\BusinessGoodsSkusController', ['only' => ['index', 'update', 'destroy']]); Route::resource('plat_goods', 'Business\BusinessGoodsSkusController', ['only' => ['index', 'update', 'destroy']]);
Route::get('plat_orders', [BusinessOrderController::class, 'index']); Route::get('plat_orders', [BusinessOrderController::class, 'index'])->name('plat_orders.index');
Route::get('plat_group_activity/{shopId}', [BusinessOrderController::class, 'groupActivity']); Route::get('plat_orders/export', [BusinessOrderController::class, 'exportOrderBlank'])->name('plat.orders.export');
Route::get('plat_group_activity/{shopId}', [BusinessOrderController::class, 'groupActivity'])->name('plat.activity.list');
Route::post('plat/sync/{id}/stock', [BusinessGoodsSkusController::class, 'syncStock'])->name('plat.sync.stock'); Route::post('plat/sync/{id}/stock', [BusinessGoodsSkusController::class, 'syncStock'])->name('plat.sync.stock');
// 团购 // 团购
Route::resource('group', 'Group\GroupsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]); Route::resource('group', 'Group\GroupsController', ['only' => ['index', 'store', 'show', 'update', 'destroy']]);
// 商品货架
Route::get('goods_sku_location', [GoodsSkuLocationController::class, 'index'])->name('goods_sku_location.index');
Route::post('goods_sku_location', [GoodsSkuLocationController::class, 'import'])->name('goods_sku_location.import');
Route::put('goods_sku_location', [GoodsSkuLocationController::class, 'update'])->name('goods_sku_location.update');
Route::delete('goods_sku_location', [GoodsSkuLocationController::class, 'delete'])->name('goods_sku_location.delete');
}); });
// 登录 // 登录
Route::post('/auth/login', [LoginController::class, 'login'])->name('auth.login'); Route::post('/auth/login', [LoginController::class, 'login'])->name('auth.login');
@ -76,5 +83,4 @@ Route::post('business', [ShopsController::class, 'business'])->name('shop.put.bu
// 盘点导入 // 盘点导入
Route::post('inventory/goods_skus', [GoodsSkusController::class, 'inventoryImport'])->name('goods_sku.inventory'); Route::post('inventory/goods_skus', [GoodsSkusController::class, 'inventoryImport'])->name('goods_sku.inventory');
Route::post('upload', [UploadController::class, 'store'])->name('upload.file'); Route::post('upload', [UploadController::class, 'store'])->name('upload.file');