Skip to content

Z
zptz-sass-kelaidian
提交 bf2670e8 authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

edit

上级 19c0b50a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 41 行增加 和 20 行删除
app/Console/Kernel.php
浏览文件 @ bf2670e8
......@@ -17,7 +17,7 @@ class Kernel extends ConsoleKernel
Commands\GetJdOrder::class,
Commands\GetJdSelfOrder::class,
Commands\GetJdSelfRefund::class,
// Commands\GetJdSelfShhOrder::class
Commands\GetJdSelfShhOrder::class
// Commands\DeductionFee::class
];
......@@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel
$schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('getJdSelfRefund')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('DeductionFee')->everyFiveMinutes();//每五分钟执行一次
}
......
app/Http/Controllers/Api/SynJdPopDataController.php
浏览文件 @ bf2670e8
......@@ -31,8 +31,6 @@ class SynJdPopDataController extends BaseController
* @date 2022/4/27
*/
public function addOrderData (){
CommonService::addLog('无sku', 'CESHISHUJU', 1111111,'JDPOP-无sku');
echo '操作成功--****';
/* $str = "AAQLAodRrJ360+b6qYevz+HgyXHUehSiWki+A9YqUJVvonqI1G8rNALcCZYF9eo5A5M=";
$data['accessToken'] = 'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$data['appKey'] = '41D9668E8CB81C9890A065BEC300FD84';
......@@ -59,7 +57,7 @@ exit;*/
$res_ult[$k]['time_start'] = $time_start; //开始时间
$res_ult[$k]['time_end'] = $time_end; //结束时间
$res_ult[$k]['setPageSize'] = 20; //每页条数
$res_ult[$k]['setOrderState'] = 'WAIT_SELLER_STOCK_OUT,TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED'; //订单状态 WAIT_SELLER_STOCK_OUT 等待出库 ,TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED,WAIT_GOODS_RECEIVE_CONFIRM,WAIT_SELLER_DELIVERY
$res_ult[$k]['setOrderState'] = 'WAIT_SELLER_STOCK_OUT'; //订单状态 WAIT_SELLER_STOCK_OUT 等待出库 ,TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED,WAIT_GOODS_RECEIVE_CONFIRM,WAIT_SELLER_DELIVERY
$res_ult[$k]['setOptionalFields'] ='orderInfo,orderId,orderType,payType,orderTotalPrice,orderSellerPrice,open_id_buyer,open_id,orderMarkDesc,storeId,tuiHuoWuYou,taxFee,scDT,storeOrder,orderSource,customsModel,customs,parentOrderId,directParentOrderId,modified,vatInfo,logisticsId,paymentConfirmTime,returnOrder,balanceUsed,venderRemark,itemInfoList,consigneeInfo,orderEndTime,orderStartTime,orderRemark,invoiceCode,invoiceInfo,invoiceEasyInfo,orderStateRemark,orderState,sellerDiscount,orderPayment,venderId,pauseBizInfo,freightPrice'; //获取的订单字段
/**TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED
......@@ -255,10 +253,8 @@ exit;*/
// dump($return);
CommonService::addLog('添加定单', json_encode($return), $vv['orderId'],'jd_addOrder');
// $return['ErrorCode'] = 2;
if($return['ErrorCode']==1){
if($return['ErrorCode']==1 && $v['pt_id']!=33){
//调用京东出库
$res_ex = [];
$res_ex['appKey'] = $v['app_key']; //appkey
$res_ex['appSecret'] = $v['app_secret'];//secret
......@@ -382,7 +378,7 @@ exit;*/
*/
public function changeTelphone($data){
// $result = $this->request_post($url,$data);
$url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
$url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
$ret = $this->request_post($url, $data);
$result = json_decode($ret,true);
CommonService::addLog('手机号', $result['jingdong_pop_order_getmobilelist_responce']["result"]["data"][$data['order_id']]['consMobilePhone'].'----'.$ret.'---'.json_encode($data).'---'.$url, $data['order_id'],'jd_mobile');
......
app/Http/Controllers/Api/SynJdSelfDataNewController.php
浏览文件 @ bf2670e8
......@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Api;
use App\Http\Controllers\BaseController;
use App\Models\OrderMsg;
use App\Models\Orders;
use App\Models\Pt;
use App\Models\User;
use App\Services\CommonService;
use App\Services\OrderaddService;
......@@ -75,6 +76,8 @@ class SynJdSelfDataNewController extends BaseController
$arr_goods = [];
$arr = [];
$order_data = $searchResult['queryAllOrdersForJosResult'];
$company_id = Pt::where('id',$v['pt_id'])->value('company_id');
foreach( $order_data as $kk => $vv ){
$order_info = OrderService::getOrderBy('order_num', $vv['customOrderId'],['id','order_status','lock_type','sys_num','order_num','p_id','ser_id','create_time','new_customer_id','lock_type']);
if($order_info){
......@@ -215,13 +218,13 @@ class SynJdSelfDataNewController extends BaseController
$session['admin_groupnew'] = 7;
$session['admin_acc'] = '系统录入';
$session['id'] = 1133;
$session['company_id'] = 11;
$session['company_id'] = $company_id;
// dump($orders[$kk]);
$return = OrderaddService::addOrder($orders[$kk], $session, $ip);
// dump($return);
CommonService::addLog('添加定单', json_encode($return), $vv['customOrderId'],'jd_addSelfShhOrder');
// $return['ErrorCode'] = 2;
if($return['ErrorCode']==1){
if($return['ErrorCode']==1 && $v['pt_id']!=33){
//调用京东出库
......@@ -231,7 +234,11 @@ class SynJdSelfDataNewController extends BaseController
$res_ex['accessToken'] = $v['access_token']; //token
$res_ex['customOrderId'] = $vv['customOrderId'];//$vv['orderId'];
$res_ex['carrierId'] = 1274;
$res_ex['phone'] = '4000773321';
if($company_id==14){
$res_ex['phone'] = '18518338010';
}else{
$res_ex['phone'] = '';
}
// $res_ex['estimateDate'] = date("Y-m-d H:i:s");
$result = $this->request_post($url_ex,$res_ex);//出库同步
......
app/Http/Controllers/Common/CommonController.php
浏览文件 @ bf2670e8
......@@ -405,9 +405,11 @@ class CommonController extends BaseController
switch ( $type )
{
case 1:
foreach($company_id_type1 as $k => $v){
$parameter[$k] = $v;
}
if($company_id_type1) {
foreach ($company_id_type1 as $k => $v) {
$parameter[$k] = $v;
}
}
$parameter['admin_groupnew_noteq'] = 2;
$list = AdminsService::getAdmins($parameter,['id','admin_acc']);//,['ptid'=>'desc','admin_groupnew'=>'asc']
break;
......
app/Http/Controllers/Orders/AotuorderController.php
浏览文件 @ bf2670e8
......@@ -150,13 +150,17 @@ class AotuorderController extends BaseController
}
if(empty($or_ser_id)) {
if ($xian == 1) {
CommonService::startmysql();
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("find_in_set('" . $dress['are_id'] . "',bs_areid) and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
CommonService::addLog('自动拒单', CommonService::showmysql(), '','AotuorderController');
if (!$ser) {
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
$xian = 2;
}
} else {
CommonService::startmysql();
$ser = Bserviss::leftJoin('admin','admin.id','=','bservisnew.bs_serid')->whereRaw("bs_sid='" . $dress['are_sid'] . "' and bs_branid='" . $goodid . "' and bs_status='1' and enable=1".$where)->select('bservisnew.*','admin_groupnew')->get()->toArray();
CommonService::addLog('自动拒单', CommonService::showmysql(), '','AotuorderController');
}
}else{
if ($xian == 1) {
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ bf2670e8
......@@ -1822,7 +1822,7 @@ class OrderListController extends BaseController
if (empty($ware_id)) {
// 新增默认仓库
$add_ware['shck_ckmc'] = '默认仓库';
$add_ware['company_id'] = $company_id;
$add_ware['company_id'] = $orderListArr['agency_id'];
$ware_id = DB::table('warehouse')->insertGetId($add_ware);
}
$warehouse_data['ware_id'] = $ware_id;
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ bf2670e8
......@@ -657,7 +657,17 @@ class OrderListService extends Model
} else {
$ree = true;
}
$req = InstallLine::where('line_serm',$orderListArr['serial_number'])->update(['line_state'=>2,'line_lasttime'=>date("Y-m-d H:i:s")]);
$install = InstallLine::where('line_serm',$orderListArr['serial_number'])->first();
$install = CommonService::dataToArray($install);
if(!empty($install)) {
if($install['line_state']>2) {
$req = InstallLine::where('line_serm', $orderListArr['serial_number'])->update(['line_state' => 2, 'line_lasttime' => date("Y-m-d H:i:s")]);
}else{
$req =true;
}
}else {
$req = self::updateLineSrate('', 1, $orderListArr['serial_number'], $orderListArr['sys_num'], $orderListArr['order_num']);
}
if ( $res && $rea && $ree && $req ) {
DB::commit();
$content = "订单(".$orderListArr['serial_number'].")(".$install_person['install_name'].")";
......@@ -665,7 +675,7 @@ class OrderListService extends Model
return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => []];
} else {
DB::rollback();//回滚
return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '操作失败', 'Data' => []];
return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '操作失败', 'Data' => [$res,$rea,$ree,$req]];
}
}else{
return ['ErrorCode' => ErrorInc::BUSINESS_FORBID, 'ErrorMessage' => '技师不存在！', 'Data' => []];
......@@ -1646,7 +1656,7 @@ class OrderListService extends Model
$line['line_end_time'] = date("Y-m-d H:i:s");
break;
default:
return false;
// return false;
break;
}
$line['line_lasttime'] = date("Y-m-d H:i:s");
......
routes/api.php
浏览文件 @ bf2670e8
......@@ -1143,7 +1143,7 @@ Route::group(
});
#平台服务 >> 京东自营订单
Route::group(['prefix'=>'SynJdSelfDataNew'], function (){
Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东
Route::get('addOrderData', 'SynJdSelfDataNewController@addOrderData');//添加京东
Route::get('decOrder', 'SynJdSelfDataNewController@decOrder');//定时解密
Route::get('getSelfRefund', 'SynJdSelfDataNewController@getSelfRefund');//定时解密
});
......@@ -1422,6 +1422,8 @@ Route::group(['prefix' => 'RequestApp', 'namespace' => 'AppApi', 'middleware' =>
});
Route::group(['prefix' => 'Dou', 'namespace' => 'Dou'], function () {
Route::any('MyTest/test', 'MyTestController@test'); //测试入口
Route::any('MyTest/dataApi', 'MyTestController@dataApi'); //测试入口
Route::any('MyTest/getJdToken', 'MyTestController@getJdToken'); //测试入口
});
// 移动端网页功能
Route::namespace('Api')->group(function () {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论