Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 9afd8ff9 by 杨树贤
Options

上传规则区分现货的期货

parent 86ed2947
Inline Side-by-side
Showing with 93 additions and 14 deletions
app/Http/Services/DataService.php
...@@ -1597,4 +1597,23 @@ class DataService ...@@ -1597,4 +1597,23 @@ class DataService
} }
} }
//初始化sku的规则
public function initFuturesSkuUploadRuler()
{
$suppliers = SupplierChannelModel::where('sku_upload_ruler', '!=', '')->get()->toArray();
foreach ($suppliers as $supplier) {
$uploadRuler = $supplier['sku_upload_ruler'];
$uploadRuler = json_decode($uploadRuler, true);
$uploadRuler['futures_allow_stock_lte_0'] = 0;
$uploadRuler['futures_allow_moq_lte_0'] = 0;
$uploadRuler['futures_allow_price_null'] = 0;
$uploadRuler = json_encode($uploadRuler);
SupplierChannelModel::where('supplier_id',$supplier['supplier_id'])->update([
'sku_upload_ruler' => $uploadRuler,
]);
(new SupplierService())->saveSkuUploadRulerToRedis($supplier['supplier_id'],$uploadRuler);
}
}
} }
app/Http/Services/SupplierSkuUploadRulerService.php
...@@ -13,15 +13,21 @@ class SupplierSkuUploadRulerService ...@@ -13,15 +13,21 @@ class SupplierSkuUploadRulerService
public function getSkuUploadRulerDesc($ruler) public function getSkuUploadRulerDesc($ruler)
{ {
if (empty($ruler)) { if (empty($ruler)) {
return '允许库存为空:否 允许起订量为空:否 允许阶梯价为空:否'; return '现货 : 允许库存为空:否 允许起订量为空:否 允许阶梯价为空:否 | 期货 : 允许库存为空:否 允许起订量为空:否 允许阶梯价为空:否';
} }
$ruler = json_decode($ruler, true); $ruler = json_decode($ruler, true);
$desc = ''; $desc = '现货 : ';
$futuresDesc = '期货 : ';
foreach ($ruler as $name => $value) { foreach ($ruler as $name => $value) {
if (strpos($name, 'futures') !== false) {
$name = array_get(config('fixed.SkuUploadRuler'), $name);
$futuresDesc .= $name . ":" . ($value ? "是" : "否") . ' ';
} else {
$name = array_get(config('fixed.SkuUploadRuler'), $name); $name = array_get(config('fixed.SkuUploadRuler'), $name);
$desc .= $name . ":" . ($value ? "是" : "否") . ' '; $desc .= $name . ":" . ($value ? "是" : "否") . ' ';
} }
return $desc; }
return $desc . ' | ' . $futuresDesc;
} }
//给默认的sku上传规则 //给默认的sku上传规则
...@@ -29,7 +35,7 @@ class SupplierSkuUploadRulerService ...@@ -29,7 +35,7 @@ class SupplierSkuUploadRulerService
{ {
if (empty($ruler)) { if (empty($ruler)) {
return config('fixed.SkuUploadDefaultRuler'); return config('fixed.SkuUploadDefaultRuler');
}else{ } else {
return json_decode($ruler, true); return json_decode($ruler, true);
} }
......
app/Http/routes.php
...@@ -80,14 +80,15 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function () ...@@ -80,14 +80,15 @@ Route::group(['middleware' => ['external'], 'namespace' => 'Sync'], function ()
Route::match(['get', 'post'], '/test', function () { Route::match(['get', 'post'], '/test', function () {
$data = [ (new \App\Http\Services\DataService())->initFuturesSkuUploadRuler();
'supplier_code' => 'L0015420', // $data = [
'brand_id' => 0, // 'supplier_code' => 'L0015420',
'log_id' => 8379, // 'brand_id' => 0,
"down_type" => 1, // 'log_id' => 8379,
]; // "down_type" => 1,
//改成队列 // ];
(new SkuService())->batchOffShelfSkuQueue($data); // //改成队列
// (new SkuService())->batchOffShelfSkuQueue($data);
// (new \App\Http\Services\SupplierService())->initialCpTimeDays(15307, 5); // (new \App\Http\Services\SupplierService())->initialCpTimeDays(15307, 5);
// (new \App\Http\Services\DataService())->initFuturesCpTime(); // (new \App\Http\Services\DataService())->initFuturesCpTime();
......
config/fixed.php
...@@ -157,10 +157,16 @@ return [ ...@@ -157,10 +157,16 @@ return [
//{"allow_stock_lte_0":0,"allow_moq_lte_0":1,"allow_stock_lt_moq":0,"allow_price_null":1} //{"allow_stock_lte_0":0,"allow_moq_lte_0":1,"allow_stock_lt_moq":0,"allow_price_null":1}
'SkuUploadRuler' => [ 'SkuUploadRuler' => [
//现货
'allow_stock_lte_0' => '允许库存为空', 'allow_stock_lte_0' => '允许库存为空',
'allow_moq_lte_0' => '允许起订量为空', 'allow_moq_lte_0' => '允许起订量为空',
// 'allow_stock_lt_moq' => '允许起订量大于库存', // 'allow_stock_lt_moq' => '允许起订量大于库存',
'allow_price_null' => '允许阶梯价为空', 'allow_price_null' => '允许阶梯价为空',
//期货
'futures_allow_stock_lte_0' => '允许库存为空',
'futures_allow_moq_lte_0' => '允许起订量为空',
// 'futures_allow_stock_lt_moq' => '允许起订量大于库存',
'futures_allow_price_null' => '允许阶梯价为空',
], ],
'SkuUploadDefaultRuler' => [ 'SkuUploadDefaultRuler' => [
...@@ -168,6 +174,10 @@ return [ ...@@ -168,6 +174,10 @@ return [
'allow_moq_lte_0' => 0, 'allow_moq_lte_0' => 0,
'allow_stock_lt_moq' => 0, 'allow_stock_lt_moq' => 0,
'allow_price_null' => 0, 'allow_price_null' => 0,
'futures_allow_stock_lte_0' => 0,
'futures_allow_moq_lte_0' => 0,
'futures_allow_stock_lt_moq' => 0,
'futures_allow_price_null' => 0,
], ],
......
resources/views/web/supplier/SkuRuler.blade.php
...@@ -19,10 +19,15 @@ ...@@ -19,10 +19,15 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline" style="width: 100%"> <div class="layui-inline" style="width: 100%">
<label class="layui-form-label">数据新增规则 : </label> <label class="layui-form-label">数据新增规则 : </label>
<div class="layui-input-inline" style="width: 380px"> <div class="layui-input-inline" style="width: 420px">
@if(!empty($supplier['sku_upload_ruler'])) @if(!empty($supplier['sku_upload_ruler']))
<div class="layui-row">
现货 :
@foreach($supplier['sku_upload_ruler'] as $key=>$flag) @foreach($supplier['sku_upload_ruler'] as $key=>$flag)
@if(!empty(array_get(config('fixed.SkuUploadRuler'),$key))) @php
$ruler = array_get(config('fixed.SkuUploadRuler'),$key);
@endphp
@if(!empty($ruler) && strpos($key,'futures')===false)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]" <input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary" lay-skin="primary"
@if($flag) @if($flag)
...@@ -31,12 +36,50 @@ ...@@ -31,12 +36,50 @@
title="{{array_get(config('fixed.SkuUploadRuler'),$key)}}"> title="{{array_get(config('fixed.SkuUploadRuler'),$key)}}">
@endif @endif
@endforeach @endforeach
</div>
<div class="layui-row">
期货 :
@foreach($supplier['sku_upload_ruler'] as $key=>$flag)
@php
$ruler = array_get(config('fixed.SkuUploadRuler'),$key);
@endphp
@if(!empty($ruler) && strpos($key,'futures')!==false)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
@if($flag)
checked
@endif
title="{{array_get(config('fixed.SkuUploadRuler'),$key)}}">
@endif
@endforeach
</div>
@else @else
<div class="layui-row">
现货 :
@foreach(config('fixed.SkuUploadRuler') as $key=>$flag)
@php
$ruler = array_get(config('fixed.SkuUploadRuler'),$key);
@endphp
@if(!empty($ruler) && strpos($key,'futures')===false)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary"
title="{{$flag}}">
@endif
@endforeach
</div>
<div class="layui-row">
期货 :
@foreach(config('fixed.SkuUploadRuler') as $key=>$flag) @foreach(config('fixed.SkuUploadRuler') as $key=>$flag)
@php
$ruler = array_get(config('fixed.SkuUploadRuler'),$key);
@endphp
@if(!empty($ruler) && strpos($key,'futures')!==false)
<input type="checkbox" name="sku_upload_ruler[{{$key}}]" <input type="checkbox" name="sku_upload_ruler[{{$key}}]"
lay-skin="primary" lay-skin="primary"
title="{{$flag}}"> title="{{$flag}}">
@endif
@endforeach @endforeach
</div>
@endif @endif
</div> </div>
<div class="layui-form-mid layui-word-aux"> <div class="layui-form-mid layui-word-aux">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment