Skip to content

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

edit

上级 be5f98ed
显示空白字符变更
内嵌 并排
正在显示 包含 48 行增加 和 15 行删除
app/Http/Controllers/DataSyn/JdBoundController.php
浏览文件 @ e815001f
......@@ -112,30 +112,40 @@ class JdBoundController extends BaseController
*/
public function editBound(Request $request){
$input = $request->only('id','goods_id','sku_id');
$checkKey = CommonService::checkKey(['id','goods_id','sku_id'],$input);
$input = $request->only('id','goods_id','sku_id','pt_id');
$checkKey = CommonService::checkKey(['id','goods_id','sku_id','pt_id'],$input);
if($checkKey['code']!=1){
return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
}
$is_long = (int)$request->input('is_long',1);
$id = (int)$request->input('id',0);
$ext = JdBoundService::getInfoBy('id', $id,['id']);
$ext = JdBoundService::getInfoBy('id', $id);
if(!$ext){
return $this->error('无此数据', ErrorInc::FAILED_PARAM, []);exit;
}
$sku_id = (int)$request->input('sku_id',0);
$goods_id = (int)$request->input('goods_id');
if($goods_id>0 && $id > 0 && $sku_id > 0){
$pt_id = (int)$request->input('pt_id',0);
$content = '';
if($goods_id>0 && $id > 0 && $sku_id > 0 && $pt_id > 0){
if($pt_id!=$ext['pt_id']){
$content = $ext['pt_id'].'->'.$pt_id.';';
}
$good_name = $request->input('goods_name');
if($good_name!=$ext['goods_name']){
$content = $ext['goods_name'].'->'.$good_name.';';
}
$good_id = PjGoods::where(["pg_id"=>$goods_id])->value('pg_id');
if($good_id){
$poss['pt_id'] = $pt_id;
$poss['goods_id'] = $good_id;
$poss['goods_name'] = $good_name;
$poss['is_long'] = $is_long;
$res = JdBound::where("id",$id)->update($poss);
if($res){
$this->insertingLog('编辑，','','商品sku：'.$sku_id,'京东商品绑定',$request->ip(), $request->get('session_token')['admin_acc']);//日志
$this->insertingLog('编辑，','','商品sku：['.$sku_id.']'.$content,'京东商品绑定',$request->ip(), $request->get('session_token')['admin_acc']);//日志
return $this->success('编辑成功'); exit;
}else{
return $this->error('编辑失败', ErrorInc::DATA_EMPTY);exit;
......
app/Http/Controllers/Orders/AotuorderController.php
浏览文件 @ e815001f
......@@ -277,9 +277,10 @@ class AotuorderController extends BaseController
}
}
if($min){
array_multisort($minbl, SORT_NUMERIC ,SORT_ASC,$lasttime, SORT_NUMERIC ,SORT_ASC,$minnum, SORT_NUMERIC ,SORT_DESC, $min);
array_multisort($minbl, SORT_NUMERIC ,SORT_ASC,$minnum, SORT_NUMERIC ,SORT_DESC,$lasttime, SORT_NUMERIC ,SORT_ASC, $min);
$datas=$this->addWorkOrder($order,$sys_num,$min[0]['bs_serid'],$order['new_customer_id'],$min[0]['bs_id'],$goodid,$admin_acc,$admin_id);
$this->insertingLog("系统派单，",$sys_num,"订单in".$datas['msg'],"订单管理",$ip,$admin_acc);//日志
$ser_id = $min[0]['bs_serid'];
$this->insertingLog("系统派单，",$sys_num,"订单in".$datas['msg'].":(".$ser_id.")","订单管理",$ip,$admin_acc);//日志
}else{
foreach( $ser as $ks1 => $vs1 ){
if($vs1['admin_groupnew']==2) {
......@@ -296,7 +297,8 @@ class AotuorderController extends BaseController
if($sati){
array_multisort($satibl, SORT_NUMERIC ,SORT_ASC,$satisfa, SORT_NUMERIC ,SORT_DESC, $sati);
$datas=$this->addWorkOrder($order,$sys_num,$sati[0]['bs_serid'],$order['new_customer_id'],$sati[0]['bs_id'],$goodid,$admin_acc,$admin_id);
$this->insertingLog("系统派单，",$sys_num,"订单sa".$datas['msg'],"订单管理",$ip,$admin_acc);//日志
$ser_id = $sati[0]['bs_serid'];
$this->insertingLog("系统派单，",$sys_num,"订单sa".$datas['msg'].":(".$ser_id.")","订单管理",$ip,$admin_acc);//日志
}else{
foreach( $ser as $ks2 => $vs2 ){
if($vs2['admin_groupnew']==2) {
......@@ -312,7 +314,8 @@ class AotuorderController extends BaseController
if($max){
array_multisort($maxbl, SORT_NUMERIC ,SORT_ASC,$maxnum, SORT_NUMERIC ,SORT_DESC, $max);
$datas=$this->addWorkOrder($order,$sys_num,$max[0]['bs_serid'],$order['new_customer_id'],$max[0]['bs_id'],$goodid,$admin_acc,$admin_id);
$this->insertingLog("系统派单，",$sys_num,"订单ax".$datas['msg'],"订单管理",$ip,$admin_acc);//日志
$ser_id = $max[0]['bs_serid'];
$this->insertingLog("系统派单，",$sys_num,"订单ax".$datas['msg'].":(".$ser_id.")","订单管理",$ip,$admin_acc);//日志
}else{
$fla = 1;
foreach( $ser as $ks3 => $vs3 ){
......@@ -334,11 +337,13 @@ class AotuorderController extends BaseController
if($fla == 2) {
array_multisort($maxsnum, SORT_NUMERIC, SORT_ASC, $maxsmax, SORT_NUMERIC, SORT_DESC, $maxs);
$datas = $this->addWorkOrder($order, $sys_num, $maxs[0]['bs_serid'], $order['new_customer_id'], $maxs[0]['bs_id'], $goodid, $admin_acc, $admin_id);
$ser_id = $maxs[0]['bs_serid'];
}else{
array_multisort($maxs4num, SORT_NUMERIC, SORT_ASC, $maxs4max, SORT_NUMERIC, SORT_DESC, $maxs4);
$datas = $this->addWorkOrder($order, $sys_num, $maxs4[0]['bs_serid'], $order['new_customer_id'], $maxs4[0]['bs_id'], $goodid, $admin_acc, $admin_id);
$ser_id = $maxs4[0]['bs_serid'];
}
$this->insertingLog("系统派单，",$sys_num,"订单p".$datas['msg'],"订单管理",$ip,$admin_acc);//日志
$this->insertingLog("系统派单，",$sys_num,"订单p".$datas['msg'].":(".$ser_id.")","订单管理",$ip,$admin_acc);//日志
}
}
}
......
app/Http/Controllers/Service/ServiceProviderController.php
浏览文件 @ e815001f
......@@ -1051,10 +1051,6 @@ class ServiceProviderController extends BaseController
$post['admin_name'] = $request->input('admin_name');//姓名
$post['admin_acc'] = $request->input('admin_acc');
if ($request->filled('admin_password')) {
$post['admin_password'] = md5($request->input('admin_password'));
$poss['back_pass'] = $request->input('admin_password');
}
if ($request->input('is_lidao') == 1) {
$post['owner'] = '2';
......
app/Services/Api/MobileWeb/OrderListService.php
浏览文件 @ e815001f
......@@ -119,7 +119,16 @@ class OrderListService extends Model
$installLine = CommonService::dataToArray($installLine);
$installLine = CommonService::jointArrayKey($installLine, 'line_serm');
}
$labName = self::getLabName(true);
foreach ($list_items as $key => $value) {
if(in_array($value['p_id'],[50,60,26])){
$list_items[$key]['labName'] = $labName[1]??'';
}else{
$list_items[$key]['labName'] = '';
}
if($list_items[$key]['labName'] !=''){
$list_items[$key]['labName'] = "!!".$list_items[$key]['labName'];
}
$list_items[$key]['stauasName'] = $getStauasName[$value['stauas']]['name'];
//派单公司
if (isset($company_data[$value['company_id']])) {
......@@ -1660,6 +1669,20 @@ class OrderListService extends Model
}
return $stauasName;
}
/**|---------------------------------------------------------------------------------
* @name 订单标签属性
* @param string $type
* @retrun /multitype:array
* @author dou 2024/9/10 10:51
* |---------------------------------------------------------------------------------
*/
public static function getLabName ( $type = false ){
$tLabName = [['type'=>'1','name'=>'秒送'],['type'=>'2','name'=>'闪购'],['type'=>'3','name'=>'急单'],['type'=>'4','name'=>'催单']];
if($type){
$tLabName = array_column($tLabName, 'name', 'type');
}
return $tLabName;
}
/**|---------------------------------------------------------------------------------
* @name 根据公司判定图片名称
* @param string $company_id 公司id
......
app/Services/OrderService.php
浏览文件 @ e815001f
......@@ -1976,7 +1976,6 @@ class OrderService extends Service
->select('admin.id','admin_infor.inf_company_name as company_name','is_lidao','owner','children_id','admin_infor.inf_ad_brand as ad_brand','ad_project','brand_service', 'admin_infor.inf_company_id as company_id','admin_infor.inf_mouth_pay as mouth_pay')
->orderBy('is_sord','DESC')
->get()->toArray();
$list = AdminsService::getAdmins(['id'=>$input['service_id'],'company_id'=>$session['company_id'],'company_type'=>1],['id','company_name','is_lidao','owner','children_id','ad_brand','ad_project','brand_service'],['is_sord'=>'DESC']);
if($list){
foreach( $list as $kri => $vri ){
$ad_brand = array_intersect(explode(',',trim($vri['ad_brand'],',')),$gs_bid);//统计匹配订单商品品牌量
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论