edit

28788afa · 窦斌 · e73e0638 · 28788afa · 28788afa · 28788afa
--- a/app/ExcelTemp/ExcelTemp.php
+++ b/app/ExcelTemp/ExcelTemp.php
@@ -446,6 +446,8 @@ trait ExcelTemp
                ['field_name' => '服务商属性', 'field_value' => 'brand_service'], // 2022-6-22 new add dou
              //  ['field_name' => '厂家商品名称', 'field_value' => 'com_good'], // 2022-8-10 new add dou
                ['field_name' => '反馈时间', 'field_value' => 'feeds_time'],//2022-4-7
+                ['field_name' => '安装人', 'field_value' => 'intall_person'],//2022-4-7
+                ['field_name' => '工单状态', 'field_value' => 'stauas_name'],//2022-4-7
            ],
@@ -512,6 +514,7 @@ trait ExcelTemp
                ['field_name' => '年', 'field_value' => 'creact_year'],
                ['field_name' => '月', 'field_value' => 'creact_mouth'],
                ['field_name' => '日', 'field_value' => 'creact_day'],
+                ['field_name' => '技师姓名', 'field_value' => 'intall_person'],
            ],
            'ptthree' => [

--- a/app/Http/Controllers/Api/JdOrderApiController.php
+++ b/app/Http/Controllers/Api/JdOrderApiController.php
@@ -23,10 +23,10 @@ class JdOrderApiController extends BaseController
     * @Time: 10:53
     */
    public function getOrderByJd( ){
-        $startDate = date("Y-m-d H:i:s",strtotime(" -6 minute".date("Y-m-d H:i:s")));
+        $startDate = date("Y-m-d H:i:s",strtotime(" -60 minute".date("Y-m-d H:i:s")));
        $endDate = date("Y-m-d H:i:s");
        $url_mobile = "http://116.196.75.172/index.php/GetOrder/getmobilelist";//出库
-        $url = "http://116.196.75.172/index.php/SaasApiGetOrder/omnicOrderList?startDate=".$startDate."&endDate=".$endDate."&status=300";
+        $url = "http://116.196.75.172/index.php/SaasApiGetOrder/omnicOrderList?startDate=".$startDate."&endDate=".$endDate."&status=300&pageSize=30";
        $token = DB::table('jdpop_token')->where('status',1)->where('type',2)->select('app_key','app_secret','access_token','pt_id','auth_key')->get()->toarray();
        foreach($token as $k => $vs) {
            $appKey = $vs['app_key'];
@@ -62,7 +62,7 @@ class JdOrderApiController extends BaseController
                            $poss['accessToken'] = $accessToken;
                            $poss['appSecret'] = $appSecret;
                            $poss['orderInfos'] = json_encode($orderInfos);
-                            $user_data=CommonService::requestPost('http://zptzchat.bluearp.com/m/index.php/GetUserDataApi/getOaidDecrypt',$poss);
+                            $user_data=CommonService::requestPost('http://116.196.75.172/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'];
@@ -107,7 +107,7 @@ class JdOrderApiController extends BaseController
                                $exsit = Orders::where('order_num', $vvv['orderInfo']['salesChannelOrderId'])->value('id');
                                //存订单
                                $eisit_jd = DB::table('jd_proprietary')->where('order_id', $vvv['orderInfo']['salesChannelOrderId'])->value('id');
-                                if ($exsit || !$eisit_jd) {
+                                if (!$exsit) {
                                    $resjdgoods = DB::table('jdgoods')->where("order_id", $vvv['orderInfo']['salesChannelOrderId'])->value('id');
                                    $sys_num = 'L' . date("YmdHis") . str_pad(rand(0, 999), 3, '0', STR_PAD_LEFT);
                                    foreach ($vvv['orderDetailList'] as $k => $v) {

--- a/app/Http/Controllers/Api/MobileWeb/OrderListController.php
+++ b/app/Http/Controllers/Api/MobileWeb/OrderListController.php
@@ -2,6 +2,7 @@
 namespace App\Http\Controllers\Api\MobileWeb;
+use App\Services\CommonService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Validators\Api\MobileWeb\OrderListValidator;
@@ -62,7 +63,9 @@ class OrderListController extends Controller
        if ($error_message) {
            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
        }
+        if(!$request->filled('remarks') && !$request->filled('setmoney_type')){
+            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>'请输入拒单备注', 'Data'=>[]]);
+        }
        $return_data = OrderListService::refuse($request->all(),$request->ip());
        return response()->json($return_data);
    }
@@ -284,4 +287,16 @@ class OrderListController extends Controller
        $return_data = OrderListService::sendAgain($request->all(),$request->ip());
        return response()->json($return_data);
    }
+    /**|---------------------------------------------------------------------------------
+     * @name 拒单（获取标签）
+     * @param string ju_ordernum 订单单号
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2025/10/11 16:41
+     * |---------------------------------------------------------------------------------
+    */
+    public function labtype (Request $request)
+    {
+        $return_data = OrderListService::labtype($request->all());
+        return response()->json($return_data);
+    }
 }
--- a/app/Http/Controllers/Api/OrdersTmController.php
+++ b/app/Http/Controllers/Api/OrdersTmController.php
+<?php
+namespace App\Http\Controllers\Api;
+//use BlueCity\Data\Service\GoodsDataService;
+use App\Http\Controllers\BaseController;
+use App\Inc\OrderInc;
+use App\Models\Orders;
+use App\Models\SendGoods;
+use App\Models\SubmitPlease;
+use App\Models\User;
+use App\Services\ActionLogService;
+use App\Services\AftersaleOrderService;
+use App\Services\AfterSaleService;
+use App\Services\CommonService;
+use App\Services\GoodsService;
+use App\Services\InterFaceService;
+use App\Services\LabtypeService;
+use App\Services\OrderService;
+use App\Services\OrderaddService;
+use App\Services\PlatformService;
+use App\Services\RecycleOrderService;
+use App\Services\RefundService;
+use App\Services\SendGoodsService;
+use App\Services\SubmitPleaseService;
+use App\Services\UserService;
+//use BlueCity\Core\Controllers\MountingCoreController as Controller;
+use BlueCity\Core\Inc\ErrorInc;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use DB;
+use Validator;
+use PhpParser\Node\Stmt\Foreach_;
+class OrdersTmController extends BaseController
+{
+    /**
+     * @api {post} /api/interface/order/store 订单新增
+     * @apiGroup 第三方订单接口
+     * @apiName 订单新增
+     * @apiVersion 1.0.0
+     *
+     * @apiDescription 订单新增，如果已经存在则更新订单信息为最新数据
+     *
+     * @apiParam {String}   order_no 订单系统编号
+     * @apiParam {array}   goods     订单商品
+     *
+     * @apiSuccess {Number} error    状态码，0：请求成功
+     * @apiSuccess {String} msg   提示信息
+     * @apiSuccess {Object} data    返回数据
+     *
+     * @apiSuccessExample {json} Success-Response:
+     * {"code":0,"message":"","data":[]}
+     *
+     * @apiErrorExample {json} Error-Response:
+     * {"code":5001,"message":"接口异常"}
+     *
+     */
+    public function store(Request $request)
+    {
+        //先看是不是存在
+        $orderNO = $request->input('order_no');
+        if (empty($orderNO)) {
+            $json = file_get_contents("php://input");
+            $post = json_decode($json,true);
+            if(empty($post['order_no'])) {
+                return $this->error('订单编号不能为空', ErrorInc::INVALID_PARAM);
+            }else{
+                $orderNO = $post['order_no'];
+                $request->merge($post);
+            }
+        }
+//        $Validator = InterFaceService::validateOrderStore($request->all());
+        $rules = [
+            'goods' => 'required|',
+            'shr_name' => 'required|',
+            'shr_phone' => 'required',
+            'shr_sheng' => 'required',
+            'shr_shi' => 'required',
+            'shr_adress' => 'required',
+            'ware_id' => 'required',
+            'pt_type' => 'required',
+        ];
+        $message = [
+            'goods.required' => "请选择商品",
+            'shr_name.required' => "收件人不能为空",
+            'shr_phone.required' => "联系电话不能为空",
+            'shr_sheng.required' => "请选择省",
+            'shr_shi.required' => "请选择市",
+            'shr_adress.required' => "详细地址不能为空",
+            'ware_id.required' => '库房不能为空',
+            'pt_type.required' => "平台id类型必填",
+        ];
+        $inputs= $request->all();
+        CommonService::addLog('库房添加订单', json_encode($inputs), '','warehouse-Tmadd');
+        $Validator = Validator::make ( $inputs, $rules, $message );
+        if ($Validator->fails ()) {
+            $reeor = CommonService::validatorToString($Validator);
+            return $this->error ( $reeor, ErrorInc::INVALID_PARAM,[]);
+        }
+        $db = new SendGoods();
+        $warehouse_num['warehouse_num_rlike'] = $orderNO.'-';
+        $warehouse_num['warehouse_num'] = $orderNO;
+        $pid = CommonService::getMysqlData($db, ['warehouse_num_searchor'=>$warehouse_num,'data_source'=>1],['id'],[],'value');
+        if($pid){
+            return $this->error ( '补货商品无需添加服务单', ErrorInc::REPEAT_SUBMIT,[]);
+        }
+        $order = OrderService::getOrderByOrderNumber($orderNO);
+//        if ($order) {
+//            return $this->error('该订单已存在', ErrorInc::DATA_EXIST);
+//        } else {
+            $sendgood = 1;
+            DB::beginTransaction(); //开启事务
+            $orders = new Orders();
+            $rea = CommonService::getMysqlData($orders, ['order_num'=>$orderNO],['id','order_status'],['id'=>'DESC'],'first');
+            if($rea && $rea['order_status'] == 50){
+                $ordernum = $orderNO.'-ZF'.$rea['id'];
+                $raa = Orders::where('id',$rea['id'])->where('order_status','50')->update(['order_num'=>$ordernum,'is_delete'=>1]);
+                if(!$raa){
+                    DB::rollback();
+                    return $this->error( '单号变更失败', ErrorInc::MYSQL_FAILED);
+                }
+                $sendid = SendGoodsService::getSendGoodBy(['warehouse_num'=>$orderNO,'data_source'=>2,'reject'=>1], ['id'],'first');
+                if($sendid){
+                    $res = SendGoods::where('id',$sendid)->update(['reject'=>2]);
+                    if(!$res){
+                        $sendgood = 2;
+                    }
+                }
+            }elseif ($rea && $rea['order_status'] != 50){
+                return $this->error('该订单已存在', ErrorInc::DATA_EXIST);
+            }
+            $input = [];
+            ////先把订单数据整理下
+            $input['order_num'] = $orderNO;
+            $input['skb_bh'] = $orderNO;
+            $input['sys_bh'] = CommonService::creactSysNum(3);
+            $input['pay_type'] = 1;
+            $input['order_status'] = OrderInc::STATE_AVAILABLE;
+            $input['car_audit'] = 2;
+            //用户信息处理
+            $input['shr_name'] = $request->input('shr_name');
+            $input['shr_phone'] = $request->input('shr_phone');
+            $input['shr_sheng'] = $request->input('shr_sheng');
+            $input['shr_shi'] = $request->input('shr_shi');
+            $input['shr_xian'] = $request->input('shr_xian');
+            $input['shr_adress'] = $request->input('shr_adress');
+            $input['shr_other'] = $request->input('shr_other');
+            //然后整理商品数据
+            $goods = $request->input('goods');
+            if (empty($goods)) {
+                return $this->error('商品数据不能为空', ErrorInc::INVALID_PARAM);
+            }
+            $goods_name = '';
+            $goodsData = [];
+            $goods_id = '0';
+            $warehouse_good = [];
+            foreach ($goods as $key => $value) {
+                if(in_array($value['sku_id'], ['953857604052','953287477741'])){
+                    //猫超卡跳过添加
+                    continue;
+                }
+                if (empty($value['goods_id']) || empty($value['goods_num']) || !isset($value['goods_price'])) {
+                    return $this->error(' 商品信息格式错误', ErrorInc::INVALID_PARAM);
+                }
+                $goodsID = $value['goods_id'];//智配传来的是code码
+                $goodsNum = $value['goods_num'];
+                $goodsPrice = $value['goods_price'];
+                if(isset($value['sku_id']) && $value['sku_id']!=''){
+                    $goodss = GoodsService::getGoodsByCode($value['sku_id'],'',3);//这个函数需要完善下
+                    if($value['sku_id']!=$value['goods_id'] && empty($goodss)){
+                        $goodss = GoodsService::getGoodsByCode($value['goods_id'],'',3);//这个函数需要完善下
+                    }
+                    $inputs['p_id'] = $goodss['pt_id'];
+                }else {
+                    $goodss = GoodsService::getGoodsByCode($goodsID,1);//这个函数需要完善下
+                }
+                if (empty($goodss)) {
+                    return $this->error($goodsID . ' 编码的商品无法找到', ErrorInc::INVALID_PARAM);
+                }
+                if ($goodsNum == 0) {
+                    return $this->error($goodss['pg_name'] . '商品的数量不能为0', ErrorInc::INVALID_PARAM);
+                }
+//                if($value['goods_name']!=''){
+//                    $goodss['good_name'] = $value['goods_name'];
+//                }
+                $goods_id = $goodss['goods_id'];
+                $goodsData[] = [
+                    'goods_brand' => $goodss['brand_name'],
+                    'goods_name' => $goodss['good_name'],
+                    'goods_number' => $goodsID,
+                    'goods_num' => $goodsNum,
+                    'msg_id' => 0,
+                    'goods_id' => $goodss['goods_id'],
+                    'cd_id' => $goodss['cd_id'],//默认是
+                    'goods_price' => $goodsPrice
+                ];
+                $warehouse_good[] = [
+                    'wg_ordernum' => $orderNO,
+                    'wg_goodid' => $goods_id,
+                    'wg_goodname' => $goodss['good_name'],
+                    'wg_goodnum' => $goodsNum,
+                    'wg_goodprice' => $goodsPrice,
+                    'wg_creactime' => date("Y-m-d H:i:s")
+                ];
+            }
+            if($inputs['pt_type'] == 2) {
+                $pt_id = PlatformService::getPtBy('id', $inputs['p_id'], ['id', 'company_id'], 'first');
+            }else{
+                $pt_id = PlatformService::getPtBy('zp_id', $inputs['p_id'], ['id', 'company_id'], 'first');
+            }
+            if (!$pt_id) {
+                return $this->error('系统异常', ErrorInc::SERVER_FAILED);
+            }
+            DB::table("warehouse_good")->insert($warehouse_good);
+            $input['goods'] = $goodsData;
+            //订单数据
+            $input['pt_id'] = $pt_id['id'];
+            $input['ware_id'] = $request->input('ware_id')??4;
+            $input['company_id'] = $pt_id['company_id'];
+//            $sj_value = $request->input('new_money');
+            $input['new_money'] = $request->input('new_money');
+            $input['ser_type'] = $request->input('ser_type') ?? 3;//智配没给
+            $input['order_type'] = 1;
+            $input['customer_time'] = $request->input('customer_time');//智配没给
+            $input['ser_type'] = 1;
+            $orderjoin_data["goods_id"] = $goods_id;
+            $orderjoin_data["o_sysbh"] = $input['sys_bh'];
+            $orderjoin_data["o_skbnum"] = $orderNO;
+            $orderjoin_data["sys_bh"] = $input['sys_bh'];
+            $orderjoin_data["skb_bh"] = $request->input('primary_num');
+            $orderjoin_data["goods_num"] = 1;
+            $orderjoin_data["edit_time"] = date("Y-m-d H:i:s");
+            $orderjoin_data["is_jdservice"] = 1;
+            $joingoods = DB::table("orders_joingoods")->insert($orderjoin_data);
+            if(!$joingoods){
+                DB::rollback();
+                return $this->error( '记录添加失败', ErrorInc::MYSQL_FAILED);
+            }
+            $session = InterFaceService::getDefaultUser();//默认一个管理账号作为同步数据主账号
+            $result =  OrderaddService::addOrder($input, $session, '',2);
+            if ($result['ErrorCode'] == 1) {
+                if($request->filled('car_not')){
+                    $car_not = $request->input('car_not');
+                    if(is_array($car_not)){
+                        foreach($car_not as $k => $v){
+                            CommonService::accMe($input['sys_bh'], '客户车型', $v, '', 2, 7, '系统同步', 164);
+                        }
+                    }else{
+                        CommonService::accMe($input['sys_bh'], '客户车型', $car_not, '', 2, 7, '系统同步', 164);
+                    }
+                }
+                if($request->filled('order_not')){
+                    $order_not = $request->input('order_not');
+                    foreach($order_not as $k => $v){
+                        if($v['note_type']=='车型备注'){
+                            $public = 2;
+                        }else{
+                            $public = 1;
+                        }
+                        if($v['note_content']!='' && $v['note_content']!=null) {
+                            CommonService::accMe($input['sys_bh'], $v['note_type'], $v['note_content'], '', $public, 7, $v['note_name'], 164);
+                        }
+                    }
+                }
+                $data['send_num'] = 'F'.uniqid();
+                $data['warehouse_num'] = $orderNO;
+                $data['send_type'] = 2;
+                $data['sys_num']= $input['sys_bh'];
+                $data['order_num']= $orderNO;
+                $data['stores'] = $input['ware_id'];//库房id需要智配提供
+                $data['receiving_store'] =0;
+                $data['user']= '系统同步';
+                $data['telephone'] = $input['shr_phone'];
+                $data['collect_type'] = 2;
+                $data['expect_time'] = '';
+                $data['name'] = $input['shr_name'];
+                $data['category'] = 1;
+                $data['create_id'] = 164;
+                $data['create_name'] = 'erp同步';
+                $address = '';
+                if($input['shr_sheng'] && $input['shr_shi'] && $input['shr_xian']){
+                    $address .= $input['shr_sheng'];
+                    $address .= $input['shr_shi'];
+                    $address .= $input['shr_xian'];
+                }
+                $address .= $request->input('shr_adress');
+                $data['address'] = $address;
+                $data['data_source'] = 2;
+                if($sendgood ==1) {
+                    $res1 = true;//SendGoodsService::createData($data, $input['goods']);
+                }else{
+                    $res1 = true;
+                }
+                if(!$res1){
+                    DB::rollback();
+                    return $this->error( ' 记录发货单异常', ErrorInc::MYSQL_FAILED);
+                }
+                DB::commit();
+                return $this->success('订单新增成功');
+            } else {
+                DB::rollback();
+                return $this->error($result['ErrorMessage'], $result['ErrorCode']);
+            }
+//        }
+    }
+    /**
+     * @name 退款
+     * @param Request $request
+     * @return mixed
+     * @author du
+     * @date 2022/1/11
+     */
+    public function refundGoods(Request $request){
+        $input = $request->all();
+        $checkKey = CommonService::checkKey(['tid'],$input);
+        if($checkKey['code']!=1){
+            return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
+        }
+            $flag = 1;
+            $refundlist = RefundService::getInfoByKeyValue('order_num', $input['tid'], ['state', 'roPreNo']);
+            if ($refundlist) {
+                return $this->error('已存在退款', '2003');exit;
+                $flag = 2;
+            }
+            if ($flag == 1) {
+                $refund['order_num'] = $input['tid'];
+                $refund['refund'] = 1;
+                $reason = $input['reason']??'';
+                $refund['content'] = '平台订单已撤销'.$reason;
+                $refund['urgent'] = 1;
+                $refund['recycle_type'] = 0;
+                $refund['roPreNo'] = $input['tid'];
+                $sys_num = OrderService::getOrderBy('order_num', $input['tid'], ['sys_num', 'order_status', 'new_money']);
+                if ($sys_num) {
+                    $refund['sys_num'] = $sys_num['sys_num'];
+                    $msg = OrderService::getOrderMsg($sys_num['sys_num']);
+                    if ($msg['orderMsgArr']) {
+                        $msg = $msg['orderMsgArr'];
+                        $goodsArr = [];
+                        foreach ($msg as $ka => $va) {
+                            $goodsArr[$ka]['goods_name'] = $va['goods_name'];
+                            $goodsArr[$ka]['goods_price'] = $va['goods_price'];
+                            $goodsArr[$ka]['msg_id'] = $va['id'];
+                            $goodsArr[$ka]['goods_num'] = $va['goods_num'];
+                            $goodsArr[$ka]['goods_id'] = $va['goods_id'];
+                        }
+                        $refund['goodsArr'] = $goodsArr;
+                        $refund['goods_state'] = 2;
+                        $refund['info_ing'] = '';
+                        $refund['info_acc'] = '';
+                        $refund['info_name'] = '';
+                        $refund['addType'] = 'tmRefund';
+                        $refund['allprice'] = $sys_num['new_money'];
+                        $session['id'] = '164';
+                        $session['admin_acc'] = '系统操作';
+                        $session['admin_groupnew'] = 7;
+                        $rea = OrderService::lockOrder($refund, $session, '39.105.188.64');
+                        return $this->error($rea['ErrorMessage'], $rea['ErrorCode']);exit;
+                    } else {
+                        return $this->error('无订单商品', '2001');exit;
+                    }
+                } else {
+                    return $this->error('无订单号', '2002');exit;
+                }
+            }
+    }
+    /**
+     * @name 检查token
+     * @param $time
+     * @param $signature
+     * @return mixed
+     * @author du
+     * @date 2022/1/6
+     */
+    public function checkedToken($time,$signature){
+        if (empty($time) || empty($signature)) {
+            return $this->error('time或 signature 不能为空', ErrorInc::INVALID_PARAM);
+        }
+        //校验token
+        $token = md5($time.'97e11cbcc29cbd8a538395abce85d569');
+        if($signature !== $token){
+            return $this->error('秘钥错误', ErrorInc::INVALID_PARAM);
+        }else{
+            return $this->success('成功');
+        }
+    }
+}
--- a/app/Http/Controllers/Api/SynJdPopDataController.php
+++ b/app/Http/Controllers/Api/SynJdPopDataController.php
@@ -85,7 +85,7 @@ class SynJdPopDataController extends BaseController
                        $poss['orderType'] = 'POP';
                        $poss['appName'] = $v['appName'];
                        $poss['orderInfos'] = json_encode($orderInfos);
-                        $user_data=$this->https_request('http://zptzchat.bluearp.com/m/index.php/GetUserDataApi/getOaidDecrypt',$poss);
+                        $user_data=$this->https_request('http://116.196.75.172/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'];
@@ -289,7 +289,7 @@ class SynJdPopDataController extends BaseController
                                //   $session = $request->get('session_token');//获取操作人信息
                                $session['admin_groupnew'] = 7;
                                $session['admin_acc'] = '系统录入';
-                                $session['id'] = 1133;
+                                $session['id'] = 164;
                                $session['company_id'] = $company_id;
                                // dump($orders[$kk]);
                                $return = OrderaddService::addOrder($orders[$kk], $session, $ip);

--- a/app/Http/Controllers/Api/SynJdPurchaseController.php
+++ b/app/Http/Controllers/Api/SynJdPurchaseController.php
@@ -97,7 +97,7 @@ class SynJdPurchaseController extends BaseController
                $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=$this->https_request('http://116.196.75.172/index.php/GetUserDataApi/getOaidDecrypt',$poss);
                CommonService::addLog('token1--'.$v['pt_id'], json_encode($poss).'-获取脱敏信息失败'.json_encode($user_data), $v['pt_id'],'JdPurchase-getOaidDecrypt');
                $user_data = json_decode($user_data,true);
                if($user_data['jingdong_jos_order_oaid_decrypt_responce']['returnType']['code']==200){

--- a/app/Http/Controllers/Api/SynJdSelfDataNewController.php
+++ b/app/Http/Controllers/Api/SynJdSelfDataNewController.php
@@ -90,7 +90,7 @@ class SynJdSelfDataNewController extends BaseController
                $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=$this->https_request('http://116.196.75.172/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'];

--- a/app/Http/Controllers/DatasBase/BservissController.php
+++ b/app/Http/Controllers/DatasBase/BservissController.php
@@ -574,13 +574,16 @@ class BservissController extends BaseController
            $listArr = [];
            $vv = 0;
            $add_type = $request->input('add_type')??2;
-            foreach ($list as $k=>$v){
+            try {
-                foreach ($v['brand_data'] as $ks=>$vs){
+                DB::beginTransaction(); //开启事务
-                    if($add_type==1) {
+                foreach ($list as $k => $v) {
+                    foreach ($v['brand_data'] as $ks => $vs) {
+                        if ($add_type == 1) {
+                            DB::table('bservisnew')->whereIn('bs_sid',$vs['areachech'])->where('bs_serid',$v['admin_id'])->where('bs_branid',$vs['bs_branid'])->delete();
                            foreach ($vs['areachech'] as $ka => $va) {
                                $listArr[$vv]['bs_serid'] = $v['admin_id'];
                                $are_xid = DB::table('disareanew')->where('are_sid', $va)->where('are_state', 1)->pluck('are_id');//
-                            if($are_xid) {
+                                if ($are_xid) {
                                    $are_xid = CommonService::dataToArray($are_xid);
                                    $listArr[$vv]['bs_areid'] = implode(',', $are_xid);
                                    $listArr[$vv]['bs_sid'] = $va;
@@ -591,11 +594,13 @@ class BservissController extends BaseController
                                    $listArr[$vv]['bs_creactime'] = date('Y-m-d H:i:s');
                                    $listArr[$vv]['bs_creactid'] = $request->get('session_token')['admin_name'];
                                    $vv++;
-                            }else{
+                                } else {
-                                return $this->error('数据异常', ErrorInc::MYSQL_FAILED,$va);exit;
+                                    DB::rollback();
+                                    return $this->error('数据异常', ErrorInc::MYSQL_FAILED, $va);
+                                    exit;
                                }
                            }
-                    }elseif ($add_type==2) {
+                        } elseif ($add_type == 2) {
                            $listArr[$vv]['bs_serid'] = $v['admin_id'];
                            $listArr[$vv]['bs_areid'] = implode(',', $vs['areachech']);
                            $listArr[$vv]['bs_sid'] = $request->input('are_sid');
@@ -606,20 +611,32 @@ class BservissController extends BaseController
                            $listArr[$vv]['bs_creactime'] = date('Y-m-d H:i:s');
                            $listArr[$vv]['bs_creactid'] = $request->get('session_token')['admin_name'];
                            $vv++;
-                    }else{
+                        } else {
-                        return $this->error('添加类型错误', ErrorInc::BUSINESS_FORBID);exit;
+                            DB::rollback();
+                            return $this->error('添加类型错误', ErrorInc::BUSINESS_FORBID);
+                            exit;
                        }
                    }
                }
-            if(empty($listArr)){
+                if (empty($listArr)) {
-                return $this->error('数据异常', ErrorInc::MYSQL_FAILED,$listArr);exit;
+                    DB::rollback();
+                    return $this->error('数据异常', ErrorInc::MYSQL_FAILED, $listArr);
+                    exit;
                }
                $res = DB::table('bservisnew')->insert($listArr);
-            if ($res){
+                if ($res) {
-                $this->insertingLog("添加","","添加绑定数据","绑定服务商",$request->ip(), $request->get('session_token')['admin_acc']);
+                    DB::commit();
-                return $this->success('添加成功');exit;
+                    $this->insertingLog("添加", "", "添加绑定数据", "绑定服务商", $request->ip(), $request->get('session_token')['admin_acc']);
-            }else{
+                    return $this->success('添加成功');
-                return $this->error('添加失败', ErrorInc::MYSQL_FAILED);exit;
+                    exit;
+                } else {
+                    DB::rollback();
+                    return $this->error('添加失败', ErrorInc::MYSQL_FAILED);
+                    exit;
+                }
+            }catch(\Exception $e){
+                DB::rollback();
+                return $this->error($e->getMessage(), ErrorInc::FAILED_PARAM);exit;
            }
        }else{
            return $this->error('参数错误', ErrorInc::FAILED_PARAM);

--- a/app/Http/Controllers/ExcelInfo/ExceloutController.php
+++ b/app/Http/Controllers/ExcelInfo/ExceloutController.php
@@ -107,7 +107,9 @@ class ExceloutController extends BaseController
            $file = $data['file'];
 			if($db){
 				$num1 = count($db);
+                if(!empty(array_intersect(['stauas_name'], $group))){
+                    $orderStau = OrderService::getOrderStatusName();//获取订单状态名
+                }
 				//list_id
                $list_ids = array_column($db, 'serial_number');
                $all_prices = SettlementList::whereIn('list_id',$list_ids)->pluck('all_price','list_id');
@@ -145,6 +147,8 @@ class ExceloutController extends BaseController
                                $rs[$k][strtolower(chr(65+$num))]  = $v['car_make'].$v['car_line'].$v['car_model'];
                            }elseif ($vg == 'admin_principal'){
                                $rs[$k][strtolower(chr(65+$num))]  = Admin::where('id',$v['ser_id'])->value('admin_name');
+                            }elseif ($vg == 'stauas_name'){
+                                $rs[$k][strtolower(chr(65+$num))]  = $orderStau[$v['stauas']]??'未定义';
                            }elseif ($vg == 'head_phone'){
                                $phone = isset($cinfo['phone'])??'';
                                $rs[$k][strtolower(chr(65+$num))]  = '`'.$phone;
@@ -2259,9 +2263,9 @@ public function performBserviStore($res,$con='BserviStore'){
                    $admin = Admin::whereIn('id',$ser_ids)->select('id','company_name','ad_alias')->get()->toarray();
                    $admin = CommonService::jointArrayKey($admin,'id');
                }
-                if(in_array('wam', $group) || in_array('feed_time', $group) || in_array('all_price', $group)){
+                if(!empty(array_intersect(['wam','feed_time','all_price','intall_person'], $group))){
                    $order_num = array_column($db, 'order_num');
-                    $sql = "SELECT feeds_time,wat_num,a.order_num,all_price FROM gone_order_list as a LEFT JOIN gone_settlement_list as b on a.serial_number = b.list_id where a.order_num in ('".implode("','", $order_num)."')";
+                    $sql = "SELECT feeds_time,wat_num,a.order_num,all_price,a.intall_person FROM gone_order_list as a LEFT JOIN gone_settlement_list as b on a.serial_number = b.list_id where a.order_num in ('".implode("','", $order_num)."')";
                    $settment = DB::select($sql);
                    $settment = CommonService::dataToArray($settment);
                    $settment = CommonService::jointArrayKey($settment, 'order_num');
@@ -2299,6 +2303,8 @@ public function performBserviStore($res,$con='BserviStore'){
                            $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['feeds_time'];
                        }elseif($vg == 'all_price'){
                            $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['all_price'];
+                        }elseif($vg == 'intall_person'){
+                            $rs[$k][strtolower(chr(65+$num))]  = $settment[$v['order_num']]['intall_person'];
                        }elseif($vg == 'creact_year'){
                            $rs[$k][strtolower(chr(65+$num))]  = $year;
                        }elseif($vg == 'creact_mouth'){

--- a/app/Http/Controllers/Orders/AotuorderController.php
+++ b/app/Http/Controllers/Orders/AotuorderController.php
@@ -23,13 +23,21 @@ class AotuorderController extends BaseController
        if($sys_nums!=''){
            $sys_num = $sys_nums;
            //判定是否为多品牌订单
-            $goods_brand = DB::table("order_msg")->where('sys_num',$sys_num)->select('goods_brand','goods_id')->groupBy("goods_brand")->get()->toArray();
+            $goods_brand = DB::table("order_msg")->where('sys_num',$sys_num)->select('goods_brand','goods_id','goods_num')->groupBy("goods_brand")->get()->toArray();
            if(count($goods_brand)>1){
                $content = '包含品牌大于一个('.count($goods_brand).');';
                $this->manual($sys_num);
                $this->insertingLog("系统派单，",$sys_num,$content,"订单管理",$ip,$admin_acc);//日志
                return true;
            }
+            $goods_num = array_column($goods_brand, 'goods_num');
+            $goods_num = array_sum($goods_num);
+            if($goods_num>=3){
+                $content = '包含数量大于3个('.$goods_num.');';
+                $this->manual($sys_num);
+                $this->insertingLog("系统派单，",$sys_num,$content,"订单管理",$ip,$admin_acc);//日志
+                return true;
+            }
            $order = DB::table("orders")->where('sys_num',$sys_num)->first();
            if(empty($order)){
                $this->insertingLog("系统派单，",$sys_num,'单号异常获取失败',"订单管理",$ip,$admin_acc);//日志
@@ -59,13 +67,13 @@ class AotuorderController extends BaseController
                }
            }
            $user = DB::table("user")->where('id',$order['new_customer_id'])->first();
-//            $user_phone = DB::table("user")->where('shr_name',$user['shr_name'])->where('shr_sheng',$user['shr_sheng'])->where('shr_shi',$user['shr_shi'])->where('shr_xian',$user['shr_xian'])->select('id')->first();
+            $user_phone = DB::table("user")->where('shr_name',$user['shr_name'])->where('shr_sheng',$user['shr_sheng'])->where('shr_shi',$user['shr_shi'])->where('shr_xian',$user['shr_xian'])->select('id')->first();
-//            $phone = array_column($user_phone,'id');
+            $phone = array_column($user_phone,'id');
-//            $order_num = DB::table("orders")->where('new_customer_id','in', implode(',',$phone))->count();
+            $order_num = DB::table("orders")->where('new_customer_id','in', implode(',',$phone))->where('create_time', '>', $time)->count();
-//            if($order_num>1){
+            if($order_num>1){
-//                $this->manual($sys_num);
+                $this->manual($sys_num);
-//                $this->insertingLog("系统派单，",$sys_num,'重复手机号暂停派单',"订单管理",$ip,$admin_acc);//日志
+                $this->insertingLog("系统派单，",$sys_num,'重复手机号暂停派单',"订单管理",$ip,$admin_acc);//日志
-//                return true;
+                return true;
 //                foreach( $user_phone as $k => $v )
 //                {
 //                    $phone[]=$v['id'];
@@ -93,7 +101,7 @@ class AotuorderController extends BaseController
 //                    $this->insertingLog("系统派单，",$sys_num,'重复手机号派单未匹配门店',"订单管理",$ip,$admin_acc);//日志
 //                    return true;
 //                }
-//            }
+            }
            $goodid=DB::table("goods_brand")->where('brand_name',$goods_brand[0]['goods_brand'])->value("id");
            if(strstr($user['shr_sheng'],"市")){
                //$sheng=rtrim($user['shr_sheng'],'市');

--- a/app/Http/Requests/Validators/Api/MobileWeb/OrderListValidator.php
+++ b/app/Http/Requests/Validators/Api/MobileWeb/OrderListValidator.php
@@ -117,7 +117,7 @@ class OrderListValidator extends FormRequest
            'stauas.integer' => '参数错误',
            'refuseType.required' => '未选择拒单方式',
            'refuseType.integer' => '参数错误',
-            'remarks.required' => '请输入拒单备注',
+//            'remarks.required' => '请输入拒单备注',
            'remarks.max' => '拒单备注长度超出限制',
        ];
@@ -126,7 +126,7 @@ class OrderListValidator extends FormRequest
            'id' => 'required|integer|min:1',
            'stauas' => 'required|integer|min:1',
            'refuseType' => 'required|integer|min:1',
-            'remarks' => 'required|string|max:255',
+            'remarks' => 'string|max:255',
        ], $messages);
        // 判断数据验证是否成功

--- a/app/Services/Api/MobileWeb/OrderListService.php
+++ b/app/Services/Api/MobileWeb/OrderListService.php
@@ -26,7 +26,13 @@ use App\Models\{Admin,
    SettlementMoney,
    SubmitPlease,
    User};
-use App\Services\{BmmcService, Api\OrderManage\OrdersVehicleService, CommonService, DealPicService, OrderService};
+use App\Services\{BmmcService,
+    Api\OrderManage\OrdersVehicleService,
+    CommonService,
+    DealPicService,
+    OrderService,
+    TicketListService,
+    UserService};
 use OSS\OssClient;
 use OSS\Core\OssException;
 class OrderListService extends Model
@@ -550,7 +556,6 @@ class OrderListService extends Model
        $orderListArr = OrderList::where('id',$request['id'])
            ->where('ser_id', $session['admin_id'])
            ->where('is_delete', 1)
-            ->select("order_num","sys_num","stauas","ser_id","p_id","ol_dispamount","serial_number")
            ->first();
        $returncount = OrderList::where('sys_num',$orderListArr['sys_num'])->select("serial_number")->get();
        $returncount = CommonService::dataToArray($returncount);
@@ -569,7 +574,12 @@ class OrderListService extends Model
        }
        $compamy_name = Admin::where('id',$orderListArr['ser_id'])->value('company_name');
        DB::beginTransaction(); //开启事务
-        $rest = CommonService::accMe($orderListArr['sys_num'], '派工单列表web', "拒单，（".$compamy_name."）".$request['remarks'], implode(',', $serial_number), 2, 2, $session['install_name'], $session['admin_id']);
+        if(isset($request['setmoney_type']) && !empty($request['setmoney_type'])) {
+            $remarks = $request['setmoney_name'].';'.$request['remarks'];
+        }else{
+            $remarks = $request['remarks'];
+        }
+        $rest = CommonService::accMe($orderListArr['sys_num'], '派工单列表web', "拒单，（".$compamy_name."）".$remarks, implode(',', $serial_number), 2, 2, $session['install_name'], $session['admin_id']);
        $resultOrderList = OrderList::where("sys_num",$orderListArr['sys_num'])->delete();
        if($orderListArr['stauas']==30){
            $settListArr = SettlementList::where("sys_num",$orderListArr['sys_num'])->where("sett_status",'>',1)->first();
@@ -585,6 +595,20 @@ class OrderListService extends Model
        $data['order_status']=10;
        $resultOrder = Orders::where("sys_num",$orderListArr['sys_num'])->update($data);
        if($resultOrderList && $rest && $resultsettList && $resultOrder){
+            if(isset($request['setmoney_type']) && !empty($request['setmoney_type'])) {
+                $labstate = SetmoneyType::where('sety_id', $request['setmoney_type'])->first();
+                if (strstr((string)$labstate['sety_price'], '-')) {
+                    $price = substr($labstate['sety_price'], 1);
+                } else {
+                    $price = $labstate['sety_price'];
+                }
+                if ($price > 0) {
+                    $user = UserService::getUserBy('id', $orderListArr['customer_id'], ['shr_name', 'shr_phone', 'shr_sheng', 'shr_shi', 'shr_xian', 'shr_adress']);
+                    $dress = $user['shr_sheng'] . " " . $user['shr_shi'] . " " . $user['shr_xian'] . " " . $user['shr_adress'];
+                    TicketListService::createTicket($orderListArr['order_num'], $orderListArr['serial_number'], '', '', $orderListArr['ser_id'], $price, 1, $labstate['sety_name'], $session['install_name'], '', 1, 1, '', '', $user['shr_name'], $user['shr_phone'], $dress, $orderListArr['company_id']);
+                }
+                \App\Services\OrderListService::creatAftersale($labstate['lt_type'], $orderListArr['order_num'], $orderListArr['serial_number'], 2, 20, 25, $request['setmoney_type'], $orderListArr['p_id'], $orderListArr['ser_id'], $request['remarks'], $session['install_name'], $session['install_name'], $orderListArr['company_id']);
+            }
            DB::commit();
            OrderTime::whereIn('serial_number',$serial_number)->delete();//删除工单操作时间
            SettlementMoney::where('sem_synum',$orderListArr['sys_num'])->delete();//金额信息接单后生成
@@ -1742,4 +1766,36 @@ class OrderListService extends Model
 //        $scoreq['orsc_type']=2;
 //        DB::table("order_score")->insert($score);
    }
+    /**|---------------------------------------------------------------------------------
+     * @name 拒单（获取标签）
+     * @param string ju_ordernum 订单单号
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2025/10/11 16:41
+     * |---------------------------------------------------------------------------------
+     */
+    public static function labtype ($request)
+    {
+        $session = $request['session'];
+        $db = DB::table('setmoney_type');
+        $params = ['lt_parent_id'=>25];
+        $select = ['sety_id','sety_name','lt_parent_id','lt_group'];
+        $list = CommonService::getMysqlData($db, $params,$select);
+        //$list = DB::table('setmoney_type')->where('lt_parent_id','25')->select('sety_id','sety_name','lt_parent_id','lt_group')->get()->toArray();
+        $group = $session['user_type'];//session('admin_group');
+        if($list){
+            $data = [];
+            foreach ($list as $key=>$val){
+                $arr = explode(',',$val['lt_group']);
+                if(in_array($group,$arr)){
+                    $data[] = $val;
+                }
+            }
+            return ['ErrorCode' => 1, 'ErrorMessage' => '操作成功', 'Data' => $data];
+        }else{
+            return ['ErrorCode' => ErrorInc::MYSQL_FAILED, 'ErrorMessage' => '暂无数据', 'Data' => []];
+        }
+    }
 }
--- a/app/Services/InterFaceService.php
+++ b/app/Services/InterFaceService.php
@@ -94,10 +94,10 @@ class InterFaceService
    public static function getDefaultUser()
    {
        $user = [];
-        $user['id'] = 1;
+        $user['id'] = 164;
        $user['admin_acc'] = '系统同步';
        $user['admin_name'] = '系统同步';
-        $user['admin_groupnew'] = '1';
+        $user['admin_groupnew'] = '7';
 //        $user['']= '';
        return $user;

--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -490,8 +490,8 @@ class OrderService extends Service
            ['showname' => "可派单", 'shownum' => '--','status'=>10],
            ['showname' => "已派单", 'shownum' => '--','status'=>20],
            ['showname' => "超时未接单", 'shownum' => '--','status'=>21],
-           // ['showname' => "延期订单", 'shownum' => '--','status'=>6],
+            ['showname' => "延期订单", 'shownum' => '--','status'=>6],
-          //  ['showname' => "订单追踪", 'shownum' => '--','status'=>7],
+            ['showname' => "订单追踪", 'shownum' => '--','status'=>7],
            ['showname' => "撤销订单", 'shownum' => '--','status'=>8]
        ];
@@ -2427,7 +2427,7 @@ class OrderService extends Service
        }
-        $returnPle = SubmitPleaseService::createSubmitPlease($session['admin_acc'], $input['p_id'], $input['sys_num'], implode(',',$goods_name_res), $allprice, $input['goods_state'], 2, 2, 0, $pleArr['submit_stauas'], implode(',',$msg_ids),$refund,$pleArr['customer_info'],$centent,$poss['attribute'],$refund_num,$session['company_id']);
+        $returnPle = SubmitPleaseService::createSubmitPlease($session['admin_acc'], $input['p_id'], $input['sys_num'], implode(',',$goods_name_res), $allprice, $input['goods_state'], 2, 2, 0, $pleArr['submit_stauas'], implode(',',$msg_ids),$refund,$pleArr['customer_info'],$centent,$poss['attribute'],$refund_num,$poss['company_id']);
        if(!$returnPle){
            return  ['Data' => '','ErrorMessage'=>'操作失败sbp','ErrorCode'=>ErrorInc::MYSQL_FAILED];
        }
@@ -2981,7 +2981,6 @@ class OrderService extends Service
            $res = $BaseController->http_get($urls);
            $data = json_decode($res, true);
            $result = $data['jingdong_omnic_order_query_orderList_responce']['result'];
-            $result = json_decode($result, true);
            CommonService::addLog('获取取消订单', $urls.'---'.$res, $pt_id, 'orderService-getOrderCancelByJd');
            if (isset($result['success'])&&$result['success'] == true) {
                $order_data = $result['data'];

--- a/routes/api.php
+++ b/routes/api.php
@@ -43,7 +43,8 @@ Route::group(['prefix' => 'interface', 'namespace' => 'Api'], function () {//外
    Route::post('order/addTmBound', 'OrdersController@addTmBound');//dou add 2022-05-11 添加sku绑定
    Route::post('order/addTmBound', 'OrdersController@addTmBound');//dou add 2022-05-11 添加sku绑定
+    Route::post('orderTm/store', 'OrdersTmController@store'); //订单新增
+    Route::post('orderTm/refundGoods', 'OrdersTmController@refundGoods');// 退款锁定同步
 });
@@ -1483,6 +1484,7 @@ Route::namespace('Api')->group(function () {
        Route::post('w1/OrderList/getFeedback', 'MobileWeb\OrderListController@getFeedback'); //获取安装反馈数据
        Route::post('w1/OrderList/getService', 'MobileWeb\OrderListController@getService'); //获取系统推荐服务商
        Route::post('w1/OrderList/sendAgain', 'MobileWeb\OrderListController@sendAgain'); //指派门店
+        Route::post('w1/OrderList/labtype', 'MobileWeb\OrderListController@labtype'); //获取拒单标签
        Route::post('w1/OrderList/imageFeedback', 'MobileWeb\OrderListController@imageFeedback'); //施工反馈，图片反馈
        Route::post('w1/OrderList/LicenseFeedback', 'MobileWeb\OrderListController@LicenseFeedback'); //施工反馈，车牌反馈