Skip to content

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

edit

上级 19c0b50a
显示空白字符变更
内嵌 并排
正在显示 包含 225 行增加 和 18 行删除
app/Console/Kernel.php
浏览文件 @ bf2670e8
...@@ -17,7 +17,7 @@ class Kernel extends ConsoleKernel ...@@ -17,7 +17,7 @@ class Kernel extends ConsoleKernel
Commands\GetJdOrder::class, Commands\GetJdOrder::class,
Commands\GetJdSelfOrder::class, Commands\GetJdSelfOrder::class,
Commands\GetJdSelfRefund::class, Commands\GetJdSelfRefund::class,
// Commands\GetJdSelfShhOrder::class Commands\GetJdSelfShhOrder::class
// Commands\DeductionFee::class // Commands\DeductionFee::class
]; ];
...@@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel ...@@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel
$schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次 $schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次
$schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次 $schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('getJdSelfRefund')->everyFiveMinutes();//每五分钟执行一次 // $schedule->command('getJdSelfRefund')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次 $schedule->command('GetJdSelfShhOrder')->everyFiveMinutes();//每五分钟执行一次
// $schedule->command('DeductionFee')->everyFiveMinutes();//每五分钟执行一次 // $schedule->command('DeductionFee')->everyFiveMinutes();//每五分钟执行一次
} }
......
app/Http/Controllers/Api/SynJdPopDataController.php
浏览文件 @ bf2670e8
...@@ -31,8 +31,6 @@ class SynJdPopDataController extends BaseController ...@@ -31,8 +31,6 @@ class SynJdPopDataController extends BaseController
* @date 2022/4/27 * @date 2022/4/27
*/ */
public function addOrderData (){ public function addOrderData (){
CommonService::addLog('无sku', 'CESHISHUJU', 1111111,'JDPOP-无sku');
echo '操作成功--****';
/* $str = "AAQLAodRrJ360+b6qYevz+HgyXHUehSiWki+A9YqUJVvonqI1G8rNALcCZYF9eo5A5M="; /* $str = "AAQLAodRrJ360+b6qYevz+HgyXHUehSiWki+A9YqUJVvonqI1G8rNALcCZYF9eo5A5M=";
$data['accessToken'] = 'e0a1c90e617f4b3a9865ed059f99c5f42ztb'; $data['accessToken'] = 'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
$data['appKey'] = '41D9668E8CB81C9890A065BEC300FD84'; $data['appKey'] = '41D9668E8CB81C9890A065BEC300FD84';
...@@ -59,7 +57,7 @@ exit;*/ ...@@ -59,7 +57,7 @@ exit;*/
$res_ult[$k]['time_start'] = $time_start; //开始时间 $res_ult[$k]['time_start'] = $time_start; //开始时间
$res_ult[$k]['time_end'] = $time_end; //结束时间 $res_ult[$k]['time_end'] = $time_end; //结束时间
$res_ult[$k]['setPageSize'] = 20; //每页条数 $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'; //获取的订单字段 $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 /**TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED
...@@ -255,10 +253,8 @@ exit;*/ ...@@ -255,10 +253,8 @@ exit;*/
// dump($return); // dump($return);
CommonService::addLog('添加定单', json_encode($return), $vv['orderId'],'jd_addOrder'); CommonService::addLog('添加定单', json_encode($return), $vv['orderId'],'jd_addOrder');
// $return['ErrorCode'] = 2; // $return['ErrorCode'] = 2;
if($return['ErrorCode']==1){ if($return['ErrorCode']==1 && $v['pt_id']!=33){
//调用京东出库 //调用京东出库
$res_ex = []; $res_ex = [];
$res_ex['appKey'] = $v['app_key']; //appkey $res_ex['appKey'] = $v['app_key']; //appkey
$res_ex['appSecret'] = $v['app_secret'];//secret $res_ex['appSecret'] = $v['app_secret'];//secret
...@@ -382,7 +378,7 @@ exit;*/ ...@@ -382,7 +378,7 @@ exit;*/
*/ */
public function changeTelphone($data){ public function changeTelphone($data){
// $result = $this->request_post($url,$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); $ret = $this->request_post($url, $data);
$result = json_decode($ret,true); $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'); 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; ...@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Api;
use App\Http\Controllers\BaseController; use App\Http\Controllers\BaseController;
use App\Models\OrderMsg; use App\Models\OrderMsg;
use App\Models\Orders; use App\Models\Orders;
use App\Models\Pt;
use App\Models\User; use App\Models\User;
use App\Services\CommonService; use App\Services\CommonService;
use App\Services\OrderaddService; use App\Services\OrderaddService;
...@@ -75,6 +76,8 @@ class SynJdSelfDataNewController extends BaseController ...@@ -75,6 +76,8 @@ class SynJdSelfDataNewController extends BaseController
$arr_goods = []; $arr_goods = [];
$arr = []; $arr = [];
$order_data = $searchResult['queryAllOrdersForJosResult']; $order_data = $searchResult['queryAllOrdersForJosResult'];
$company_id = Pt::where('id',$v['pt_id'])->value('company_id');
foreach( $order_data as $kk => $vv ){ 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']); $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){ if($order_info){
...@@ -215,13 +218,13 @@ class SynJdSelfDataNewController extends BaseController ...@@ -215,13 +218,13 @@ class SynJdSelfDataNewController extends BaseController
$session['admin_groupnew'] = 7; $session['admin_groupnew'] = 7;
$session['admin_acc'] = '系统录入'; $session['admin_acc'] = '系统录入';
$session['id'] = 1133; $session['id'] = 1133;
$session['company_id'] = 11; $session['company_id'] = $company_id;
// dump($orders[$kk]); // dump($orders[$kk]);
$return = OrderaddService::addOrder($orders[$kk], $session, $ip); $return = OrderaddService::addOrder($orders[$kk], $session, $ip);
// dump($return); // dump($return);
CommonService::addLog('添加定单', json_encode($return), $vv['customOrderId'],'jd_addSelfShhOrder'); CommonService::addLog('添加定单', json_encode($return), $vv['customOrderId'],'jd_addSelfShhOrder');
// $return['ErrorCode'] = 2; // $return['ErrorCode'] = 2;
if($return['ErrorCode']==1){ if($return['ErrorCode']==1 && $v['pt_id']!=33){
//调用京东出库 //调用京东出库
...@@ -231,7 +234,11 @@ class SynJdSelfDataNewController extends BaseController ...@@ -231,7 +234,11 @@ class SynJdSelfDataNewController extends BaseController
$res_ex['accessToken'] = $v['access_token']; //token $res_ex['accessToken'] = $v['access_token']; //token
$res_ex['customOrderId'] = $vv['customOrderId'];//$vv['orderId']; $res_ex['customOrderId'] = $vv['customOrderId'];//$vv['orderId'];
$res_ex['carrierId'] = 1274; $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"); // $res_ex['estimateDate'] = date("Y-m-d H:i:s");
$result = $this->request_post($url_ex,$res_ex);//出库同步 $result = $this->request_post($url_ex,$res_ex);//出库同步
......
app/Http/Controllers/Common/CommonController.php
浏览文件 @ bf2670e8
...@@ -405,8 +405,10 @@ class CommonController extends BaseController ...@@ -405,8 +405,10 @@ class CommonController extends BaseController
switch ( $type ) switch ( $type )
{ {
case 1: case 1:
foreach($company_id_type1 as $k => $v){ if($company_id_type1) {
foreach ($company_id_type1 as $k => $v) {
$parameter[$k] = $v; $parameter[$k] = $v;
}
} }
$parameter['admin_groupnew_noteq'] = 2; $parameter['admin_groupnew_noteq'] = 2;
$list = AdminsService::getAdmins($parameter,['id','admin_acc']);//,['ptid'=>'desc','admin_groupnew'=>'asc'] $list = AdminsService::getAdmins($parameter,['id','admin_acc']);//,['ptid'=>'desc','admin_groupnew'=>'asc']
......
app/Http/Controllers/Dou/MyTestController.php
浏览文件 @ bf2670e8
...@@ -13,11 +13,16 @@ ...@@ -13,11 +13,16 @@
namespace App\Http\Controllers\Dou; namespace App\Http\Controllers\Dou;
use App\Http\Controllers\Orders\AotuorderController; use App\Http\Controllers\Orders\AotuorderController;
use App\Models\Admin;
use App\Models\OrderList;
use App\Models\OrderRejected;
use App\Services\CommonService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use BlueCity\Core\Controllers\MountingCoreController as Controller; use BlueCity\Core\Controllers\MountingCoreController as Controller;
use BlueCity\Core\Traits\ResourceControllerMethod; use BlueCity\Core\Traits\ResourceControllerMethod;
use App\Services\TechnicalLevelService; use App\Services\TechnicalLevelService;
use BlueCity\Core\Inc\ErrorInc; use BlueCity\Core\Inc\ErrorInc;
use DB;
class MyTestController extends Controller class MyTestController extends Controller
{ {
...@@ -39,7 +44,7 @@ class MyTestController extends Controller ...@@ -39,7 +44,7 @@ class MyTestController extends Controller
if(empty($input['method'])){ if(empty($input['method'])){
return $this->error('缺少必要参数1',ErrorInc::FAILED_PARAM); return $this->error('缺少必要参数1',ErrorInc::FAILED_PARAM);
} }
$api=['getSerStatistics']; $api=['getSerStatistics','getSerStatisticsDetail'];
if(!in_array($input['method'],$api)){ if(!in_array($input['method'],$api)){
return $this->error('接口不参数异常',ErrorInc::INVALID_PARAM,$input); return $this->error('接口不参数异常',ErrorInc::INVALID_PARAM,$input);
}else { }else {
...@@ -47,4 +52,185 @@ class MyTestController extends Controller ...@@ -47,4 +52,185 @@ class MyTestController extends Controller
return $this->$api($input); return $this->$api($input);
} }
} }
/**|---------------------------------------------------------------------------------
* @name 获取京东token
* @param string ju_ordernum 订单单号
* @retrun \Illuminate\Http\JsonResponse /multitype:array
* @author dou 2024/9/29 8:56
* |---------------------------------------------------------------------------------
*/
public function getSerStatistics ( $input ){
if(empty($input['company_id'])){
$html="<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><h1>请输入公司id</h1></html>";
echo $html;exit;
}
$admindata = Admin::where('company_id',$input['company_id'])
->where('admin_groupnew',2)
->where('enable',1)
->select('id','company_name')->get();
$admindata = CommonService::dataToArray($admindata);
if($admindata){
$time_start = $input['time_start'];
$time_end = date("Y-m-d", strtotime($input['time_end'] . " +1 day"));
$html = "<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><table>";
$html .= "<tr>";
$html .= "<td rowspan='2'>序号</td><td rowspan='2'>服务商（公司名称）</td><td colspan='6'>本周".date("m-d", strtotime($input['time_start']))."-".date("m-d", strtotime($input['time_end']))."</td><td colspan='6'>累计至今</td>";
$html .= "</tr>";
$html .= "<tr>";
$html .= "<td>总推送单量</td><td>接单量</td><td>拒单量</td><td>拒单率</td><td>接单时效</td><td>履约时效</td><td>总推送单量</td><td>接单量</td><td>拒单量</td><td>拒单率</td><td>接单时效</td><td>履约时效</td>";
$html .= "</tr>";
foreach($admindata as $k => $v){
$order_listnum = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and get_time != ''")->count();//接单数量
$order_rejectednum = OrderRejected::whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and or_show=1")->count();//拒单数量
$order_listAllnum = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and is_delete=1 and get_time != ''")->count();//总接单数量
$order_rejectedAllnum = OrderRejected::whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and or_show=1")->count();//总拒单数量
$sql = "SELECT CAST((SUM(UNIX_TIMESTAMP(feeds_time))-SUM(UNIX_TIMESTAMP(get_time)))/COUNT(id) as SIGNED) as timenum FROM gone_order_list WHERE ser_id='".$v['id']."' and get_time != '' and get_time!='0000-00-00 00:00:00' and feeds_time != '' and feeds_time!='0000-00-00 00:00:00' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1";
$data = DB::select($sql);
$sql1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(get_time))-SUM(UNIX_TIMESTAMP(create_time)))/COUNT(id) as SIGNED) as pdnum FROM gone_order_list WHERE ser_id='".$v['id']."' and get_time != '' and get_time!='0000-00-00 00:00:00' and create_time BETWEEN '".$time_start."' and '".$time_end."' and time(create_time)>='08:30:00' and time(create_time)<='18:00:00' and is_delete=1";
$data1 = DB::select($sql1);
$sqls = "SELECT CAST((SUM(UNIX_TIMESTAMP(feeds_time))-SUM(UNIX_TIMESTAMP(get_time)))/COUNT(id) as SIGNED) as timenum FROM gone_order_list WHERE ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and get_time != '' and get_time!='0000-00-00 00:00:00' and feeds_time != '' and feeds_time!='0000-00-00 00:00:00' and is_delete=1";// and is_delete=1
$datas = DB::select($sqls);
$sqls1 = "SELECT CAST((SUM(UNIX_TIMESTAMP(get_time))-SUM(UNIX_TIMESTAMP(create_time)))/COUNT(id) as SIGNED) as pdnum FROM gone_order_list WHERE ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and get_time != '' and get_time!='0000-00-00 00:00:00' and time(create_time)>='08:30:00' and time(create_time)<='18:00:00' and is_delete=1";// and is_delete=1
$datas1 = DB::select($sqls1);
$html .= "<tr>";
$html .= "<td>".$v['id']."</td>";
$html .= "<td>".$v['company_name']."</td>";
$html .= "<td>".($order_listnum+$order_rejectednum)."</td>";
$html .= "<td>".$order_listnum."</td>";
$html .= "<td>".$order_rejectednum."</td>";
if(($order_listnum+$order_rejectednum) == 0){
$html .= "<td>0.00%</td>";
}else {
$gl = sprintf("%.2f", $order_rejectednum / ($order_listnum + $order_rejectednum) * 100);
$html .= "<td>" . $gl . "%</td>";
}
if($data){
$html .= "<td>".self::Compute_Time($data1[0]['pdnum'])."</td>";
$html .= "<td>".self::Compute_Time($data[0]['timenum'])."</td>";
}else{
$html .= "<td>0时0分0秒</td>";
$html .= "<td>0时0分0秒</td>";
}
$html .= "<td>".($order_listAllnum+$order_rejectedAllnum)."</td>";
$html .= "<td>".$order_listAllnum."</td>";
$html .= "<td>".$order_rejectedAllnum."</td>";
if(($order_listAllnum+$order_rejectedAllnum) == 0){
$html .= "<td>0.00%</td>";
}else {
$gls = sprintf("%.2f", $order_rejectedAllnum / ($order_listAllnum + $order_rejectedAllnum) * 100);
$html .= "<td>" . $gls . "%</td>";
}
if($data){
$html .= "<td>".self::Compute_Time($datas1[0]['pdnum'])."</td>";
$html .= "<td>".self::Compute_Time($datas[0]['timenum'])."</td>";
}else{
$html .= "<td>0时0分0秒</td>";
$html .= "<td>0时0分0秒</td>";
}
$html .= "</tr>";
}
$html .= "<table></html>";
echo $html;
}else{
$html="<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><h1>无相应公司信息</h1></html>";
echo $html;exit;
}
}
/**|---------------------------------------------------------------------------------
* @name 获取订单门店施工明细
* @param string company_id 公司id
* @param string time_start 开始时间
* @param string time_end 结算是啊金
* @retrun \Illuminate\Http\JsonResponse /multitype:array
* @author dou 2024/9/11 17:27
* |---------------------------------------------------------------------------------
*/
public function getSerStatisticsDetail ( $input ){
if(empty($input['company_id'])){
$html="<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><h1>请输入公司id</h1></html>";
echo $html;exit;
}
$admindata = Admin::where('company_id',$input['company_id'])
->where('admin_groupnew',2)
->where('enable',1)
->pluck('company_name','id');
$time_start = $input['time_start'];
$time_end = date("Y-m-d", strtotime($input['time_end'] . " +1 day"));
$sql = "SELECT (UNIX_TIMESTAMP(feeds_time)-UNIX_TIMESTAMP(get_time)) AS sgtime,(UNIX_TIMESTAMP(get_time)-UNIX_TIMESTAMP(create_time)) AS jdtime,stauas,order_num,ser_id,create_time,get_time,feeds_time FROM gone_order_list WHERE create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and company_id = ".$input['company_id']." order by create_time";
$datas = DB::select($sql);
$statusName = ['10'=>'未接单','20'=>'未接单','30'=>'安装中','34'=>'待审核','40'=>'已完成','50'=>'已撤销','55'=>'已撤销（补邮费）'];
$html = "<html><meta http-equiv='Content-Type' content='text/html; charset=utf-8' /><table>";
$html .= "<tr>";
$html .= "<td>门店名称</td><td>单号</td><td>订单状态</td><td>创建时间</td><td>接单时间</td><td>反馈时间</td><td>接单时效</td><td>5分钟接单达标</td><td>10钟接单达标</td><td>履约时效</td><td>12小时履约达标</td><td>24小时履约达标</td>";
$html .= "</tr>";
foreach($datas as $k => $v){
$html .= "<tr>";
$html .= "<td>".$admindata[$v['ser_id']]."</td>";
$html .= "<td>".$v['order_num']."</td>";
$html .= "<td>".$statusName[$v['stauas']]."</td>";
$html .= "<td>".$v['create_time']."</td>";
$html .= "<td>".$v['get_time']."</td>";
$html .= "<td>".$v['feeds_time']."</td>";
if($v['get_time'] != '' && $v['get_time'] != '0000-00-00 00:00:00'){
$html .= "<td>".self::Compute_Time($v['jdtime'])."</td>";
if($v['jdtime']<300){
$html .= "<td>达标</td>";
}else{
$html .= "<td>不达标</td>";
}
if($v['jdtime']<600){
$html .= "<td>达标</td>";
}else{
$html .= "<td>不达标</td>";
}
}else{
$html .= "<td></td>";
$html .= "<td>不达标</td>";
$html .= "<td>不达标</td>";
}
if($v['feeds_time'] != '' && $v['feeds_time'] != '0000-00-00 00:00:00'){
$html .= "<td>".self::Compute_Time($v['sgtime'])."</td>";
if($v['sgtime']<43200){
$html .= "<td>达标</td>";
}else{
$html .= "<td>不达标</td>";
}
if($v['sgtime']<86400){
$html .= "<td>达标</td>";
}else{
$html .= "<td>不达标</td>";
}
}else{
$html .= "<td></td>";
$html .= "<td>不达标</td>";
$html .= "<td>不达标</td>";
}
$html .= "</tr>";
}
$html .= "<table></html>";
echo $html;
}
/**|---------------------------------------------------------------------------------
* @name 转化为时分秒
* @param string timediff 时间
* @retrun /multitype:string
* @author dou 2024/8/23 11:43
* |---------------------------------------------------------------------------------
*/
private function Compute_Time( $timediff ){
$days = intval($timediff/86400);
//计算小时数
$remain = $timediff%86400;
$hours = intval($remain/3600);
//计算分钟数
$remain = $remain%3600;
$mins = intval($remain/60);
//计算秒数
$secs = $remain%60;
//$res = array("day" => $days,"hour" => $hours,"min" => $mins,"sec" => $secs);
$res = $days.'天'.$hours.'时'.$mins.'分'.$secs.'秒';
return $res;
}
} }
app/Http/Controllers/Orders/AotuorderController.php
浏览文件 @ bf2670e8
...@@ -150,13 +150,17 @@ class AotuorderController extends BaseController ...@@ -150,13 +150,17 @@ class AotuorderController extends BaseController
} }
if(empty($or_ser_id)) { if(empty($or_ser_id)) {
if ($xian == 1) { 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(); $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) { 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(); $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; $xian = 2;
} }
} else { } 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(); $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{ }else{
if ($xian == 1) { if ($xian == 1) {
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ bf2670e8
...@@ -1822,7 +1822,7 @@ class OrderListController extends BaseController ...@@ -1822,7 +1822,7 @@ class OrderListController extends BaseController
if (empty($ware_id)) { if (empty($ware_id)) {
// 新增默认仓库 // 新增默认仓库
$add_ware['shck_ckmc'] = '默认仓库'; $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); $ware_id = DB::table('warehouse')->insertGetId($add_ware);
} }
$warehouse_data['ware_id'] = $ware_id; $warehouse_data['ware_id'] = $ware_id;
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ bf2670e8
...@@ -657,7 +657,17 @@ class OrderListService extends Model ...@@ -657,7 +657,17 @@ class OrderListService extends Model
} else { } else {
$ree = true; $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 ) { if ( $res && $rea && $ree && $req ) {
DB::commit(); DB::commit();
$content = "订单(".$orderListArr['serial_number'].")(".$install_person['install_name'].")"; $content = "订单(".$orderListArr['serial_number'].")(".$install_person['install_name'].")";
...@@ -665,7 +675,7 @@ class OrderListService extends Model ...@@ -665,7 +675,7 @@ class OrderListService extends Model
return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => []]; return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => []];
} else { } else {
DB::rollback();//回滚 DB::rollback();//回滚
return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '操作失败', 'Data' => []]; return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '操作失败', 'Data' => [$res,$rea,$ree,$req]];
} }
}else{ }else{
return ['ErrorCode' => ErrorInc::BUSINESS_FORBID, 'ErrorMessage' => '技师不存在！', 'Data' => []]; return ['ErrorCode' => ErrorInc::BUSINESS_FORBID, 'ErrorMessage' => '技师不存在！', 'Data' => []];
...@@ -1646,7 +1656,7 @@ class OrderListService extends Model ...@@ -1646,7 +1656,7 @@ class OrderListService extends Model
$line['line_end_time'] = date("Y-m-d H:i:s"); $line['line_end_time'] = date("Y-m-d H:i:s");
break; break;
default: default:
return false; // return false;
break; break;
} }
$line['line_lasttime'] = date("Y-m-d H:i:s"); $line['line_lasttime'] = date("Y-m-d H:i:s");
......
routes/api.php
浏览文件 @ bf2670e8
...@@ -1422,6 +1422,8 @@ Route::group(['prefix' => 'RequestApp', 'namespace' => 'AppApi', 'middleware' => ...@@ -1422,6 +1422,8 @@ Route::group(['prefix' => 'RequestApp', 'namespace' => 'AppApi', 'middleware' =>
}); });
Route::group(['prefix' => 'Dou', 'namespace' => 'Dou'], function () { Route::group(['prefix' => 'Dou', 'namespace' => 'Dou'], function () {
Route::any('MyTest/test', 'MyTestController@test'); //测试入口 Route::any('MyTest/test', 'MyTestController@test'); //测试入口
Route::any('MyTest/dataApi', 'MyTestController@dataApi'); //测试入口
Route::any('MyTest/getJdToken', 'MyTestController@getJdToken'); //测试入口
}); });
// 移动端网页功能 // 移动端网页功能
Route::namespace('Api')->group(function () { Route::namespace('Api')->group(function () {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论