提交 031766b7 authored 作者: 窦斌's avatar 窦斌

edit

上级 4ab93139
<?php
namespace App\Console\Commands;
use App\Http\Controllers\Api\SynJdPurchaseController;
use Illuminate\Console\Command;
class GetJdPurchaseOrder extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'GetJdPurchaseOrder';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command GetJdPurchaseOrder';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
//
$getOrder = new SynJdPurchaseController();
$ret = $getOrder->addOrderData();
print_r($ret);
}
}
<?php
namespace App\Console\Commands;
use App\Http\Controllers\Api\SynJdPurchaseController;
use Illuminate\Console\Command;
class GetJdPurchaseRefund extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'GetJdPurchaseRefund';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command GetJdPurchaseRefund';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
//
$getOrder = new SynJdPurchaseController();
$ret = $getOrder->getPurchaseRefund();
print_r($ret);
}
}
...@@ -21,7 +21,9 @@ class Kernel extends ConsoleKernel ...@@ -21,7 +21,9 @@ class Kernel extends ConsoleKernel
Commands\DeductionFee::class, Commands\DeductionFee::class,
Commands\SynJdOrderApi::class, Commands\SynJdOrderApi::class,
Commands\SynCancelAuditList::class, Commands\SynCancelAuditList::class,
Commands\GetJdOrderCancel::class Commands\GetJdOrderCancel::class,
Commands\GetJdPurchaseOrder::class,
Commands\GetJdPurchaseRefund::class
]; ];
/** /**
...@@ -43,6 +45,8 @@ class Kernel extends ConsoleKernel ...@@ -43,6 +45,8 @@ class Kernel extends ConsoleKernel
$schedule->command('SynJdOrderApi')->everyFiveMinutes();// 抓取京东社会化门店订单 //每五分钟执行一次 $schedule->command('SynJdOrderApi')->everyFiveMinutes();// 抓取京东社会化门店订单 //每五分钟执行一次
$schedule->command('SynCancelAuditList')->everyFiveMinutes();// 抓取京东社会化门店退款单 //每五分钟执行一次 $schedule->command('SynCancelAuditList')->everyFiveMinutes();// 抓取京东社会化门店退款单 //每五分钟执行一次
$schedule->command('GetJdOrderCancel')->everyFifteenMinutes();// 抓取京东社会化门店12小时内撤销单 //每十五分钟执行一次 $schedule->command('GetJdOrderCancel')->everyFifteenMinutes();// 抓取京东社会化门店12小时内撤销单 //每十五分钟执行一次
$schedule->command('GetJdPurchaseOrder')->everyFiveMinutes();//抓取京东供销平台订单 每五分钟执行一次
$schedule->command('GetJdPurchaseRefund')->everyFiveMinutes();//抓取京东供销平台退款 每五分钟执行一次
} }
/** /**
......
...@@ -1953,6 +1953,7 @@ class OrderListController extends BaseController ...@@ -1953,6 +1953,7 @@ class OrderListController extends BaseController
if($OrderCount==1){ if($OrderCount==1){
$orArr['order_status'] = 34;//订单表申请完成状态 $orArr['order_status'] = 34;//订单表申请完成状态
$restOrder = Orders::where('sys_num',$orderListArr['sys_num'])->update($orArr); $restOrder = Orders::where('sys_num',$orderListArr['sys_num'])->update($orArr);
DB::table('recharge_order')->where('reo_order_number',$orderListArr['order_num'])->update(['reo_sg'=>2]);
} }
$this->operatingTime($orderListArr['serial_number'],'任务反馈时间',date("Y-m-d H:i:s"),$orderListArr['order_num'],$admin_acc);//订单操作时间 $this->operatingTime($orderListArr['serial_number'],'任务反馈时间',date("Y-m-d H:i:s"),$orderListArr['order_num'],$admin_acc);//订单操作时间
$this->addThistory($orderListArr['serial_number'],'tih_feektime',date("Y-m-d H:i:s"),$orderListArr['ser_id'],3);//添加历史时间 $this->addThistory($orderListArr['serial_number'],'tih_feektime',date("Y-m-d H:i:s"),$orderListArr['ser_id'],3);//添加历史时间
......
...@@ -1176,6 +1176,7 @@ class OrderListService extends Model ...@@ -1176,6 +1176,7 @@ class OrderListService extends Model
if($OrderCount==1){ if($OrderCount==1){
$orArr['order_status']='34';//订单 $orArr['order_status']='34';//订单
$res = Orders::where("sys_num",$orderListArr['sys_num'])->update($orArr); $res = Orders::where("sys_num",$orderListArr['sys_num'])->update($orArr);
DB::table('recharge_order')->where('reo_order_number',$orderListArr['order_num'])->update(['reo_sg'=>2]);
}else{ }else{
$res = true; $res = true;
} }
......
...@@ -107,7 +107,7 @@ class GoodsService extends Service ...@@ -107,7 +107,7 @@ class GoodsService extends Service
if(!$select){ if(!$select){
$select = ['pg_id','brand_name','pg_series','version','cd_id','pg_goodsname']; $select = ['pg_id','brand_name','pg_series','version','cd_id','pg_goodsname'];
} }
$list = CommonService::getMysqlData($db, $params,$select,[],'get','20'); $list = CommonService::getMysqlData($db, $params,$select,[],'get','80');
if($list){ if($list){
$list = GoodsService::addGoodsName($list,$select); $list = GoodsService::addGoodsName($list,$select);
} }
......
...@@ -161,6 +161,7 @@ class ServiceProviderService extends Service ...@@ -161,6 +161,7 @@ class ServiceProviderService extends Service
$invoiceTypeName = InvoiceService::getInvoiceTypeName(true); $invoiceTypeName = InvoiceService::getInvoiceTypeName(true);
$fsixName = self::getFsixName(true); $fsixName = self::getFsixName(true);
foreach ($list as $k => $v) { foreach ($list as $k => $v) {
$list[$k]['company_name'] = "(".$v['id'].")".$v['company_name'];
$list[$k]['fsixName'] = $fsixName[$v['is_fsix']]; $list[$k]['fsixName'] = $fsixName[$v['is_fsix']];
// -----------button 处理开始----------- // -----------button 处理开始-----------
$button = BmmcService::getListButton(['editService,delService,editServicePassword,getSettleData,getAccountList'], $all_button); $button = BmmcService::getListButton(['editService,delService,editServicePassword,getSettleData,getAccountList'], $all_button);
......
...@@ -1151,6 +1151,11 @@ Route::group( ...@@ -1151,6 +1151,11 @@ Route::group(
Route::get('decOrder', 'SynJdSelfDataController@decOrder');//定时解密 Route::get('decOrder', 'SynJdSelfDataController@decOrder');//定时解密
Route::get('getSelfRefund', 'SynJdSelfDataController@getSelfRefund');//定时解密 Route::get('getSelfRefund', 'SynJdSelfDataController@getSelfRefund');//定时解密
}); });
#平台服务 >> 京东供销订单订单
Route::group(['prefix'=>'SynJdPurchaseData'], function (){
Route::get('addOrderData', 'SynJdPurchaseController@addOrderData');//添加供销订单
Route::get('getPurchaseRefund', 'SynJdPurchaseController@getPurchaseRefund');//获取退款
});
#平台服务 >> 京东自营订单 #平台服务 >> 京东自营订单
Route::group(['prefix'=>'SynJdSelfDataNew'], function (){ Route::group(['prefix'=>'SynJdSelfDataNew'], function (){
Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东 Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论