Skip to content

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

edit

上级 150c32e5
显示空白字符变更
内嵌 并排
正在显示 包含 177 行增加 和 8 行删除
app/Http/Controllers/Api/SynJdSelfDataNewController.php
浏览文件 @ ceb79d04
......@@ -76,7 +76,35 @@ class SynJdSelfDataNewController extends BaseController
$arr_goods = [];
$arr = [];
$order_data = $searchResult['queryAllOrdersForJosResult'];
$orderInfos=[];
$num = 0;
foreach($order_data as $kks => $vks){
if(!empty($vks['oaid'])) {
$orderInfos[$num]['orderId'] = $vks['customOrderId'];
$orderInfos[$num]['oaid'] = $vks['oaid'];
$num++;
}
}
if(!empty($orderInfos)){
$poss['appKey'] = $v['app_key'];
$poss['accessToken'] = $v['access_token'];
$poss['appSecret'] = $v['app_secret'];
$poss['orderInfos'] = json_encode($orderInfos);
$user_data=$this->https_request('http://zptzchat.bluearp.com/m/index.php/GetUserDataApi/getOaidDecrypt',$poss);
$user_data = json_decode($user_data,true);
if($user_data['jingdong_jos_order_oaid_decrypt_responce']['returnType']['code']==200){
$user_data = $user_data['jingdong_jos_order_oaid_decrypt_responce']['returnType']['data'];
$user_datas = [];
foreach($user_data as $ks => $vs){
$user_datas[$vs['orderId']] = $vs;
}
if(!empty($user_datas)){
foreach($order_data as $ka => $va){
$order_data[$ka]['user_data_dou'] = isset($user_datas[$va['customOrderId']])?$user_datas[$va['customOrderId']]:'';
}
}
}
}
$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']);
......@@ -97,7 +125,12 @@ class SynJdSelfDataNewController extends BaseController
}
//解密
/*****************************************解密姓名*************************************************/
// $str = $vv['consigneeName'];
if(isset($vv['user_data_dou'])){
$str = $vv['user_data_dou']['customerName'];
}else {
$str = $vv['consigneeName'];
}
$data['accessToken'] = $v['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$data['appKey'] = $v['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84';
$data['appSecret'] = $v['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751';
......@@ -118,7 +151,12 @@ class SynJdSelfDataNewController extends BaseController
$fullname = $fullname??$vv['consigneeName'];
/************************************************************************************************/
/**********************************************解密地址******************************************/
$fullAddress = $this->decrypt($data,$vv['address']);
if(isset($vv['user_data_dou'])){
$Address = $vv['user_data_dou']['address'];
}else {
$Address = $vv['address'];
}
$fullAddress = $this->decrypt($data,$Address);
if(strpos($fullAddress,'<body>' )!==false){
//存另一数据库中
......
app/Http/Controllers/Api/SynOrderRejectedController.php
浏览文件 @ ceb79d04
......@@ -14,6 +14,7 @@ use App\Http\Controllers\BaseController;
use App\Http\Controllers\Orders\AotuorderController;
use App\Http\Controllers\Orders\OrderListController;
use App\Models\OrderList;
use App\Models\Orders;
use App\Services\CommonService;
use Illuminate\Http\Request;
use DB;
......@@ -64,12 +65,16 @@ class SynOrderRejectedController extends BaseController
if(in_array($v['company_id'],[14])){
DB::table('order_rejected')->insert(['or_order_num'=>$orderListArr['order_num'],'or_ser_id'=>$orderListArr['ser_id'],'or_creact_time'=>date("Y-m-d H:i:s"),'or_centent'=>'超过15分钟未结单','or_show'=>1,'or_type'=>2]);
$rest = CommonService::accMe($v['sys_num'], '超时未接单', "拒单，超十五分钟未结单", $v['serial_number'] . "等", '1', 8, '系统录入', '1133');//添加备注
DB::beginTransaction();
$ret = OrderList::where('sys_num',$v['sys_num'])->update(['ol_distype'=>3]);
if($ret){
$rets = Orders::where('sys_num',$v['sys_num'])->update(['distype'=>5]);
if($ret && $rets){
DB::commit();
$data[$num]['order_num'] = $v['order_num'];
$data[$num]['content'] = '操作成功';
$num++;
}else{
DB::rollback();
$data[$num]['order_num'] = $v['order_num'];
$data[$num]['content'] = '操作失败：';
$num++;
......
app/Http/Controllers/Common/CommonController.php
浏览文件 @ ceb79d04
......@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Common;
use App\Models\Company;
use App\Models\Czrz;
use App\Models\GoodCode;
use App\Models\GoodsSeries;
use App\Models\NoteDetail;
......@@ -1344,4 +1345,36 @@ class CommonController extends BaseController
return $this->error('无数据', ErrorInc::DATA_EMPTY, []);
}
}
/**|---------------------------------------------------------------------------------
* @name 获取日志信息
* @param string number 查询单号
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2023-02-03 003 下午 4:57:07
* |---------------------------------------------------------------------------------
*/
public function searchCzrz ( Request $request ){
if($request->filled('number')){
$sql = [];
$sql[] = "sys_num = '".$request->input('number')."'";
$sql[] = "order_num = '".$request->input('number')."'";
$order = Orders::whereRaw(implode(" or ",$sql))->first();
if($order){
$czrz = Czrz::whereRaw("czrz_number = '".$order['sys_num']."' or czrz_number = '".$order['order_num']."'")->orderBy('czrz_czsj','ASC')->get();
if($czrz){
$czrz = CommonService::dataToArray($czrz);
$data['order_num'] = $order['order_num'];
$data['sys_num'] = $order['sys_num'];
$data['list'] = $czrz;
return $this->success('操作成功', $data);
}else{
return $this->error('无日志', ErrorInc::DATA_EMPTY);
}
}else{
return $this->error('无单号数据', ErrorInc::DATA_EMPTY);
}
}else{
return $this->error('请输入单号', ErrorInc::FAILED_PARAM);
}
}
}
app/Http/Controllers/DatasBase/TipsController.php
浏览文件 @ ceb79d04
......@@ -5,6 +5,7 @@ use App\Models\Aftercust;
use App\Models\OrderAfter;
use App\Models\OrderAftertrack;
use App\Models\OrderList;
use App\Models\Orders;
use App\Models\Refund;
use App\Models\SendGoods;
use App\Services\BmmcService;
......@@ -58,6 +59,13 @@ class TipsController extends BaseController
$list[$num]['url'] = '';
}
}
$timeout = Orders::where('order_status',20)->where('distype',5)->count();
if($timeout>0){
$num = count($list);
$list[$num]['msg'] = "订单超时未结单";
$list[$num]['count'] = $timeout;
$list[$num]['url'] = 'Ordersystem/orders';
}
$date = time();
$time = mktime(17,0,0,date('m'),date('d'),date('Y'));
$eight = $date -'28800';
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ ceb79d04
......@@ -150,6 +150,9 @@ class OrderListController extends BaseController
if (in_array($session_token['admin_groupnew'], [2,3,8])){//管理员可以看全部
$where.=" and company_id>1";
}
if (in_array($session_token['admin_groupnew'], [8])){//管理员可以看全部
$where.=" and company_id in (".implode(',', $session_token['all_companys']).")";
}
//统计数量
$wjd = OrderList::whereRaw($where)->whereRaw("(stauas = 10 or stauas = 20)")->count();
......
app/Http/Controllers/Orders/OrdersController.php
浏览文件 @ ceb79d04
......@@ -131,7 +131,7 @@ class OrdersController extends BaseController
return $this->error('缺少参数', ErrorInc::INVALID_PARAM, []);
}
$input = $request->all();
if(!in_array($input['state'],[0,1,3,5,10,20,6,7,8])){
if(!in_array($input['state'],[0,1,3,5,10,20,6,7,8,21])){
return $this->error('参数错误', ErrorInc::FAILED_PARAM, []);
}
$list = OrderService::getList($input,$request->get('session_token'));
......@@ -2338,6 +2338,38 @@ class OrdersController extends BaseController
return $this->success('成功', $caps);
}
/**|---------------------------------------------------------------------------------
* @name 超时处理
* @param string id 订单id
* @param string remark 处理备注
* @retrun \Illuminate\Http\JsonResponse /multitype:array
* @author dou 2024/11/19 18:00
* |---------------------------------------------------------------------------------
*/
public function dealTimeOut ( Request $request ){
$input = $request->all();
$session = $request->get("session_token");
if ($request->filled('type') && $input['type']==1 ){
return $this->success('操作成功',['已联系门店']);exit;
}
$checkKey=CommonService::checkKey(['id', 'remark'],$input);
if($checkKey['code']!=1){
return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
}
$order_num = OrderService::getOrderBy('id', $input['id'],['order_num','sys_num']);
DB::beginTransaction(); //开启事务
$rest = CommonService::accMe($order_num['sys_num'], '订单管理', "超时未接单处理，" . $input['remark'], '', '', $session['admin_groupnew'], $session['admin_acc'], $session['id']);//添加备注
$return = Orders::where('id', $input['id'])->update(['distype'=>2]);
if ($rest && $return) {
DB::commit();
$this->insertingLog("接单超时处理，", $input['sys_num'], "接单超时，订单号：" . $order_num['order_num'], "订单管理", $request->ip(), $session['admin_acc']);
return $this->success('操作成功');exit;
} else {
DB::rollback();
return $this->error('操作失败', ErrorInc::MYSQL_FAILED);exit;
}
}
/**
* @name 快捷添加定单
* @param Request $request
......
app/Http/Controllers/Service/ServiceProviderController.php
浏览文件 @ ceb79d04
......@@ -20,6 +20,7 @@ use App\Models\AdminAddress;
use App\Models\Admin;
use App\Models\AdminInfor;
use App\Models\AdminKhacclist;
use App\Models\AdminKhaccount;
use App\Models\Certification;
use App\Models\InstallPerson;
use App\Models\SyncStores;
......@@ -1544,4 +1545,42 @@ class ServiceProviderController extends BaseController
}
}
/**|---------------------------------------------------------------------------------
* @name 添加数据
* @param string aka_account 开户行账号
* @param string aka_name 开户行名称
* @param string aka_type 数据状态1启用2停用
* @retrun \Illuminate\Http\JsonResponse
* @author dou 2022/6/7 19:30
* |---------------------------------------------------------------------------------
*/
public function addKhAccount ( Request $request ){
$input = $request->only('aka_account','aka_name');
$checkKey=CommonService::checkKey(['aka_account','aka_name'],$input,array('aka_account'=>'开户行账号','aka_name'=>'开户行名称'));
if($checkKey['code']!=1){
return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
}
$session = $request->get('session_token');
$ip = $request->ip();
$list = AdminKhaccount::where('aka_account',$input['aka_account'])->whereOr('aka_name',$input['aka_name'])->first();
if(!$list) {
$input['aka_creactor'] = $session['admin_acc'];
$input['aka_creactid'] = $session['id'];
$input['aka_type'] = 1;
$input['aka_creactime'] = date("Y-m-d H:i:s");
$res = AdminKhaccount::insert($input);
$content = "添加" . $input['aka_name'] . "(" . $input['aka_account'] . ")";
if ($res) {
$this->insertingLog('添加开户行信息，', $input['aka_account'], $content, '服务商管理', $ip, $session['admin_acc']);
return $this->success('操作成功');
} else {
return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED);
}
}else{
$list = CommonService::dataToArray($list);
return $this->error('数据已存在,系统名称:'.$list['aka_name'].'('.$list['aka_account'].')', ErrorInc::REPEAT_SUBMIT);
}
exit;
}
}
app/Services/OrderService.php
浏览文件 @ ceb79d04
......@@ -409,7 +409,7 @@ class OrderService extends Service
//导出所需语句
$data['sqls'] = DB::getQueryLog()[1];
$data['showcount'] = OrderService::getStatusBar($session);//获取操作权限可展示订单状态栏
$data['showcount'] = OrderService::getStatusBar($session,$admin_pt_id,1);//获取操作权限可展示订单状态栏
$all_button = BmmcService::whereButton($input['token'],$input['Pri_id']);
$export = BmmcService::getTopButton('export,auto_order,exportOrdersMsg','',$all_button);
$data['button_top'] = $export['button_top']??[];//顶部按钮
......@@ -457,6 +457,9 @@ class OrderService extends Service
$where['day_time_searchlt'] = $day_time;
}else if($status == 20){
$where['order_status'] = $status;
}else if($status == 21){
$where['order_status'] = 20;
$where['distype'] = 5;
}else if($status == 6){
$where['order_status_searchlt'] = 20;
$where['day_time_searchgt'] = $day_time;
......@@ -485,6 +488,7 @@ class OrderService extends Service
['showname' => "处理中", 'shownum' => '--','status'=>5],
['showname' => "可派单", 'shownum' => '--','status'=>10],
['showname' => "已派单", 'shownum' => '--','status'=>20],
['showname' => "超时未接单", 'shownum' => '--','status'=>21],
// ['showname' => "延期订单", 'shownum' => '--','status'=>6],
// ['showname' => "订单追踪", 'shownum' => '--','status'=>7],
['showname' => "撤销订单", 'shownum' => '--','status'=>8]
......@@ -506,7 +510,7 @@ class OrderService extends Service
*/
public static function getStatusNum ( $status , $admin_pt_id ,$session = ''){
if(in_array($status,[1,3,5,10,20,6,7])){
if(in_array($status,[1,3,5,10,20,6,7,21])){
$db = new Orders();
$where['is_delete'] = '2';
if(!in_array($session['admin_groupnew'],[7,8])) {
......@@ -584,6 +588,9 @@ class OrderService extends Service
if ($v['order_status'] <= 10 && $v['order_status'] != 3 && $v['bus_type'] == 2) {
$buttonData[] = 'edit_price';
}
if ($v['order_status'] == 20 && $v['distype'] == 5) {
$buttonData[] = 'dealTimeOut';
}
if (in_array($v['order_status'], [1, 5, 10, 20, 30])) {//订单延期
$buttonData[] = 'delay_order';
}
......@@ -637,6 +644,9 @@ class OrderService extends Service
$list[$k]['button_two'] = $button['button_two']??[];
$list[$k]['button_three'] = $button['button_three']??[];
$list[$k]['order_status_name'] = $order_status_name[$v['order_status']]??'未确认';
if ($v['order_status'] == 20 && $v['distype'] == 5) {
$list[$k]['order_status_name'] = '超时未接单';
}
$list[$k]['smartStoreName'] = $smartStoreName[$v['smart_store']]??'未确认';
$list[$k]['order_type_name'] = $order_type[$v['order_type']]??'未确认';
if ($v['order_status'] >= 20 && $admin_groupnew != 2) {
......
routes/api.php
浏览文件 @ ceb79d04
......@@ -85,6 +85,7 @@ Route::group(['prefix' => 'service', 'middleware' => 'requestpc', 'namespace' =>
Route::post('serviceProvider/addOtherAccount', 'ServiceProviderController@addOtherAccount');//添加门店结算账号
Route::post('serviceProvider/editOtherAccount', 'ServiceProviderController@editOtherAccount');//编辑门店结算账号
Route::post('serviceProvider/getSettleData', 'ServiceProviderController@getSettleData');//
Route::post('serviceProvider/addKhAccount', 'ServiceProviderController@addKhAccount');//添加开户行信息
Route::post('Pay/index', 'PayController@index');//充值扣款记录
Route::post('Pay/getClientType', 'PayController@getClientType');//获取客户类型
......@@ -321,7 +322,7 @@ Route::group(
Route::post('getAccountname', 'CommonController@getAccountname');//搜索账户名
Route::post('getWarehouseNum', 'CommonController@getWarehouseNum');//获取商品库存
Route::post('getKhAccount', 'CommonController@getKhAccount');//获取开户行号信息
Route::post('searchCzrz', 'CommonController@searchCzrz');//获取开户行号信息
Route::post('getCompanyList', 'CommonController@getCompanyList');//获取公司信息
......@@ -563,7 +564,7 @@ Route::group(['prefix'=>'orderlist','middleware'=>'requestpc'], function(){
Route::post('validationOrderNum', 'OrdersController@validationOrderNum');//验证平台单号是否存在 新增2022-3-7
Route::post('mate','OrdersController@mate');//添加订单(返回选中的商品) 新增2022-3-7
Route::post('fastAddOrder','OrdersController@fastAddOrder');//快捷填单 新增2022-3-7
Route::post('dealTimeOut','OrdersController@dealTimeOut');//超时处理
//dong
Route::post('addF6Claim','OrdersController@addF6Claim');//添加F6索赔
});
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论