Skip to content

黄成意 / yunxin

Go to a project
Commit aeb7b252 by PRY5YKGJ82EZEPX\Administrator
Options

更新云芯

parent b3884141
Inline Side-by-side
Showing with 260 additions and 36 deletions
app/Http/Controllers/ApiController.php
...@@ -57,10 +57,7 @@ class ApiController extends Controller ...@@ -57,10 +57,7 @@ class ApiController extends Controller
private function ApiOrderListExport($request, $id){ private function ApiOrderListExport($request, $id){
$data= $request->input(); $data= $request->input();
$data['is_consign'] = 1; //供应商代发 $data['is_consign'] = 1; //供应商代发
$id = (new UploadLogModel())->addLog($request->account_id,1,$data); (new ServerExportModel())->OrderExport($data,$request->account_id,$request->mobile);
if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportOrderList($id));
Export(0,$id);
} }
//订单列表 //订单列表
private function ApiOrderDetail($request, $id){ private function ApiOrderDetail($request, $id){
...@@ -95,10 +92,7 @@ class ApiController extends Controller ...@@ -95,10 +92,7 @@ class ApiController extends Controller
private function ApiPutawayListExport($request, $id){ private function ApiPutawayListExport($request, $id){
$data= $request->input(); $data= $request->input();
$data['picking_type'] = 2; //寄售 $data['picking_type'] = 2; //寄售
$id = (new UploadLogModel())->addLog($request->account_id,3,$data); (new ServerExportModel())->PutawayExport($data,$request->account_id,$request->mobile);
if(!$id) return Export(20003,'任务推送失败');
dispatch(new JopExportPutawayList($id));
Export(0,$id);
} }
//获取对账单列表 //获取对账单列表
private function ApiReconcilePurList($request, $id){ private function ApiReconcilePurList($request, $id){
...@@ -138,12 +132,14 @@ class ApiController extends Controller ...@@ -138,12 +132,14 @@ class ApiController extends Controller
$input['supplier_com_code'] = $request->supplier_com_code; $input['supplier_com_code'] = $request->supplier_com_code;
ExportLayui2((new ServerMicModel())->getSkuList($input)); ExportLayui2((new ServerMicModel())->getSkuList($input));
} }
//自营商品列表
private function ApiGoodsList($request){
ExportLayui2((new ServerFoostoneModel($request->appid,$request->key))->SkuList($request->input(),2));
}
//自营商品列表导出 //自营商品列表导出
private function ApiGoodsListExport($request, $id){ private function ApiGoodsListExport($request, $id){
$id = (new UploadLogModel())->addLog($request->account_id,4,$request->input()); $data= $request->input();
if(!$id) return Export(20003,'任务推送失败'); (new ServerExportModel())->GoodsExport($data,$request->account_id,$request->mobile);
dispatch(new JopExportGoodsList($id));
Export(0,$id);
} }
//联营商品导出(改成后台导出) //联营商品导出(改成后台导出)
private function ApiGoodsComListExport($request, $id){ private function ApiGoodsComListExport($request, $id){
...@@ -173,10 +169,7 @@ class ApiController extends Controller ...@@ -173,10 +169,7 @@ class ApiController extends Controller
$client = new \Hprose\Http\Client("http://export.liexin.com/getDownPath",false); $client = new \Hprose\Http\Client("http://export.liexin.com/getDownPath",false);
echo $client->getDownPath(\GuzzleHttp\json_encode($input)); echo $client->getDownPath(\GuzzleHttp\json_encode($input));
} }
//商品列表
private function ApiSkuList($request){
ExportLayui2((new ServerFoostoneModel($request->appid,$request->key))->SkuList($request->input(),2));
}
//批量上传联营物料 //批量上传联营物料
private function ApiUploadSkuList($request,$id){ private function ApiUploadSkuList($request,$id){
$res = (new UploadLogModel())->uploadSkuFile($request->appid,$request->key,$request->mobile,$request->account_id); $res = (new UploadLogModel())->uploadSkuFile($request->appid,$request->key,$request->mobile,$request->account_id);
......
app/Http/Controllers/HandleController.php
...@@ -137,6 +137,20 @@ class HandleController extends Controller ...@@ -137,6 +137,20 @@ class HandleController extends Controller
} }
private function e(){ private function e(){
$input['create_uid2'] = 1; //用户id
$input['status'] = '-10,2'; //状态
$client = new \Hprose\Http\Client("http://yunxin.liexin.com/server/abnormlList",false);
$d = $client->abnormlListServer(\GuzzleHttp\json_encode($input));
print_r($d);
die;
#联营列表导出
$input['create_uid2'] = 1; //用户id
$client = new \Hprose\Http\Client("http://yunxin.liexin.com/server/goodsList",false);
$d = $client->goodsListServer(\GuzzleHttp\json_encode($input));
print_r($d);
die();
#联营列表导出 #联营列表导出
$input['supplier_com_code'] = 'L0000008'; //用户id $input['supplier_com_code'] = 'L0000008'; //用户id
$input['is_scroll'] = 1; //状态 $input['is_scroll'] = 1; //状态
......
app/Http/Controllers/ServerController.php
...@@ -14,20 +14,21 @@ class ServerController extends Controller ...@@ -14,20 +14,21 @@ class ServerController extends Controller
set_time_limit(0); set_time_limit(0);
$this->$id($request, $id); $this->$id($request, $id);
} }
##########################
/* /*
* 异常列表导出 * 异常列表导出
*/ */
public function exportAbnormlList(){ public function abnormlList(){
$server=new Hprose\Http\Service(); $server=new Hprose\Http\Service();
$server->addMethod('exportAbnormlListServer',$this); $server->addMethod('abnormlListServer',$this);
$server->handle(); $server->handle();
} }
//异常列表导出服务 //异常列表导出服务
public function exportAbnormlListServer($info){ public function abnormlListServer($info){
$res= ExportModel::ApiAbnormalListExport(json_decode($info,true)); $res= ExportModel::AbnormalListExport(json_decode($info,true));
return $res; return json_encode($res);
} }
##########################
/* /*
* 联营数据导出 * 联营数据导出
*/ */
...@@ -36,10 +37,55 @@ class ServerController extends Controller ...@@ -36,10 +37,55 @@ class ServerController extends Controller
$server->addMethod('goodsComListServer',$this); $server->addMethod('goodsComListServer',$this);
$server->handle(); $server->handle();
} }
//异常列表导出服务 //联营数据导出服务
public function goodsComListServer($info){ public function goodsComListServer($info){
$res= ExportModel::GoodsComListExport(json_decode($info,true)); $res= ExportModel::GoodsComListExport(json_decode($info,true));
return $res; return $res;
} }
##########################
/*
* 自营数据导出
*/
public function goodsList(){
$server=new Hprose\Http\Service();
$server->addMethod('goodsListServer',$this);
$server->handle();
}
//自营数据导出服务
public function goodsListServer($info){
$res= ExportModel::GoodsListExport(json_decode($info,true));
return $res;
}
##########################
/*
* 订单数据导出
*/
public function orderList(){
$server=new Hprose\Http\Service();
$server->addMethod('orderListServer',$this);
$server->handle();
}
//自营数据导出服务
public function orderListServer($info){
$res= ExportModel::OrderListExport(json_decode($info,true));
return $res;
}
##########################
/*
* 入库数据导出
*/
public function putawayList(){
$server=new Hprose\Http\Service();
$server->addMethod('putawayListServer',$this);
$server->handle();
}
//自营数据导出服务
public function putawayListServer($info){
$res= ExportModel::PutawayListExport(json_decode($info,true));
return $res;
}
} }
app/Model/ExportModel.php
...@@ -26,7 +26,7 @@ class ExportModel ...@@ -26,7 +26,7 @@ class ExportModel
if(!$account) return [1001,'不存在此用户id']; if(!$account) return [1001,'不存在此用户id'];
$res = (new ServerPurModel($account->appid,$account->key))->AbnormalDetail($input,2); $res = (new ServerPurModel($account->appid,$account->key))->AbnormalDetail($input,2);
if (!count($res['data']) ){ if (!$res || empty(@$res['data']) || !count($res['data']) ){ #数据为空
return $res; return $res;
} }
$out = []; $out = [];
...@@ -47,7 +47,6 @@ class ExportModel ...@@ -47,7 +47,6 @@ class ExportModel
'initial_price'=>$v['initial_price'], 'initial_price'=>$v['initial_price'],
]); ]);
} }
$res['data'] = $out; $res['data'] = $out;
return $res; return $res;
} }
...@@ -106,9 +105,106 @@ class ExportModel ...@@ -106,9 +105,106 @@ class ExportModel
$res['data'] = $out; $res['data'] = $out;
$res['scroll_id'] = $searchArr['data']['scroll_id']; #游标回传 $res['scroll_id'] = $searchArr['data']['scroll_id']; #游标回传
return $res; return $res;
}
/*
* 商品数据导出
* 对外提供导出接口
*/
static function GoodsListExport($input){
if (!@$input['create_uid2']) return [1002,'用户id不得为空'];
$account = (new SupplierAccountModel())->select("appid","key")->where("id",$input['create_uid2'])->first();
if(!$account) return [1001,'不存在此用户id'];
$res = (new ServerFoostoneModel($account->appid,$account->key))->SkuList($input,2);
if (empty(@$res['data']) || !count($res['data']) ){
return $res;
}
$out = [];
foreach ($res['data'] as $k=>$v){
array_push($out,[
'encoded'=>$v['encoded'],
'goods_type_name'=>$v['goods_type_name'],
'goods_name'=>$v['goods_name'],
'brand_name'=>$v['brand_name'],
'packing_name'=>$v['packing_name'],
'encap'=>$v['encap'],
'mpq'=>$v['mpq'],
'status_name'=>$v['status_name'],
'new_cost'=>$v['new_cost'],
'商家实际库存'=>"",
'LockStock'=>$v['LockStock'],
'stock'=>$v['stock'],
]);
}
$res['data'] = $out;
return $res;
} }
/*
* 订单数据导出
* 对外提供导出接口
*/
static function OrderListExport($input){
if (!@$input['create_uid2']) return [1002,'用户id不得为空'];
$account = (new SupplierAccountModel())->select("appid","key")->where("id",$input['create_uid2'])->first();
if(!$account) return [1001,'不存在此用户id'];
$res =(new ServerPurModel($account->appid,$account->key))->OrderList($input,2);
if (empty(@$res['data']) || !count($res['data']) ){
return $res;
}
$out = [];
foreach ($res['data'] as $k=>$v){
array_push($out,[
'order_sn'=>$v['order_sn'],
'create_time'=>$v['create_time'],
'picking_amount'=>$v['picking_amount'],
'currency'=>$v['currency'],
'pay_type'=>$v['pay_type'],
'status'=>$v['status'],
]);
}
$res['data'] = $out;
return $res;
}
/*
* 入库数据导出
* 对外提供导出接口
*/
static function PutawayListExport($input){
if (!@$input['create_uid2']) return [1002,'用户id不得为空'];
$account = (new SupplierAccountModel())->select("appid","key")->where("id",$input['create_uid2'])->first();
if(!$account) return [1001,'不存在此用户id'];
$res = (new ServerFoostoneModel($account->appid,$account->key))->SkuList($input,2);
if (empty(@$res['data']) || !count($res['data']) ){
return $res;
}
$out = [];
foreach ($res['data'] as $k=>$v){
array_push($out,[
'encoded'=>$v['encoded'],
'goods_type_name'=>$v['goods_type_name'],
'goods_name'=>$v['goods_name'],
'brand_name'=>$v['brand_name'],
'packing_name'=>$v['packing_name'],
'encap'=>$v['encap'],
'mpq'=>$v['mpq'],
'status_name'=>$v['status_name'],
'new_cost'=>$v['new_cost'],
'商家实际库存'=>"",
'LockStock'=>$v['LockStock'],
'stock'=>$v['stock'],
]);
}
$res['data'] = $out;
return $res;
}
} }
\ No newline at end of file
app/Model/Server/ServerExportModel.php
...@@ -6,7 +6,7 @@ use App\Model\OperationLogModel; ...@@ -6,7 +6,7 @@ use App\Model\OperationLogModel;
use Request; use Request;
use DB; use DB;
//通用导出模型 //通用导出模型推送队列
class ServerExportModel class ServerExportModel
{ {
private $yunxinUrl ; //云芯网址 private $yunxinUrl ; //云芯网址
...@@ -49,12 +49,13 @@ class ServerExportModel ...@@ -49,12 +49,13 @@ class ServerExportModel
'退货单号','创建单时间','金额','状态','币种','商品编码','型号','品牌','封装','包装方式','MPQ','数量','单价' '退货单号','创建单时间','金额','状态','币种','商品编码','型号','品牌','封装','包装方式','MPQ','数量','单价'
], ],
"query_param"=>$input, #查询参数 "query_param"=>$input, #查询参数
"callbackurl"=> $this->yunxinUrl."/server/exportAbnormlList", #rpc回调网址 "callbackurl"=> $this->yunxinUrl."/server/abnormlList", #rpc回调网址
"callbackfuc"=>"exportAbnormlListServer", #rpc回调函数 "callbackfuc"=>"abnormlListServer", #rpc回调函数
"create_uid"=> 0, #创建人id "create_uid"=> 0, #创建人id
"create_uid2"=> $create_uid, #前台创建人id "create_uid2"=> $create_uid, #前台创建人id
"create_name"=>$create_name "create_name"=>$create_name
]; ];
echo self::push($data); echo self::push($data);
} }
/* /*
...@@ -79,6 +80,71 @@ class ServerExportModel ...@@ -79,6 +80,71 @@ class ServerExportModel
]; ];
echo self::push($data); echo self::push($data);
} }
/*
* 自营商品列表推送任务
*/
public function GoodsExport($input,$create_uid,$create_name){
$input['create_uid2'] = $create_uid; //用户id
$data = [
"type"=> 2, # 类型 1:模板调用 2: api回调
"source_items_id"=>6, #来源明细id，必填
"file_name"=> "自营列表导出",
"excel_suf" => "csv", #导出文件格式 csv,xls
"header"=> [ #导出头部
"商品编码","类型","型号","品牌","包装方式","封装","MPQ","状态","价格","商家实际库存","预占库存","可用库存"
],
"query_param"=>$input, #查询参数
"callbackurl"=> "http://yunxin.liexin.com/server/goodsList", #rpc回调网址
"callbackfuc"=>"goodsListServer", #rpc回调函数
"create_uid"=> 0,
"create_uid2"=> $create_uid, #前台创建人id
"create_name"=>$create_name
];
echo self::push($data);
}
/*
* 订单列表导出
*/
public function OrderExport($input,$create_uid,$create_name){
$input['create_uid2'] = $create_uid; //用户id
$data = [
"type"=> 2, # 类型 1:模板调用 2: api回调
"source_items_id"=>7, #来源明细id，必填
"file_name"=> "订单列表导出",
"excel_suf" => "csv", #导出文件格式 csv,xls
"header"=> [ #导出头部
"订单号","创建时间","订单金额","结算币种","结算方式","状态"
],
"query_param"=>$input, #查询参数
"callbackurl"=> "http://yunxin.liexin.com/server/orderList", #rpc回调网址
"callbackfuc"=>"orderListServer", #rpc回调函数
"create_uid"=> 0,
"create_uid2"=> $create_uid, #前台创建人id
"create_name"=>$create_name
];
echo self::push($data);
}
/*
* 入库列表导出
*/
public function PutawayExport($input,$create_uid,$create_name){
$input['create_uid2'] = $create_uid; //用户id
$data = [
"type"=> 2, # 类型 1:模板调用 2: api回调
"source_items_id"=>8, #来源明细id，必填
"file_name"=> "入库列表导出",
"excel_suf" => "csv", #导出文件格式 csv,xls
"header"=> [ #导出头部
"入库单号","采购单号","入库单金额","结算币种","结算方式","创建时间"
],
"query_param"=>$input, #查询参数
"callbackurl"=> "http://yunxin.liexin.com/server/putawayList", #rpc回调网址
"callbackfuc"=>"putawayListServer", #rpc回调函数
"create_uid"=> 0,
"create_uid2"=> $create_uid, #前台创建人id
"create_name"=>$create_name
];
echo self::push($data);
}
} }
\ No newline at end of file
app/Model/Server/ServerFoostoneModel.php
...@@ -14,7 +14,7 @@ class ServerFoostoneModel ...@@ -14,7 +14,7 @@ class ServerFoostoneModel
const IS_DEBUG = 0; //是否调试 const IS_DEBUG = 0; //是否调试
public function __construct($appid,$key,$domain="") public function __construct($appid,$key,$domain="")
{ {
$this->_url = getHostUrl('footstone_domain',$domain); $this->_url = config('website.URL_FOOTSTONE');
$this->appid = $appid; $this->appid = $appid;
$this->key = $key; $this->key = $key;
} }
...@@ -23,6 +23,7 @@ class ServerFoostoneModel ...@@ -23,6 +23,7 @@ class ServerFoostoneModel
$datas = ExcessEncryption($data,$this->appid,$this->key); $datas = ExcessEncryption($data,$this->appid,$this->key);
$urls = $this->_url.$url; $urls = $this->_url.$url;
$res = (curl($urls,$datas)); $res = (curl($urls,$datas));
if (!$res) return ['code'=>0,'errmsg'=>'没有数据，接口出错','data'=>""]; //没有数据
if (self::IS_DEBUG){ if (self::IS_DEBUG){
print_r($urls); print_r($urls);
print_r("<br/>"); print_r("<br/>");
......
app/Model/Server/ServerMicModel.php
...@@ -58,6 +58,7 @@ class ServerMicModel ...@@ -58,6 +58,7 @@ class ServerMicModel
if (@$param['brand_id']) $s['brand_id/condition'] = $param['brand_id']; if (@$param['brand_id']) $s['brand_id/condition'] = $param['brand_id'];
if (@$param['goods_name']) $s['goods_name/condition'] = $param['goods_name']; if (@$param['goods_name']) $s['goods_name/condition'] = $param['goods_name'];
$searchArr = (new ServerEsModel())->searchSku($s); $searchArr = (new ServerEsModel())->searchSku($s);
$total = @$searchArr['data']['total']; $total = @$searchArr['data']['total'];
if ($searchArr['error_code'] > 0) return ["code"=>10001,"errmsg"=>"没有数据"]; if ($searchArr['error_code'] > 0) return ["code"=>10001,"errmsg"=>"没有数据"];
#查询商品数据 #查询商品数据
......
config/website.php
...@@ -6,7 +6,7 @@ return [ ...@@ -6,7 +6,7 @@ return [
"URL_ICHUNT" =>"https://www.ichunt.com", "URL_ICHUNT" =>"https://www.ichunt.com",
"URL_YUNXIN" => "http://yunxin.liexin.com", "URL_YUNXIN" => "http://yunxin.liexin.com",
"URL_FINANCE" => "http://finance.liexin.com", "URL_FINANCE" => "http://finance.liexin.com",
"URL_FOOTSTONE" => "http://foostone.liexin.com", "URL_FOOTSTONE" => "http://foostone.liexin.net",
"URL_PUR" => "http://pur.liexin.com", "URL_PUR" => "http://pur.liexin.com",
"URL_ES"=>"http://soso12.ichunt.com",//测试Es地址 "URL_ES"=>"http://soso12.ichunt.com",//测试Es地址
// "URL_ES"=>"http://szso.ichunt.com",//测试Es地址 // "URL_ES"=>"http://szso.ichunt.com",//测试Es地址
......
public/index.php
<?php <?php
/** /**
* Laravel - A PHP Framework For Web Artisans * Laravel - A PHP Framework For Web Artisans
* *
......
public/pc/js/controller/GoodsList.js
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
tableList:function () { tableList:function () {
layui.table.render({ layui.table.render({
elem: '#list' elem: '#list'
,url:'/api/ApiSkuList' ,url:'/api/ApiGoodsList'
,method:'post' ,method:'post'
,cellMinWidth: 100 //全局定义常规单元格的最小宽度 ,cellMinWidth: 100 //全局定义常规单元格的最小宽度
,request: { ,request: {
......
public/pc/js/public.js
...@@ -79,15 +79,21 @@ function common_export(url,data) { ...@@ -79,15 +79,21 @@ function common_export(url,data) {
var logid = res.other //导出id var logid = res.other //导出id
var t2 = window.setInterval(function () { var t2 = window.setInterval(function () {
var res = ajax_push2('/api/ApiExportResult',{"id":logid}) var res = ajax_push2('/api/ApiExportResult',{"id":logid})
if(res.err_code == 0){ switch(res.err_code){
case 0: //已完成
layer.closeAll(); layer.closeAll();
window.location.href = res.err_msg window.location.href = res.err_msg
window.clearInterval(t2) window.clearInterval(t2)
} break;
if(res.err_code == 1){ case 3: //无数据
case -1://处理失败
layer.closeAll(); layer.closeAll();
window.clearInterval(t2) window.clearInterval(t2)
alert_err(res.err_msg) alert_err(res.err_msg)
break;
case 2:
break;
} }
},3000); },3000);
} }
......
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