Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 0cde93c8 by 杨树贤
Options

云芯修改芯链

parent 24c597fd
Inline Side-by-side
Showing with 71 additions and 70 deletions
.env
......@@ -41,7 +41,7 @@ DB_SELF_USERNAME=spu
DB_SELF_PASSWORD=spu
DB_SELF_PORT=3306
#云芯 MYSQL配置
#芯链 MYSQL配置
DB_HOST_YUNXIN=192.168.1.252
DB_DATABASE_YUNXIN=liexin_yunxin
DB_USERNAME_YUNXIN=liexin_yunxin
......
app/Http/Controllers/Api/ExternalApiController.php
......@@ -79,7 +79,7 @@ class ExternalApiController extends Controller
if ($canApplySupplier !== true) {
$this->externalResponse(-1, $canApplySupplier);
}
//判断这个手机号对应的云芯账号是否已经存在
//判断这个手机号对应的芯链账号是否已经存在
$existAccount = SupplierAccountModel::where('mobile', $data['mobile'])->exists();
if ($existAccount) {
$this->externalResponse(-1, '该手机号已经有对应的芯链账号,请重新选择手机号');
......
app/Http/Controllers/Api/SupplierApiController.php
......@@ -515,7 +515,7 @@ class SupplierApiController extends Controller
}
//设置云芯账号
//设置芯链账号
public function SetYunxinChannelUid($request)
{
$supplierId = $request->get('supplier_id');
......@@ -541,7 +541,7 @@ class SupplierApiController extends Controller
}
}
//批量分配云芯采购员
//批量分配芯链采购员
public function BatchAllocateYunxinChannelUser($request)
{
$channelUid = $request->get('channel_uid');
......
app/Http/Controllers/SupplierAccountController.php
......@@ -48,7 +48,7 @@ class SupplierAccountController extends Controller
public function AddSupplierAccount($request)
{
//获取所有启用的供应商编码,而且类型是包括云芯
//获取所有启用的供应商编码,而且类型是包括芯链
$model = new SupplierChannelModel();
$suppliers = $model->where('is_type', 0)
->whereRaw('stockup_type like "%5%"')
......@@ -69,7 +69,7 @@ class SupplierAccountController extends Controller
$id = $request->get('id');
$model = new SupplierAccountModel();
$account = $model->where('id', $id)->first()->toArray();
//获取所有启用的供应商编码,而且类型是包括云芯
//获取所有启用的供应商编码,而且类型是包括芯链
$model = new SupplierChannelModel();
$suppliers = $model->where('is_type', 0)
->whereRaw('stockup_type like "%5%"')
......
app/Http/Controllers/SupplierApplyController.php
......@@ -53,7 +53,7 @@ class SupplierApplyController extends Controller
$apply = SupplierApplyModel::with('supplier')->where('id', $id)->first()->toArray();
$apply['supplier_group_name'] = array_get(config('fixed.SupplierGroup'), $apply['supplier']['supplier_group']);
$this->data['apply'] = $apply;
$this->data['title'] = '云芯入驻审核';
return $this->view('云芯入驻审核');
$this->data['title'] = '芯链入驻审核';
return $this->view('芯链入驻审核');
}
}
\ No newline at end of file
app/Http/Services/DataService.php
......@@ -1264,7 +1264,7 @@ class DataService
//有上架sku的供应商
$supplierCount = SupplierChannelModel::where('is_type', 0)->where('supplier_group', '!=', 4)->whereNotIn('supplier_name', config('field.SkipChangeSupplierTypeNames'))->whereNotIn('supplier_code', $excludeSupplierCodeList)->where('sku_num', '>', 0)->count();
//云芯供应商编码
//芯链供应商编码
$yunxinSupplierCodes = SupplierChannelModel::where('is_type', 0)->where('stockup_type', 'like', '%5%')->where('sku_num', '>', 0)->pluck('supplier_code')->toArray();
//找出哪些是芯链上传的
......@@ -1300,7 +1300,7 @@ class DataService
//有上架sku的供应商
$supplierCount = SupplierChannelModel::where('is_type', 0)->where('supplier_group', '!=', 4)->whereNotIn('supplier_name', config('field.SkipChangeSupplierTypeNames'))->whereNotIn('supplier_code', $excludeSupplierCodeList)->where('sku_num', '>', 0)->count();
//云芯供应商编码
//芯链供应商编码
$yunxinSupplierCodes = SupplierChannelModel::where('is_type', 0)->where('stockup_type', 'like', '%5%')->where('sku_num', '>', 0)->pluck('supplier_code')->toArray();
//找出哪些是芯链上传的
......
app/Http/Services/SupplierAuditService.php
......@@ -276,7 +276,7 @@ class SupplierAuditService
return true;
} else {
if ($field === 'stockup_type') {
//还要单独判断供应商的stockup_type,只有是操作云芯这个值的时候,才不去审核,真是服了
//还要单独判断供应商的stockup_type,只有是操作芯链这个值的时候,才不去审核,真是服了
$oldStockupType = explode(',', trim($supplier['stockup_type'], ''));
$newStockupType = explode(',', trim($channel['stockup_type'], ''));
if (count($oldStockupType) > count($newStockupType)) {
......
app/Http/Services/SupplierService.php
......@@ -781,7 +781,7 @@ class SupplierService
$supplier = SupplierChannelModel::where('supplier_name', $supplierName)->first();
$supplier = !empty($supplier) ? $supplier->toArray() : [];
if ($supplier) {
//查询是否是云芯商家
//查询是否是芯链商家
$existsYunxinAccount = SupplierAccountModel::where('supplier_id', $supplier['supplier_id'])->exists();
$supplier['is_yunxin_supplier'] = $existsYunxinAccount ? 1 : 0;
}
......
app/Http/Services/SupplierStatisticsService.php
......@@ -85,25 +85,25 @@ class SupplierStatisticsService
'all_channel_user_resigned' => null,
//历史平台合作供应商
'uploaded_sku' => null,
// 非云芯供应商
// 非芯链供应商
'not_yunxin' => null,
//已上架（非云芯）供应商
//已上架（非芯链）供应商
'not_yunxin_and_has_sku' => null,
//已下架（非云芯）供应商
//已下架（非芯链）供应商
'not_yunxin_and_has_no_sku' => null,
//云芯供应商
//芯链供应商
'yunxin' => null,
//已上架（云芯）供应商
//已上架（芯链）供应商
'yunxin_and_has_sku' => null,
//已下架（云芯）供应商
//已下架（芯链）供应商
'yunxin_and_has_no_sku' => null,
//3天内到期（云芯）供应商
//3天内到期（芯链）供应商
'yunxin_expired_at_days' => null,
//3天内到期（非云芯）供应商
//3天内到期（非芯链）供应商
'not_yunxin_expired_at_days' => null,
//已过期（云芯）供应商
//已过期（芯链）供应商
'yunxin_expired' => null,
//已过期（非云芯）供应商
//已过期（非芯链）供应商
'not_yunxin_expired' => null,
//缺少平台合作协议（线上）
'no_cooperation_agreement' => null,
......
app/Http/Validators/SupplierAccountValidator.php
......@@ -55,7 +55,7 @@ class SupplierAccountValidator
{
return [
'supplier_code.required' => '请选择一个供应商',
'a_type.required' => '类型必须勾选为云芯商家',
'a_type.required' => '类型必须勾选为芯链商家',
'mobile.required' => '登录账号不能为空',
'mobile.regex' => '账号格式必须为手机号',
'password_raw.required' => '账号密码不能为空',
......
config/field.php
......@@ -68,7 +68,7 @@ return [
'SupplierAccountType' => [
0 => '其它',
1 => '云芯商家'
1 => '芯链商家'
],
'AttachmentFields' => [
......@@ -133,7 +133,7 @@ return [
'OutsideContactType' => [
1 => '人工上传',
2 => 'API对接',
3 => '云芯上传'
3 => '芯链上传'
],
//以下供应商为代购供应商，不要更改为临时的，保持为正式供应商
......@@ -226,7 +226,7 @@ return [
4 => '专营API',
5 => '专营数据包',
6 => '专营后台上传',
7 => '专营云芯上传',
7 => '专营芯链上传',
8 => '专营采集',
],
......
config/fixed.php
......@@ -55,7 +55,7 @@ return [
'OutsideContactType' => [
1 => 'API',
//2 => 'FTP',
3 => '云芯',
3 => '芯链',
],
'StockupTypeOld' => [
......@@ -65,7 +65,7 @@ return [
7 => '联营-原厂直供',
2 => '自营-自采',
4 => '自营-寄售',
// 5 => '联营-云芯商家',
// 5 => '联营-芯链商家',
],
'StockupType' => [
......@@ -75,7 +75,7 @@ return [
7 => '原厂直供',
2 => '猎芯仓库',
4 => '现货寄售',
5 => '云芯商家',
5 => '芯链商家',
],
'SupplierPayType' => [
......@@ -93,7 +93,7 @@ return [
'SupplierApiType' => [
1 => 'API',
2 => 'FTP',
3 => '云芯',
3 => '芯链',
],
......@@ -241,16 +241,16 @@ return [
'pay_type_term' => '账期供应商',
'all_channel_user_resigned' => '采购员全离职',
'uploaded_sku' => '历史平台合作供应商',
'not_yunxin' => '非云芯供应商',
'not_yunxin_and_has_sku' => '已上架（非云芯）供应商',
'not_yunxin_and_has_no_sku' => '已下架（非云芯）供应商',
'yunxin' => '云芯供应商',
'yunxin_and_has_sku' => '已上架（云芯）供应商',
'yunxin_and_has_no_sku' => '已下架（云芯）供应商',
'yunxin_expired_at_days' => '3天内到期（云芯）供应商',
'not_yunxin_expired_at_days' => '3天内到期（非云芯）供应商',
'yunxin_expired' => '已过期（云芯）供应商',
'not_yunxin_expired' => '已过期（非云芯）供应商',
'not_yunxin' => '非芯链供应商',
'not_yunxin_and_has_sku' => '已上架（非芯链）供应商',
'not_yunxin_and_has_no_sku' => '已下架（非芯链）供应商',
'yunxin' => '芯链供应商',
'yunxin_and_has_sku' => '已上架（芯链）供应商',
'yunxin_and_has_no_sku' => '已下架（芯链）供应商',
'yunxin_expired_at_days' => '3天内到期（芯链）供应商',
'not_yunxin_expired_at_days' => '3天内到期（非芯链）供应商',
'yunxin_expired' => '已过期（芯链）供应商',
'not_yunxin_expired' => '已过期（非芯链）供应商',
'no_cooperation_agreement' => '缺少平台合作协议（线上）',
],
//Sku列表的罗盘对应菜单id
......
resources/views/script/AddSupplierScript.blade.php
......@@ -19,7 +19,7 @@
//不让选,也不隐藏
form.on('checkbox(stockup_type_filter)', function (data) {
if (data.elem.checked && data.elem.name === "stockup_type[5]") {
layer.msg('新增供应商没法设置为云芯账号类型,设置云芯账号要先去魔方系统配置阶梯系数', {icon: 5})
layer.msg('新增供应商没法设置为芯链账号类型,设置芯链账号要先去魔方系统配置阶梯系数', {icon: 5})
$('input[name="stockup_type[5]"]').next().click();
}
});
......
resources/views/script/SupplierApplyListScript.blade.php
......@@ -96,11 +96,11 @@
return;
}
if (data[0].has_ladder_ratio !== 1 && data[0].has_ladder_ratio !== 1) {
layer.msg('请先设置该供应商为“云芯商家”，并且配置“阶梯系数”后，再进行审核操作', {icon: 5});
layer.msg('请先设置该供应商为“芯链商家”，并且配置“阶梯系数”后，再进行审核操作', {icon: 5});
return;
}
if (data[0].is_yunxin !== 1) {
layer.msg('请先设置该供应商为“云芯商家”，再进行审核操作', {icon: 5});
layer.msg('请先设置该供应商为“芯链商家”，再进行审核操作', {icon: 5});
return;
}
if (data[0].has_ladder_ratio !== 1) {
......@@ -112,7 +112,7 @@
type: 2,
content: '/supplier_apply/AuditSupplierApply?view=iframe&id=' + id,
area: ['800px', '600px'],
title: '云芯入驻审核',
title: '芯链入驻审核',
end: function () {
table.reload('supplierApplyList');
}
......@@ -129,7 +129,7 @@
let hasLadderRatio = table.cache['supplierApplyList'][rowIndex].has_ladder_ratio;
let yunxinHtml = isYunxin ? '<i class="layui-icon layui-icon-ok-circle" style="color: limegreen"></i>' : '<i class="layui-icon layui-icon-close-fill" style="color: orangered"></i>';
let ratioHtml = hasLadderRatio ? '<i class="layui-icon layui-icon-ok-circle" style="color: limegreen"></i>' : '<i class="layui-icon layui-icon-close-fill" style="color:orangered"></i>';
let html = '<p>云芯商家 ' + yunxinHtml + '</p><p>阶梯系数 ' + ratioHtml + '</p>'
let html = '<p>芯链商家 ' + yunxinHtml + '</p><p>阶梯系数 ' + ratioHtml + '</p>'
auditConditionTipsVal = layer.tips(html, self, {
tips: [3, "#555555"],
time: 1000000,
......
resources/views/script/UpdateSupplierScript.blade.php
......@@ -11,7 +11,7 @@
});
//点击云芯
//点击芯链
form.on('checkbox(stockup_type_filter)', function (data) {
if (data.elem.checked && data.elem.name === "stockup_type[5]") {
let url = '/api/supplier/checkHasLadderPriceSetting?supplier_id=' + getQueryVariable('supplier_id');
......@@ -28,7 +28,7 @@
if (res.err_code === 0) {
} else {
layer.msg('请先去魔方系统配置阶梯系数，再新建云芯账号', {icon: 5})
layer.msg('请先去魔方系统配置阶梯系数，再新建芯链账号', {icon: 5})
$('input[name="stockup_type[5]"]').next().click();
}
},
......
resources/views/web/AddSupplierAccount.blade.php
......@@ -32,7 +32,7 @@
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>账号类型 : </label>
<div class="layui-input-block">
<input type="checkbox" name="a_type" title="云芯商家" lay-skin="primary" checked>
<input type="checkbox" name="a_type" title="芯链商家" lay-skin="primary" checked>
</div>
</div>
<div class="layui-form-item">
......
resources/views/web/QuerySupplier.blade.php
......@@ -27,7 +27,7 @@
是否有平台合作 : <span id="uploaded_sku"></span>
</div>
<div class="layui-col-md4">
是否云芯商家 : <span id="is_yunxin_supplier"></span>
是否芯链商家 : <span id="is_yunxin_supplier"></span>
</div>
</div>
</form>
......
resources/views/web/UpdateSupplierAccount.blade.php
......@@ -33,7 +33,7 @@
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>账号类型 : </label>
<div class="layui-input-block">
<input type="checkbox" name="a_type" title="云芯商家" lay-skin="primary" @if(!empty($account['a_type'])&&$account['a_type']==1) checked @endif>
<input type="checkbox" name="a_type" title="芯链商家" lay-skin="primary" @if(!empty($account['a_type'])&&$account['a_type']==1) checked @endif>
</div>
</div>
<div class="layui-form-item">
......
resources/views/web/supplier/SupplierListFilter.blade.php
......@@ -151,55 +151,55 @@
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="非云芯供应商" id="not_yunxin">
非云芯供应商
<a class="main_filter" title="非芯链供应商" id="not_yunxin">
非芯链供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已上架（非云芯）供应商" id="not_yunxin_and_has_sku">
已上架（非云芯）供应商
<a class="main_filter" title="已上架（非芯链）供应商" id="not_yunxin_and_has_sku">
已上架（非芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已下架（非云芯）供应商" id="not_yunxin_and_has_no_sku">
已下架（非云芯）供应商
<a class="main_filter" title="已下架（非芯链）供应商" id="not_yunxin_and_has_no_sku">
已下架（非芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="云芯供应商" id="yunxin">
云芯供应商
<a class="main_filter" title="芯链供应商" id="yunxin">
芯链供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已上架（云芯）供应商" id="yunxin_and_has_sku">
已上架（云芯）供应商
<a class="main_filter" title="已上架（芯链）供应商" id="yunxin_and_has_sku">
已上架（芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已下架（云芯）供应商" id="yunxin_and_has_no_sku">
已下架（云芯）供应商
<a class="main_filter" title="已下架（芯链）供应商" id="yunxin_and_has_no_sku">
已下架（芯链）供应商
</a>
</div>
</div>
<div class="split-item" id="s8" style="text-align: center">
<div class="layui-row">
<a class="main_filter" title="3天内到期（云芯）供应商" id="yunxin_expired_at_days">
3天内到期（云芯）供应商
<a class="main_filter" title="3天内到期（芯链）供应商" id="yunxin_expired_at_days">
3天内到期（芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="3天内到期（非云芯）供应商" id="not_yunxin_expired_at_days">
3天内到期（非云芯）供应商
<a class="main_filter" title="3天内到期（非芯链）供应商" id="not_yunxin_expired_at_days">
3天内到期（非芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已过期（云芯）供应商" id="yunxin_expired">
已过期（云芯）供应商
<a class="main_filter" title="已过期（芯链）供应商" id="yunxin_expired">
已过期（芯链）供应商
</a>
</div>
<div class="layui-row">
<a class="main_filter" title="已过期（非云芯）供应商" id="not_yunxin_expired">
已过期（非云芯）供应商
<a class="main_filter" title="已过期（非芯链）供应商" id="not_yunxin_expired">
已过期（非芯链）供应商
</a>
</div>
</div>
......
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