edit

7ed4a853 · 窦斌 · f297a2d1 · 7ed4a853 · 7ed4a853 · 7ed4a853
--- a/app/Exports/BasicExport.php
+++ b/app/Exports/BasicExport.php
@@ -90,29 +90,33 @@ class BasicExport
        $sheet->mergeCells('C1:H1');
        $sheet->setCellValue('C1', $data['time']);
-        $sheet->getStyle('C1:H1')->applyFromArray($styleArray);
+        $sheet->getStyle('C1:J1')->applyFromArray($styleArray);
        $sheet->getStyle('C1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
        $sheet->setCellValue('C2', '总推送单量');
        $sheet->setCellValue('D2', '接单量');
        $sheet->setCellValue('E2', '拒单量');
        $sheet->setCellValue('F2', '拒单率');
-        $sheet->setCellValue('G2', '接单时效');
+        $sheet->setCellValue('G2', '超十五分钟接单量');
-        $sheet->setCellValue('H2', '履约时效');
+        $sheet->setCellValue('H2', '超十五分钟比例');
-        $sheet->getStyle('C2:H2')->applyFromArray($styleArray);
+        $sheet->setCellValue('I2', '接单时效');
-        $sheet->getStyle('C2:H2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $sheet->setCellValue('J2', '履约时效');
+        $sheet->getStyle('C2:J2')->applyFromArray($styleArray);
+        $sheet->getStyle('C2:J2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
-        $sheet->mergeCells('I1:N1');
+        $sheet->mergeCells('K1:R1');
-        $sheet->setCellValue('I1', '累计至今');
+        $sheet->setCellValue('K1', '累计至今');
-        $sheet->getStyle('I1:N1')->applyFromArray($styleArray);
+        $sheet->getStyle('K1:R1')->applyFromArray($styleArray);
-        $sheet->getStyle('I1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $sheet->getStyle('K1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
-        $sheet->setCellValue('I2', '总推送单量');
+        $sheet->setCellValue('K2', '总推送单量');
-        $sheet->setCellValue('J2', '接单量');
+        $sheet->setCellValue('L2', '接单量');
-        $sheet->setCellValue('K2', '拒单量');
+        $sheet->setCellValue('M2', '拒单量');
-        $sheet->setCellValue('L2', '拒单率');
+        $sheet->setCellValue('N2', '拒单率');
-        $sheet->setCellValue('M2', '接单时效');
+        $sheet->setCellValue('O2', '超十五分钟接单量');
-        $sheet->setCellValue('N2', '履约时效');
+        $sheet->setCellValue('P2', '超十五分钟比例');
-        $sheet->getStyle('I2:N2')->applyFromArray($styleArray);
+        $sheet->setCellValue('Q2', '接单时效');
-        $sheet->getStyle('I2:N2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
+        $sheet->setCellValue('R2', '履约时效');
+        $sheet->getStyle('K2:R2')->applyFromArray($styleArray);
+        $sheet->getStyle('K2:R2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
        // 填充其他数据
        $num = 3;
        $nums = 1;
@@ -124,18 +128,22 @@ class BasicExport
            $sheet->setCellValue('D'.$num, $v['order_listnum']);
            $sheet->setCellValue('E'.$num, $v['order_rejectednum']);
            $sheet->setCellValue('F'.$num, $v['rejectRate']);
-            $sheet->setCellValue('G'.$num, $v['pdAgeing']);
+            $sheet->setCellValue('G'.$num, $v['order_fivenum']);
-            $sheet->setCellValue('H'.$num, $v['sgAgeing']);
+            $sheet->setCellValue('H'.$num, $v['fiveRate']);
-            $sheet->setCellValue('I'.$num, $v['all_nums']);
+            $sheet->setCellValue('I'.$num, $v['pdAgeing']);
-            $sheet->setCellValue('J'.$num, $v['order_listnums']);
+            $sheet->setCellValue('J'.$num, $v['sgAgeing']);
-            $sheet->setCellValue('K'.$num, $v['order_rejectednums']);
+            $sheet->setCellValue('K'.$num, $v['all_nums']);
-            $sheet->setCellValue('L'.$num, $v['rejectRates']);
+            $sheet->setCellValue('L'.$num, $v['order_listnums']);
-            $sheet->setCellValue('M'.$num, $v['pdAgeings']);
+            $sheet->setCellValue('M'.$num, $v['order_rejectednums']);
-            $sheet->setCellValue('N'.$num, $v['sgAgeings']);
+            $sheet->setCellValue('N'.$num, $v['rejectRates']);
+            $sheet->setCellValue('O'.$num, $v['order_fivenallum']);
+            $sheet->setCellValue('P'.$num, $v['fiveRates']);
+            $sheet->setCellValue('Q'.$num, $v['pdAgeings']);
+            $sheet->setCellValue('R'.$num, $v['sgAgeings']);
            $num++;
            $nums++;
        }
-        $sheet->getStyle('A3:N'.$num)->applyFromArray($styleDataArray);
+        $sheet->getStyle('A3:R'.$num)->applyFromArray($styleDataArray);
        $sheet->getColumnDimension('A')->setWidth(8);
        $sheet->getColumnDimension('B')->setWidth(45);
@@ -144,13 +152,17 @@ class BasicExport
        $sheet->getColumnDimension('E')->setWidth(8);
        $sheet->getColumnDimension('F')->setWidth(10);
        $sheet->getColumnDimension('G')->setWidth(20);
-        $sheet->getColumnDimension('H')->setWidth(20);
+        $sheet->getColumnDimension('H')->setWidth(30);
-        $sheet->getColumnDimension('I')->setWidth(12);
+        $sheet->getColumnDimension('I')->setWidth(30);
-        $sheet->getColumnDimension('J')->setWidth(8);
+        $sheet->getColumnDimension('J')->setWidth(20);
-        $sheet->getColumnDimension('K')->setWidth(8);
+        $sheet->getColumnDimension('K')->setWidth(12);
-        $sheet->getColumnDimension('L')->setWidth(10);
+        $sheet->getColumnDimension('L')->setWidth(8);
-        $sheet->getColumnDimension('M')->setWidth(20);
+        $sheet->getColumnDimension('M')->setWidth(8);
-        $sheet->getColumnDimension('N')->setWidth(20);
+        $sheet->getColumnDimension('N')->setWidth(10);
+        $sheet->getColumnDimension('O')->setWidth(30);
+        $sheet->getColumnDimension('P')->setWidth(30);
+        $sheet->getColumnDimension('Q')->setWidth(20);
+        $sheet->getColumnDimension('R')->setWidth(20);
        $sheet -> getDefaultRowDimension() -> setRowHeight(24); //设置默认行高为28
        $sheet->freezePane('A3');//冻结第二行
        $allnum = count($data);

--- a/app/Http/Controllers/Api/JdOrderApiController.php
+++ b/app/Http/Controllers/Api/JdOrderApiController.php
@@ -2,28 +2,17 @@
 namespace App\Http\Controllers\Api;
 use ACES\TDEClient;
 use App\Http\Controllers\BaseController;
-use App\Http\Controllers\Orders\OrderListController;
-use App\Models\Admin;
-use App\Models\Feedback;
-use App\Models\InstallLine;
 use App\Models\JdBound;
 use App\Models\JdServiceProvider;
-use App\Models\OrderList;
 use App\Models\OrderListMsg;
 use App\Models\Orders;
 use App\Models\PjGoods;
 use App\Models\Pt;
-use App\Models\SettlementList;
-use App\Models\SettlementThree;
 use App\Services\CommonService;
 use App\Services\OrderaddService;
 use App\Services\OrderService;
 use App\Services\RefundService;
-use App\Services\SettlementThreeService;
-use BlueCity\Core\Inc\ErrorInc;
-use Illuminate\Http\Request;
 use DB;
-use OSS\OssClient;
 use ACES\SecretJdClient;
 class JdOrderApiController extends BaseController
 {
@@ -34,7 +23,6 @@ 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")));
        $endDate = date("Y-m-d H:i:s");
        $url = "http://116.196.75.172/index.php/SaasApiGetOrder/index?startDate=".$startDate."&endDate=".$endDate."&status=300";
@@ -161,6 +149,7 @@ class JdOrderApiController extends BaseController
                                    $orders[$kkk]['pay_type'] = 1;//支付方式：1在线支付；2货到付款 $input['shr_other']
                                    $orders[$kkk]['goods'] = $orderMsgData;
                                    $orders[$kkk]['shr_other'] = $vvv['orderInfo']['promiseMsg'];
+                                    $orders[$kkk]['clientAccount'] = $vvv['orderInfo']['customerId']??'';//客户账号
                                    //   $session = $request->get('session_token');//获取操作人信息
                                    $session['admin_groupnew'] = 7;
                                    $session['admin_acc'] = '系统录入';
@@ -328,7 +317,7 @@ class JdOrderApiController extends BaseController
     * |---------------------------------------------------------------------------------
    */
    public function getOrderCancelByJd( ){
-        $startDate = date("Y-m-d H:i:s",strtotime(" -720 minute".date("Y-m-d H:i:s")));
+        $startDate = date("Y-m-d H:i:s",strtotime(" -2880 minute".date("Y-m-d H:i:s")));
        $endDate = date("Y-m-d H:i:s");
        $url = "http://116.196.75.172/index.php/SaasApiGetOrder/index?startDate=".$startDate."&endDate=".$endDate."&status=204";
        $token = DB::table('jdpop_token')->where('status',1)->where('type',2)->where('pt_id',33)->select('app_key','app_secret','access_token','pt_id','auth_key')->get()->toarray();
@@ -351,19 +340,19 @@ class JdOrderApiController extends BaseController
                        $order_data = $order_data['data'];
                        foreach ($order_data as $kkk => $vvv) {
                            $flag = 1;
-                            $refundlist = RefundService::getInfoByKeyValue('order_num', $vvv['salesChannelOrderId'], ['state', 'roPreNo']);
+                            $refundlist = RefundService::getInfoByKeyValue('order_num', $vvv['orderInfo']['salesChannelOrderId'], ['state', 'roPreNo']);
                            if ($refundlist) {
                                $rea = '退款已存在';
                                $flag = 2;
                            }
                            if ($flag == 1) {
-                                $refund['order_num'] = $vvv['salesChannelOrderId'];
+                                $refund['order_num'] = $vvv['orderInfo']['salesChannelOrderId'];
                                $refund['refund'] = 1;
                                $refund['content'] = '平台订单已撤销';
                                $refund['urgent'] = 1;
                                $refund['recycle_type'] = 0;
-                                $refund['roPreNo'] = $vvv['salesChannelOrderId'];
+                                $refund['roPreNo'] = $vvv['orderInfo']['salesChannelOrderId'];
-                                $sys_num = OrderService::getOrderBy('order_num', $vvv['salesChannelOrderId'], ['sys_num', 'order_status', 'new_money']);
+                                $sys_num = OrderService::getOrderBy('order_num', $vvv['orderInfo']['salesChannelOrderId'], ['sys_num', 'order_status', 'new_money']);
                                if ($sys_num) {
                                    $refund['sys_num'] = $sys_num['sys_num'];
                                    if ($sys_num['order_status'] > 10) {
@@ -401,7 +390,7 @@ class JdOrderApiController extends BaseController
                                }
                            }
                            $return[$kkk]['lockOrder'] = $rea;
-                            $return[$kkk]['order_num'] = $vvv['salesChannelOrderId'];
+                            $return[$kkk]['order_num'] = $vvv['orderInfo']['salesChannelOrderId'];
                        }
                        CommonService::addLog('添加退款单', json_encode($return), $vs['pt_id'], 'addOrderCancels');
                    }

--- a/app/Http/Controllers/Api/MobileWeb/BillingModuleController.php
+++ b/app/Http/Controllers/Api/MobileWeb/BillingModuleController.php
@@ -67,7 +67,7 @@ class BillingModuleController extends Controller
            return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
        }
-        $return_data = BillingModuleService::affirmBill($request->all());
+        $return_data = BillingModuleService::affirmBill($request->all(),$request->ip());
        return response()->json($return_data);
    }

--- a/app/Http/Controllers/Api/MobileWeb/StatementsListController.php
+++ b/app/Http/Controllers/Api/MobileWeb/StatementsListController.php
@@ -2,6 +2,7 @@
 namespace App\Http\Controllers\Api\MobileWeb;
+use App\Services\Api\MobileWeb\BillingModuleService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Validators\Api\MobileWeb\StatementsListValidator;
@@ -55,7 +56,8 @@ class StatementsListController extends Controller
        }
        $data = $request->all();
        $data['ip'] = $request->ip();
-        $return_data = StatementsListService::businessFirm($data);
+        $return_data = BillingModuleService::affirmBill($request->all(),$request->ip());
+//        $return_data = StatementsListService::businessFirm($data);
        return response()->json($return_data);
    }

--- a/app/Http/Controllers/Api/SynJdPopDataController.php
+++ b/app/Http/Controllers/Api/SynJdPopDataController.php
@@ -51,7 +51,7 @@ class SynJdPopDataController extends BaseController
            $res_ult[$k]['time_end'] = $time_end;				//结束时间
            $res_ult[$k]['setPageSize'] = 10;						//每页条数
            $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,pin';    //获取的订单字段
            /**TRADE_CANCELED,POP_ORDER_PAUSE,LOCKED
            这三个是取消的状态，还是通过获取订单那个接口，触发时间和获取订单时间一致就行，这个没有变更状态一说，所以需要你判定，比如五分钟查一次最近六分钟的取消订单，如果系统中未取消就锁定订单生成退款单，如果过系统中已经取消或者已经锁定退款单就不用管了**/
@@ -175,8 +175,22 @@ class SynJdPopDataController extends BaseController
                                }
                                $fullname = '无';
                            }
                            $fullname = $fullname??$vv['consigneeInfo']['fullname'];
+//                            $pin = $vv['pin'];
+//                            $fullpin =  $this->decrypt($datafullname,$pin,$vv['orderId']);
+//                            if(strpos($fullpin,'<body>' )!==false){
+//                                //存另一数据库中
+//                                //是否存在
+//                                $exs_code = DB::table('jdpop_encode')->where('order_id',$vv['orderId'])->value('id');
+//                                if($exs_code){
+//                                    DB::table('jdpop_encode')->where('order_id',$vv['orderId'])->update(['pin_code'=>$vv['pin']]);
+//                                }else{
+//                                    DB::table('jdpop_encode')->insert(['order_id'=>$vv['orderId'],'pt_id'=>$v['pt_id'],'pin_code'=>$vv['pin']]);
+//                                }
+//                                $fullpin = '无';
+//                            }
+//                            $fullpin = $fullpin??$vv['pin'];
                            if(isset($vv['user_data_dou'])){
                                $Address = $vv['user_data_dou']['address'];
                            }else {
@@ -269,6 +283,7 @@ class SynJdPopDataController extends BaseController
                                $orders[$kk]['order_time'] = $vv['orderStartTime'];
                                $orders[$kk]['pay_type'] = 1;//支付方式：1在线支付；2货到付款
                                $orders[$kk]['goods'] = $orderMsgData;
+//                                $orders[$kk]['clientAccount'] = $fullpin;
                                //   $session = $request->get('session_token');//获取操作人信息
                                $session['admin_groupnew'] = 7;

--- a/app/Http/Controllers/Api/SynJdSelfDataController.php
+++ b/app/Http/Controllers/Api/SynJdSelfDataController.php
@@ -254,7 +254,7 @@ class SynJdSelfDataController extends BaseController
                    // dump($orders[$kk]);
                    $return = OrderaddService::addOrder($orders[$kk], $session, $ip);
                    //    dump($return);
-                    CommonService::addLog('添加定单', json_encode($return), $vv['customOrderId'],'jd_addSelfOrder');
+                    CommonService::addLog('添加定单', json_encode($return)."--".json_encode($orders[$kk]).'--'.json_encode($goodids), $vv['customOrderId'],'jd_addSelfOrder');
                    // $return['ErrorCode'] = 2;
                    if($return['ErrorCode']==1){
                        //调用京东出库

--- a/app/Http/Controllers/Api/SynJdSelfDataNewController.php
+++ b/app/Http/Controllers/Api/SynJdSelfDataNewController.php
@@ -251,6 +251,7 @@ class SynJdSelfDataNewController extends BaseController
                    $orders[$kk]['order_time'] = date("Y-m-d H:i:s");
                    $orders[$kk]['pay_type'] = 1;//支付方式：1在线支付；2货到付款
                    $orders[$kk]['goods'] = $orderMsgData;
+                    $orders[$kk]['clientAccount'] = $vv['pin'];//购买人账号
                    //   $session = $request->get('session_token');//获取操作人信息
                    $session['admin_groupnew'] = 7;
@@ -260,7 +261,7 @@ class SynJdSelfDataNewController extends BaseController
                    // dump($orders[$kk]);
                    $return = OrderaddService::addOrder($orders[$kk], $session, $ip);
                    //    dump($return);
-                    CommonService::addLog('添加定单', json_encode($return), $vv['customOrderId'],'jd_addSelfShhOrder');
+                    CommonService::addLog('添加定单', json_encode($return)."--".json_encode($orders[$kk]).'--'.json_encode($goodids), $vv['customOrderId'],'jd_addSelfShhOrder');
                    // $return['ErrorCode'] = 2;
                    if($return['ErrorCode']==1 && $v['pt_id']!=33){
                        //调用京东出库

--- a/app/Http/Controllers/DatasBase/TipsController.php
+++ b/app/Http/Controllers/DatasBase/TipsController.php
@@ -59,7 +59,7 @@ class TipsController extends BaseController
                $list[$num]['url'] = '';
            }
        }
-        $timeout = Orders::where('order_status',20)->where('distype',5)->count();
+        $timeout = Orders::where('order_status',20)->where('company_id',$request->get('session_token')['company_id'])->where('distype',5)->count();
        if($timeout>0){
            $num = count($list);
            $list[$num]['msg'] = "订单超时未接单";

--- a/app/Http/Controllers/Dou/MyTestController.php
+++ b/app/Http/Controllers/Dou/MyTestController.php
--- a/app/Http/Controllers/ExcelInfo/ExcelpermissController.php
+++ b/app/Http/Controllers/ExcelInfo/ExcelpermissController.php
@@ -3,11 +3,14 @@
 namespace App\Http\Controllers\ExcelInfo;
 use App\Http\Controllers\BaseController;
 use App\Exceptions\ApiException;
+use App\Models\Admin;
+use App\Services\CommonService;
 use App\Services\ExcelpermissService;
 use Illuminate\Http\Request;
 use App\Models\ExcelPermiss;
 use App\ExcelTemp\ExcelTemp;
 use BlueCity\Core\Inc\ErrorInc;
+use DB;
 class ExcelpermissController extends BaseController
 {
@@ -25,6 +28,9 @@ class ExcelpermissController extends BaseController
    {
        $input = $request->all();
        $session = $request->get('session_token');
+        if (!in_array($session['admin_groupnew'],[7,8,9])) {//管理员可以看全部
+            return $this->error('无操作权限', ErrorInc::REQUEST_FORBIDDEN);exit;
+        }
        $list = ExcelpermissService::getList($input,$session);
        if($list['list']){
            return $this->success('获取成功', $list); exit;
@@ -52,13 +58,14 @@ class ExcelpermissController extends BaseController
            if (!empty($exist)) {
                return $this->error('该权限已添加,请勿重复添加', ErrorInc::MYSQL_FAILED);exit;
            }
+            $company_id = Admin::where('id',$input['admin_id'])->value("company_id");
            $res = ExcelPermiss::insert([
                'adg_admin' => $input['admin_id'],
                'adg_action' => $input['action_value'],
                'adg_acname' => $input['action_name'],
                'adg_data'   => json_encode($input['adg_data'],JSON_UNESCAPED_UNICODE,2),
                'adg_type'   => 1,
-                'company_id' => $request->get('session_token')['company_id'],
+                'company_id' => $company_id,
            ]);
            if ($res) {
            	$this->insertingLog("导出权限，",$input['action_value'],"导出权限添加".$input['action_name'],"导出权限",$request->ip(), $request->get('session_token')['admin_acc']);//日志
@@ -133,9 +140,20 @@ class ExcelpermissController extends BaseController
     * @author du
     * @date 2021/8/27
     */
-    public function excelActions ()
+    public function excelActions (Request $request)
    {
-        $data['list'] = $this->getActions();
+        $session = $request->get('session_token');
+        $list = $this->getActions();
+        if (!in_array($session['admin_groupnew'],[7])) {//管理员可以看全部
+            $adg_action = DB::table('admin_excel')->where('adg_admin',$session['id'])->pluck('adg_action');
+            $adg_action = CommonService::dataToArray($adg_action);
+            if($adg_action) {
+                $list = CommonService::arrayFilterFieldValue($list, [['action_value' => $adg_action]]);
+            }else{
+                $list = [];
+            }
+        }
+        $data['list'] = $list;
        return $this->success('获取成功',$data);exit;
    }
@@ -150,8 +168,21 @@ class ExcelpermissController extends BaseController
    public function excelFields (Request $request)
    {
        if ($request->filled('action_value')) {
+            $session = $request->get('session_token');
            $action_value = $request->input('action_value');
-            $data['list'] = $this->getField($action_value);
+            $list = $this->getField($action_value);
+            if (!in_array($session['admin_groupnew'],[7])) {//管理员可以看全部
+                $adg_action = DB::table('admin_excel')->where('adg_admin',$session['id'])->where('adg_action',$action_value)->value('adg_data');
+                if($adg_action) {
+                    $adg_action = json_decode($adg_action);
+                    $field_value = array_column($adg_action, 'field_value');
+                    $field_value = CommonService::dataToArray($field_value);
+                    $list = CommonService::arrayFilterFieldValue($list, [['field_value' => $field_value]]);
+                }else{
+                    $list = [];
+                }
+            }
+            $data['list'] = $list;
            return $this->success('获取成功',$data);exit;
        }
    }

--- a/app/Http/Controllers/Orders/AotuorderController.php
+++ b/app/Http/Controllers/Orders/AotuorderController.php
@@ -49,6 +49,15 @@ class AotuorderController extends BaseController
                $or_ser_id = array_column($order_rejected, 'or_ser_id');
            }
            //判定用户信息是否重复
+            $time = date("Y-m-d H:i:s",strtotime('-1 month'));
+            if($order['clientAccount']!='') {
+                $ordernum = DB::table("orders")->where('clientAccount', $order['clientAccount'])->where('create_time', '>', $time)->where('order_num', '!=', $order['order_num'])->where('order_status', '<', 50)->first();
+                if ($ordernum) {
+                    $this->manual($sys_num);
+                    $this->insertingLog("系统派单，", $sys_num, '下单人重复下单', "订单管理", $ip, $admin_acc);//日志
+                    return true;
+                }
+            }
            $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();
 //            $phone = array_column($user_phone,'id');

--- a/app/Http/Controllers/Orders/OrderListController.php
+++ b/app/Http/Controllers/Orders/OrderListController.php
--- a/app/Http/Controllers/Orders/OrdersController.php
+++ b/app/Http/Controllers/Orders/OrdersController.php
@@ -291,17 +291,21 @@ class OrdersController extends BaseController
                $where['id'] = $id;
            }
            $db = new Orders();
-            $orderids = CommonService::getMysqlData($db, $where ,['customer_id','new_customer_id','category'],[],'first');
+            $orderids = CommonService::getMysqlData($db, $where ,['customer_id','new_customer_id','category','clientAccount','order_num'],[],'first');
            if($orderids){
+                if($orderids['clientAccount']!=''){
+                    $time = date("Y-m-d H:i:s",strtotime('-1 month'));
+                    $orders = Orders::leftJoin('user', 'user.id', '=', 'orders.customer_id')->leftJoin('pt', 'pt.id', '=', 'orders.p_id')->select('orders.order_num', 'orders.sys_num', 'order_status', 'ser_id', 'order_account', 'new_money', 'order_time', 'shr_sheng', 'shr_shi', 'shr_xian', 'shr_adress', 'shr_name', 'shr_phone', 'pt_name','orders.id')->where('clientAccount', $orderids['clientAccount'])->orderBy('orders.create_time', 'DESC')->limit('10')->get();//->where('create_time', '>', $time)->where('order_num', '!=', $orderids['order_num'])->where('order_status', '<', 50)
+                }else {
                    $uid = [];
                    $uid[] = $orderids['customer_id'];
                    $uid[] = $orderids['new_customer_id'];
                    $user = new User();
-                $phone = CommonService::getMysqlData($user, ['id_searchin'=>$uid],['shr_phone','shr_sheng','shr_shi','shr_xian','shr_name']);
+                    $phone = CommonService::getMysqlData($user, ['id_searchin' => $uid], ['shr_phone', 'shr_sheng', 'shr_shi', 'shr_xian', 'shr_name']);
-                $after_state='1';
+                    $after_state = '1';
-                if($phone){
+                    if ($phone) {
                        $where = [];
-                    if($orderids['category']<3) {
+                        if ($orderids['category'] < 3) {
                            foreach ($phone as $k => $v) {
                                $next_level = 'user' . $k . '_next_level';
                                $where['user_searchor'][$next_level]['shr_sheng'] = $v['shr_sheng'];
@@ -309,19 +313,29 @@ class OrdersController extends BaseController
                                $where['user_searchor'][$next_level]['shr_xian'] = $v['shr_xian'];
                                $where['user_searchor'][$next_level]['shr_name'] = $v['shr_name'];
                            }
-                    }else {
+                        } else {
                            $phone = array_column($phone, 'shr_phone');
                            $where['user_searchor']['shr_phone_searchin'] = $phone;
                        }
                        $where['id_notin'] = $uid;
                        $user = new User();
-                    $userids = CommonService::getMysqlData($user, $where,['id']);
+                        $userids = CommonService::getMysqlData($user, $where, ['id']);
-                    if($userids){
+                        if ($userids) {
                            $userids = array_column($userids, 'id');
                            $userids = implode(',', $userids);
-                        $orders = Orders::leftJoin('user', 'user.id', '=', 'orders.customer_id')->leftJoin('pt', 'pt.id', '=', 'orders.p_id')->select('orders.order_num', 'orders.sys_num', 'order_status', 'ser_id', 'order_account', 'new_money', 'order_time', 'shr_sheng', 'shr_shi', 'shr_xian', 'shr_adress', 'shr_name', 'shr_phone', 'pt_name')->whereRaw('(customer_id in(' . $userids . ') or new_customer_id in(' . $userids . ')) and is_delete = 2')->orderBy('orders.create_time', 'DESC')->orderBy('orders.sys_num', 'DESC')->limit('10')->get();
+                            $orders = Orders::leftJoin('user', 'user.id', '=', 'orders.customer_id')->leftJoin('pt', 'pt.id', '=', 'orders.p_id')->select('orders.order_num', 'orders.sys_num', 'order_status', 'ser_id', 'order_account', 'new_money', 'order_time', 'shr_sheng', 'shr_shi', 'shr_xian', 'shr_adress', 'shr_name', 'shr_phone', 'pt_name','orders.id')->whereRaw('(customer_id in(' . $userids . ') or new_customer_id in(' . $userids . ')) and is_delete = 2')->orderBy('orders.create_time', 'DESC')->orderBy('orders.sys_num', 'DESC')->limit('10')->get();
-                        if($orders) {
+                        } else {
-                            $orders = $orders ->toarray();
+                            return $this->error('暂无数据', 2);
+                            exit;
+                        }
+                    } else {
+                        return $this->error('数据异常请刷新页面重试', ErrorInc::MYSQL_FAILED);
+                        exit;
+                    }
+                }
+                if ($orders) {
+                    $orders = $orders->toarray();
                    $order_num = array_column($orders, 'order_num');
                    $order_after = AftersaleOrderService::getAfterData(['order_num_searchin' => $order_num, 'status_searchlt' => '40'], 'order_num', ['status', 'order_num'], 1);//获取售后信息
                    $order_status_name = OrderService::getOrderStatusName();//获取订单状态数组
@@ -334,7 +348,7 @@ class OrdersController extends BaseController
                                $after_state = '2';
                            }
                        }
-                                $orders[$ke]['order_status'] = $order_status_name[$va['order_status']]??'未确认';
+                        $orders[$ke]['order_status'] = $order_status_name[$va['order_status']] ?? '未确认';
                        $orderMsg = OrderService::getOrderMsg($va['sys_num']);
                        $orders[$ke]['next'] = $orderMsg;
                        $admins = Admin::where('id', $va['ser_id'])->select('company_name', 'admin_name')->first();
@@ -343,15 +357,10 @@ class OrdersController extends BaseController
                    }
                    $list['after_type'] = $after_state;
                    $list['orders'] = $orders;
-                            return $this->success('操作成功',$list);
+                    return $this->success('操作成功', $list);
-                        }else{
+                } else {
-                            return $this->error('暂无数据', 2);exit;
+                    return $this->error('暂无数据', 2);
-                        }
+                    exit;
-                    }else{
-                        return $this->error('暂无数据', 2);exit;
-                    }
-                }else{
-                    return $this->error('数据异常请刷新页面重试', ErrorInc::MYSQL_FAILED);exit;
                }
            }else{
                return $this->error('暂无数据', 2);exit;
@@ -1510,7 +1519,7 @@ class OrdersController extends BaseController
            return $this->error('参数'.$checkKey['data'].'未填写,或值为空', ErrorInc::INVALID_PARAM);exit;
        }
        $session = $request->get('session_token');
-        $orderinfo = OrderService::getOrderBy('order_num', $input['til_ornum'],['new_customer_id','order_num','ser_id','p_id']);
+        $orderinfo = OrderService::getOrderBy('order_num', $input['til_ornum'],['new_customer_id','order_num','ser_id','p_id','company_id']);
        $customer_id = $orderinfo['new_customer_id'];
        $userArr = CommonService::getUser('id', $customer_id);
        DB::beginTransaction();//开启事务
@@ -1529,7 +1538,7 @@ class OrdersController extends BaseController
        } else {
            $til_data = 1;
        }
-        $res = TicketListService::createTicket($input['til_ornum'], $input['til_sernum'], $input['til_watnum'], $input['til_wats'], $input['til_serid'], $input['til_price'], 1, $input['til_cause'], $session['admin_acc'],$input['til_ticnum'],$input['til_type'],$til_data,$input['sety_id'],231,$userArr['shr_name'],$userArr['shr_phone'],$poss['til_dress'],$session['company_id']);
+        $res = TicketListService::createTicket($input['til_ornum'], $input['til_sernum'], $input['til_watnum'], $input['til_wats'], $input['til_serid'], $input['til_price'], 1, $input['til_cause'], $session['admin_acc'],$input['til_ticnum'],$input['til_type'],$til_data,$input['sety_id'],231,$userArr['shr_name'],$userArr['shr_phone'],$poss['til_dress'],$orderinfo['company_id']);
        if ($res) {
            if ($request->filled('pic') && $request->input('pic') != []) {
                $pic = $request->input('pic');

--- a/app/Http/Controllers/Orders/TicketListController.php
+++ b/app/Http/Controllers/Orders/TicketListController.php
@@ -5,6 +5,7 @@ use App\Http\Controllers\BaseController;
 use App\Exceptions\ApiException;
 use App\Services\CommonService;
+use App\Services\OrderService;
 use Illuminate\Http\Request;
 use App\Models\OrderList;
 use App\Models\Orders;
@@ -126,11 +127,11 @@ class TicketListController extends BaseController
        } else {
            $til_data = 1;
        }
+        $order = OrderService::getOrderBy('order_num', $input['til_ornum'],['sys_num','company_id']);
        $til_dress = $input['shr_sheng'].$input['shr_shi'].$input['shr_xian'].$input['til_dress'];
-        $res = TicketListService::createTicket($input['til_ornum'],$input['til_sernum'],$input['til_watnum'],$input['til_wats'],$input['til_serid'],$input['til_price'],1,$input['til_cause'],$session['admin_acc'],$input['til_ticnum'],$input['til_type'],$til_data,$input['sety_id'],231,$input['shr_name'],$input['shr_phone'],$til_dress);
+        $res = TicketListService::createTicket($input['til_ornum'],$input['til_sernum'],$input['til_watnum'],$input['til_wats'],$input['til_serid'],$input['til_price'],1,$input['til_cause'],$session['admin_acc'],$input['til_ticnum'],$input['til_type'],$til_data,$input['sety_id'],231,$input['shr_name'],$input['shr_phone'],$til_dress,$order['company_id']);
        if($res){
-            $sys_num = OrderList::where('order_num',$input['til_ornum'])->value("sys_num");
            if ($request->filled('pic') && $request->input('pic') != []) {
                $pic = $request->input('pic');
           		$til_pic = implode(',',$pic);
@@ -144,7 +145,7 @@ class TicketListController extends BaseController
            }
           TicketListService::createTicketData($til_pic, $til_sound, $res, $session['id'], $session['admin_acc'], $input['til_cause'], 10);
            DB::commit();//成功则提交
-            $this->insertingLog("添加，",$input['til_ticnum'],"添加罚单，".$input['til_ticnum'],"罚单管理",$request->ip(),$session['admin_acc']);//日志
+            $this->insertingLog("添加，",$order['sys_num'],"添加罚单，".$input['til_ticnum'],"罚单管理",$request->ip(),$session['admin_acc']);//日志
            return $this->success('添加成功'); exit;
        }else{
            DB::rollback();//不成功，则回滚

--- a/app/Services/Api/MobileWeb/BillingModuleService.php
+++ b/app/Services/Api/MobileWeb/BillingModuleService.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\DB;
 use BlueCity\Core\Inc\ErrorInc;
-use App\Services\Api\Common\{CommonService};
+use App\Services\CommonService;
 // 账单列表
 class BillingModuleService extends Model
@@ -275,20 +275,26 @@ class BillingModuleService extends Model
    }
    // 确认账单
-    public static function affirmBill($request)
+    public static function affirmBill($request,$ip)
    {
+        $find_data = DB::table('statements_list')
+            ->where('stl_id', $request['id'])
+            ->first();
+        $find_data = CommonService::dataToArray($find_data);
+        $request['admin_id'] = $find_data['stl_serid'];
+        $request['wat_num'] = $find_data['stl_wat'];
        // 查询成员账号表数据
        $find_adm_data = DB::table('admin')
            ->where('id', $request['admin_id'])
            ->select('company_name', 'admin_acc')
            ->first();
-        $find_adm_data = objectToArray($find_adm_data);
+        $find_adm_data = CommonService::dataToArray($find_adm_data);
        // 查询结算单列表数据
        $find_stli_data = DB::table('statements_list')
            ->where('stl_wat', $request['wat_num']) //结算单号
-            ->select('stl_money', 'stl_ticket', 'stl_type', 'stl_serid', 'stl_monthpay', 'company_id')
+            ->select('stl_money', 'stl_ticket', 'stl_type', 'stl_serid', 'stl_monthpay', 'company_id','stl_category')
            ->first();
-        $find_stli_data = objectToArray($find_stli_data);
+        $find_stli_data = CommonService::dataToArray($find_stli_data);
        if ($find_stli_data['stl_type'] != 1) {
            return ['ErrorCode' => 500, 'ErrorMessage' => '只有未结算的单据可以点击确认账单', 'Data' => []];
        }
@@ -305,20 +311,19 @@ class BillingModuleService extends Model
        }
        $add_sece_data['settlement_num'] = $settlement_num;
        $add_sece_data['company_id'] = $find_stli_data['company_id'];
-        $add_sece_data['stl_monthpay'] = $find_stli_data['stl_monthpay']; //1月结2零散3周结
+        $add_sece_data['stl_category'] = $find_stli_data['stl_category']; //1月结2零散3周结
-        $user_info = CommonService::webgetUserInfo($request['api_token']);
+//        $user_info = CommonService::webgetUserInfo($request['api_token']);
        // 查询工单结算表数据
        $find_seli_data = DB::table('settlement_list')
            ->where('wat_num', $request['wat_num'])
-            ->select('serial_number')
+            ->select('list_id')
            ->get()->toArray();
-        $serial_number = array_column($find_seli_data, 'serial_number');
+        $serial_number = array_column($find_seli_data, 'list_id');
        DB::beginTransaction();
        // 新增服务商账单金额明细（服务中心账目管理数据）
        $add_sece_id = DB::table('service_center')->insert($add_sece_data);
        // 工单结算表
        $edit_seli_data['sett_status'] = 20; //工单结算状态：1未审核10未结算20结算中30已完成40作废50已追回
        // 更改服务工单结算表
@@ -335,16 +340,20 @@ class BillingModuleService extends Model
        // 更改服务工单列表
        $edit_orli_data["account_status"] = 20;
+        CommonService::startmysql();
        $edit_orli_res = DB::table('order_list')
            ->whereIn('serial_number', $serial_number)
            ->update($edit_orli_data);
+        CommonService::addLog('获取订单', CommonService::showmysql(), $request['wat_num'],'affirmBill-web');
        if ($add_sece_id && $edit_seli_res && $edit_stli_res && $edit_orli_res) {
+            $session = $request['session'];
+            CommonService::inserting_log('确认账单，',$request['wat_num'].'--'.$add_sece_id,'确认账单','账单管理web',$session,$ip);//日志
            DB::commit();
            // czrzLog("确认账单", $request['wat_num'], "移动端确认账单", "账单管理", request::ip(), $user_info->install_name);
            return ['ErrorCode' => 1, 'ErrorMessage' => '确认账单成功', 'Data' => []];
        } else {
            DB::rollback();
-            return ['ErrorCode' => 500, 'ErrorMessage' => '失败', 'Data' => []];
+            return ['ErrorCode' => 500, 'ErrorMessage' => '失败', 'Data' => [$add_sece_id,$edit_seli_res,$edit_stli_res,$edit_orli_res]];
        }
    }

--- a/app/Services/Api/MobileWeb/OrderListService.php
+++ b/app/Services/Api/MobileWeb/OrderListService.php
@@ -130,6 +130,9 @@ class OrderListService extends Model
                        $list_items[$key]['goods_price'] = GhPrice::where('goods_id',$goods_name[$value['order_goods_id']]['goods_id'])->where('ser_id',0)->value('supply_price');
                    }
                }
+                if (!empty($session['install_id']) && $session['user_type'] == 1) {
+                    $list_items[$key]['goods_price'] = 0;
+                }
                $mb_first = mb_substr($value['shr_name'], 0, 1, 'utf-8');
                $list_items[$key]['first_name'] = $mb_first;
                $list_items[$key]['button'] = [];
@@ -209,6 +212,7 @@ class OrderListService extends Model
            $page['page_size'] = $show_count; //一页显示多少个
            $page['allPage'] = $list_data->lastPage(); //表示最后一页的页码
            $data['list'] = $list_items;
+//            $data['session'] = $session;
            $data['page'] = $page;
        }
@@ -368,7 +372,10 @@ class OrderListService extends Model
            return ['ErrorCode' => ErrorInc::DATA_EMPTY, 'ErrorMessage' => '未查询到订单', 'Data' => []];
        }
        $orderListArr = CommonService::dataToArray($orderListArr);
+        $getJdOrderStatus = OrderService::getJdOrderStatus($orderListArr['order_num'], $orderListArr['p_id']);
+        if($getJdOrderStatus['ErrorCode']!=1){
+            return ['ErrorCode' => $getJdOrderStatus['ErrorCode'], 'ErrorMessage' => $getJdOrderStatus['ErrorMessage'], 'Data' => []];
+        }
        // 判断是否派单是否锁定
        if(!in_array($orderListArr['stauas'], [10,20])){
            return ['ErrorCode' => ErrorInc::BUSINESS_FORBID, 'ErrorMessage' => '当前服务单不是待接单状态！', 'Data' => []];
@@ -1564,6 +1571,13 @@ class OrderListService extends Model
        return $typeName;
    }
+    /**|---------------------------------------------------------------------------------
+     * @name 获取图片类型
+     * @param string $type 图片类型
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2024/12/27 16:49
+     * |---------------------------------------------------------------------------------
+    */
    //生成图片路径
    public static function creact_url(){
        $streamFileRand = date('YmdHis').rand(1000,9999);//产生一个随机文件名（因为你base64上来肯定没有文件名，这里你可以自己设置一个也行）

--- a/app/Services/Api/MobileWeb/StatementsListService.php
+++ b/app/Services/Api/MobileWeb/StatementsListService.php
@@ -23,9 +23,9 @@ use App\Models\{Admin,
    SettlementList,
    SettlementMoney,
    SubmitPlease,
+    TicketList,
    User,
-    OrderAfter
+    OrderAfter};
-};
 use App\Services\{BmmcService, Api\OrderManage\OrdersVehicleService, CommonService};
 class StatementsListService extends Model
@@ -103,7 +103,7 @@ class StatementsListService extends Model
                ->leftJoin('company as c', 'c.com_id', '=', 'sl.company_id')
                ->where('stl_serid', $session['admin_id'])
                ->where('stl_type', '!=', 4)
-                ->select('stl_wat', 'stl_type', 'com_name', 'stl_startime', 'stl_endtime', 'stl_money', 'stl_id')
+                ->select('stl_wat', 'stl_type', 'com_name', 'stl_startime', 'stl_endtime', 'stl_money', 'stl_ticket', 'stl_id')
                ->orderByRaw("stl_type asc,stl_endtime desc")
                ->paginate($show_count);
            $page['count'] = 0;
@@ -118,6 +118,9 @@ class StatementsListService extends Model
                $list_items = CommonService::dataToArray($list_items);
                $getStauasName = self::getStauasName();
                foreach ($list_items as $key => $value) {
+                    if($value['stl_ticket']>0){
+                        $list_items[$key]['stl_money'] = sprintf("%.2f",($value['stl_money']-$value['stl_ticket']));;
+                    }
                    $list_items[$key]['stl_type_name'] = $getStauasName[$value['stl_type']]['name'];
                    $list_items[$key]['pic_data'] = DB::table('pictures')
                        ->where('sett_wat_num', $value['stl_wat'])
@@ -190,20 +193,42 @@ class StatementsListService extends Model
        }
    }
-    public static function info($request) {
+    public static function info($request,$show_count=80) {
        $session = $request['session'];
        $data = DB::table('statements_list')
            ->where('stl_id', $request['id'])
-            ->select('stl_money', 'stl_wat')
+            ->select('stl_money', 'stl_wat','stl_ticket')
            ->first();
+        $type = $request['type']??1;
+        if($type==1) {
            $info_data = DB::table('settlement_list as s')
                ->leftJoin('order_list as o', 'o.serial_number', '=', 's.list_id')
                ->leftJoin('order_msg as om', 'om.id', '=', 'o.order_goods_id')
                ->where('s.ser_id', $session['admin_id'])
                ->where('wat_num', $data['stl_wat'])
-            ->select('s.id','s.sys_num', 's.create_time', 'all_price', 's.order_num as list_id', 'om.goods_name', 'om.goods_num')
+                ->select('s.id', 's.sys_num', 's.create_time', 'all_price', 's.order_num as list_id', 'om.goods_name', 'om.goods_num')
-            ->get();
+                ->orderBy('s.id', 'asc')
-        $data['info_data'] = $info_data;
+                ->paginate($show_count);
+            $list = $info_data->items();
+        }else{
+            $info_data = TicketList::where('til_wats',$data['stl_wat'])
+                ->select('til_id as id', 'til_ticnum as sys_num', 'til_creactime as create_time', 'til_price as all_price', 'til_ornum as list_id', 'til_cause as goods_name')
+                ->orderBy('til_id', 'asc')
+                ->paginate($show_count);
+            $list = $info_data->items();
+            $list = CommonService::dataToArray($list);
+            if($list) {
+                foreach ($list as $k => $v) {
+                    $list[$k]['all_price'] = '-' . $v['all_price'];
+                }
+            }
+        }
+        $page['count'] = $info_data->total(); //总数据个数
+        $page['page'] = $info_data->currentPage(); //当前页面页码
+        $page['page_size'] = $show_count; //一页显示多少个
+        $page['allPage'] = $info_data->lastPage(); //表示最后一页的页码
+        $data['info_data'] = $list;
+        $data['page'] = $page;
        return ['ErrorCode' => 1, 'ErrorMessage' => '成功', 'Data' => $data];
    }
 }
--- a/app/Services/DataStatisticsService.php
+++ b/app/Services/DataStatisticsService.php
@@ -46,11 +46,13 @@ class DataStatisticsService extends Service{
            }
            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 != '' and company_id = '".$session['company_id']."'")->count();//接单数量
+//                $order_listnums = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and company_id = '".$session['company_id']."'")->count();//工单数量
-                $order_listnum = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '".$time_start."' and '".$time_end."' and is_delete=1 and get_time != '' and company_id = '".$input['company_id']."'")->count();//接单数量
+                $order_rejectednum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'")->count();//拒单数量
-                $order_rejectednum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and or_show=1 and company_id = '".$session['company_id']."'")->count();//拒单数量
+                $order_fivenum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '".$time_start."' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->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 != '' and company_id = '".$session['company_id']."'")->count();//总接单数量
-                $order_rejectedAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and or_show=1 and company_id = '".$session['company_id']."'")->count();//总拒单数量
+//                $order_listAllnums = OrderList::whereRaw("ser_id='".$v['id']."' and create_time BETWEEN '2024-08-19' and '".$time_end."' and is_delete=1 and company_id = '".$session['company_id']."'")->count();//工单数量
+                $order_rejectedAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and or_show=1 and or_type = 1 and company_id = '".$session['company_id']."'")->count();//总拒单数量
+                $order_fiveAllnum = OrderRejected::leftjoin('orders', 'or_order_num', '=', 'order_num')->whereRaw("or_ser_id='".$v['id']."' and or_creact_time BETWEEN '2024-08-19' and '".$time_end."' and order_status<50 and or_show=1 and or_type = 2 and company_id = '".$session['company_id']."'")->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 and company_id = '".$session['company_id']."'";
                $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 and company_id = '".$session['company_id']."'";
@@ -64,13 +66,22 @@ class DataStatisticsService extends Service{
                $return[$k]['all_num'] = $order_listnum+$order_rejectednum;//总数量
                $return[$k]['order_listnum'] = $order_listnum;//接单数量
                $return[$k]['order_rejectednum'] = $order_rejectednum;//拒单数量
+                $return[$k]['order_fivenum'] = $order_fivenum;//超十五分钟未接单数量
                if(($order_listnum+$order_rejectednum) == 0){
                    $gl = "0.00%";
+                    $glf = "0.00%";
                }else {
                    $gl = sprintf("%.2f", $order_rejectednum / ($order_listnum + $order_rejectednum) * 100);
                    $gl = $gl."%";
+                    if($return[$k]['order_fivenum']>$return[$k]['all_num']){
+                        $glf = "100.00%";
+                    }else{
+                        $glf = sprintf("%.2f", $return[$k]['order_fivenum'] / ($return[$k]['all_num']) * 100);
+                        $glf = $glf."%";
+                    }
                }
                $return[$k]['rejectRate'] = $gl;//拒单率
+                $return[$k]['fiveRate'] = $glf;//超十五分钟未结单率
                if($data){
                    $pdAgeing = self::Compute_Time($data1[0]['pdnum']);
                    $sgAgeing = self::Compute_Time($data[0]['timenum']);
@@ -83,13 +94,22 @@ class DataStatisticsService extends Service{
                $return[$k]['all_nums'] = $order_listAllnum+$order_rejectedAllnum;//总数量
                $return[$k]['order_listnums'] = $order_listAllnum;//接单数量
                $return[$k]['order_rejectednums'] = $order_rejectedAllnum;//拒单数量
+                $return[$k]['order_fivenallum'] = $order_fiveAllnum;//拒超十五分钟未接单数量
                if(($order_listAllnum+$order_rejectedAllnum) == 0){
                    $gls = "0.00%";
+                    $glfs = "0.00%";
                }else {
                    $gls = sprintf("%.2f", $order_rejectedAllnum / ($order_listAllnum + $order_rejectedAllnum) * 100);
                    $gls = $gls."%";
+                    if($return[$k]['order_fivenallum']>$return[$k]['all_nums']){
+                        $glfs = "100.00%";
+                    }else{
+                        $glf = sprintf("%.2f", $return[$k]['order_fivenallum'] / ($return[$k]['all_nums']) * 100);
+                        $glfs = $glf."%";
+                    }
                }
                $return[$k]['rejectRates'] = $gls;//拒单率
+                $return[$k]['fiveRates'] = $glfs;//超十五分钟未结单率
                if($data){
                    $pdAgeings = self::Compute_Time($datas1[0]['pdnum']);
                    $sgAgeings = self::Compute_Time($datas[0]['timenum']);

--- a/app/Services/ExcelpermissService.php
+++ b/app/Services/ExcelpermissService.php
@@ -54,6 +54,9 @@ class ExcelpermissService extends Service
        if ($session['admin_groupnew'] != 7) {//管理员可以看全部
            $where['company_id'] = $session['company_id'];
+            $admin_id = Admin::where("admin_groupnew",$session['admin_groupnew'])->where('company_id',$session['company_id'])->pluck('id');
+            $admin_id = CommonService::dataToArray($admin_id);
+            $where['adg_admin_notin'] = $admin_id;
        }
    	$where = CommonService::jointWhere($where);

--- a/app/Services/OrderListService.php
+++ b/app/Services/OrderListService.php
@@ -257,7 +257,7 @@ class OrderListService extends Service
    * @return
    * @author du 2021年8月4日下午6:09:56
    */
-   public static function createFeedback($type,$gl_id,$install_name,$install_phone,$admin_id,$company_name,$is_type,$feedback_status,$feedback_pic=''){
+   public static function createFeedback($type,$gl_id,$install_name,$install_phone,$admin_id,$company_name,$is_type,$feedback_status,$feedback_pic='',$type_name = ''){
   	$fpArr['type'] = $type;//图片类型
   	$fpArr['gl_id'] = $gl_id;//关联order_list的id
   	$fpArr['install_name'] = $install_name;//安装人
@@ -269,6 +269,7 @@ class OrderListService extends Service
   	$fpArr['is_type'] = $is_type;//PC端
   	$fpArr['feedback_status'] = $feedback_status;//已安装
   	$fpArr['feedback_pic'] = $feedback_pic??'';
+    $fpArr['type_name'] = $type_name;
   	$res = DB::table('feedback')->insert($fpArr);
   	return $res;
   }
@@ -670,6 +671,9 @@ class OrderListService extends Service
       $pay_name = ServiceProviderService::getMouthPay(true);
       $brand_service = ServiceProviderService::getBrandService(true);
        foreach ($list as $k => $v){
+            if($v['manhourfee'] == ''){
+                $list[$k]['manhourfee'] = SettlementList::where('list_id',$v['serial_number'])->value('order_price')??0;
+            }
            $button = [];
            //订单状态名
            $list[$k]['stauas_name'] = $orderStau[$v['stauas']]??'';

--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -108,7 +108,7 @@ class OrderService extends Service
     * @author dou 2021/9/9 11:58
     * |---------------------------------------------------------------------------------
    */
-    public static function insertOrder ( $order_status , $goods_name , $p_id , $order_num , $sys_num , $customer_id , $new_money , $session , $ser_type , $order_type = 1 , $customer_time , $pay_type = 1 , $category , $good_brand,$company_id=1,$accoun=''){
+    public static function insertOrder ( $order_status , $goods_name , $p_id , $order_num , $sys_num , $customer_id , $new_money , $session , $ser_type , $order_type = 1 , $customer_time , $pay_type = 1 , $category , $good_brand,$company_id=1,$accoun='',$clientAccount = ''){
        $data['order_status'] = $order_status;//订单状态
        $data['goods_name'] = $goods_name;//商品名称
        $data['p_id'] = $p_id;//平台id
@@ -130,6 +130,7 @@ class OrderService extends Service
        $data['goods_brand'] = implode(',',$good_brand);//商品品牌
        $data['company_id'] = $company_id;
        $data['accoun'] = $accoun??'';
+        $data['clientAccount'] = $clientAccount??'';
        $newOrder = Orders::insert($data);
        return $newOrder;
    }
@@ -2962,4 +2963,93 @@ class OrderService extends Service
            CommonService::addLog('库房撤销服务订单', json_encode($inputs), $orders['order_num'], 'warehouse-service');
        }
    }
+    /**|---------------------------------------------------------------------------------
+     * @name 获取京东订单状态
+     * @param string status 订单状态
+     * @param string orderId 订单单号
+     * @param string pt_id 平台id
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2025/2/17 10:56
+     * |---------------------------------------------------------------------------------
+    */
+    public static function getJdOrderStatus ( $orderId , $pt_id , $status = 204 ){
+        $token = DB::table('jdpop_token')->where('pt_id',$pt_id)->select('app_key','app_secret','access_token','pt_id','auth_key','type')->first();
+        if($token['type'] == 2) {
+            $url = "http://116.196.75.172/index.php/SaasApiGetOrder/getDataByOrder?orderId=" . $orderId . "&status=" . $status;
+            $urls = $url."&authKey=".$token['auth_key']."&access_token=".$token['access_token']."&app_key=".$token['app_key']."&app_secret=".$token['app_secret'];
+            $BaseController = new BaseController();
+            $res = $BaseController->http_get($urls);
+            $data = json_decode($res, true);
+            $result = $data['jingdong_omnic_order_getorderlist_responce']['result'];
+            $result = json_decode($result, true);
+            CommonService::addLog('获取取消订单', $urls.'---'.$res, $pt_id, 'orderService-getOrderCancelByJd');
+            if ($result['success'] == true) {
+                $order_data = $result['data'];
+                if (!empty($order_data)) {
+                    $order_data = $order_data['data'];
+                    foreach ($order_data as $kkk => $vvv) {
+                        if($vvv['orderInfo']['salesChannelOrderId'] == $orderId && $vvv['orderInfo']['status']==204){
+                            $flag = 1;
+                            $refundlist = RefundService::getInfoByKeyValue('order_num', $vvv['orderInfo']['salesChannelOrderId'], ['state', 'roPreNo']);
+                            if ($refundlist) {
+                                $rea = '退款已存在';
+                                $flag = 2;
+                            }
+                            if ($flag == 1) {
+                                $refund['order_num'] = $vvv['orderInfo']['salesChannelOrderId'];
+                                $refund['refund'] = 1;
+                                $refund['content'] = '平台订单已撤销';
+                                $refund['urgent'] = 1;
+                                $refund['recycle_type'] = 0;
+                                $refund['roPreNo'] = $vvv['orderInfo']['salesChannelOrderId'];
+                                $sys_num = OrderService::getOrderBy('order_num', $vvv['orderInfo']['salesChannelOrderId'], ['sys_num', 'order_status', 'new_money']);
+                                if ($sys_num) {
+                                    $refund['sys_num'] = $sys_num['sys_num'];
+                                    if ($sys_num['order_status'] > 10) {
+                                        $msg = OrderService::getOrderMsg($sys_num['sys_num']);
+                                    } else {
+                                        $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'] = 'jdRefund';
+                                        $refund['allprice'] = $sys_num['new_money'];
+                                        $session['id'] = '1133';
+                                        $session['admin_acc'] = '系统操作';
+                                        $session['admin_groupnew'] = 7;
+                                        $rea = OrderService::lockOrder($refund, $session, '39.105.188.64');
+                                    } else {
+                                        $rea = '无订单商品';
+                                    }
+                                } else {
+                                    $rea = '无订单号';
+                                }
+                            }
+                            $return[$kkk]['lockOrder'] = $rea;
+                            $return[$kkk]['order_num'] = $vvv['orderInfo']['salesChannelOrderId'];
+                            CommonService::addLog('添加退款单', json_encode($return), $pt_id, 'orderService-addOrderCancels');
+                            return  ['Data' => $order_data,'ErrorMessage'=>'订单已撤销','ErrorCode'=>ErrorInc::BUSINESS_FORBID];
+                        }
+                    }
+                }
+            }
+            return  ['Data' => $result,'ErrorMessage'=>'数据正常','ErrorCode'=>1];
+        }else{
+            return  ['Data' => $token,'ErrorMessage'=>'数据正常','ErrorCode'=>1];
+        }
+    }
 }
--- a/app/Services/OrderaddService.php
+++ b/app/Services/OrderaddService.php
@@ -14,6 +14,7 @@ namespace App\Services;
 use App\Http\Controllers\BaseController;
 use App\Http\Controllers\Orders\AotuorderController;
+use App\Models\Orders;
 use App\Models\PreliminaryNote;
 use App\Models\Region;
 use App\Models\User;
@@ -239,61 +240,10 @@ class OrderaddService extends Service{
        $company_id = $input['company_id']??$session['company_id'];
        $input['order_type'] = 1;
        $input['accoun'] = $input['accoun']??'';
-        $newOrder = OrderService::insertOrder($data['order_status'], $goods_name, $input['pt_id'], $input['skb_bh'], $input['sys_bh'], $customer_id, $new_money, $session, $input['ser_type'], $input['order_type'], $input['order_time'],$input['pay_type'],$ordermsg['category'],$ordermsg['good_brand'],$company_id,$input['accoun']);//添加订单表信息
+        $input['clientAccount'] = $input['clientAccount']??'';
+        $newOrder = OrderService::insertOrder($data['order_status'], $goods_name, $input['pt_id'], $input['skb_bh'], $input['sys_bh'], $customer_id, $new_money, $session, $input['ser_type'], $input['order_type'], $input['order_time'],$input['pay_type'],$ordermsg['category'],$ordermsg['good_brand'],$company_id,$input['accoun'],$input['clientAccount']);//添加订单表信息
        if ($newOrder){
            DB::commit();
-           /* if(in_array('3', $ordermsg['category']) && $source != 2) {
-                $pt = PlatformService::getPtBy('id', $input['pt_id'], ['pt_name','zp_id']);
-                $zhipei['pt_name'] = $pt['pt_name'];
-                $zhipei['pt_id'] = $pt['zp_id'];
-//                $zhipei['pt_name'] = PlatformService::getPtBy('id', $input['pt_id'], ['pt_name']);
-                $zhipei['order_price'] = $new_money;
-                $zhipei['store_name'] = '无';
-                $zhipei['wholestore_name'] = '无';
-                if ($userArr['shr_name']) {
-                    $zhipeiuser['shr_name'] = $userArr['shr_name'];
-                } else {
-                    $zhipeiuser['shr_name'] = '无';
-                }
-                $zhipeiuser['shr_phone'] = $userArr['shr_phone'];
-                $zhipeiuser['shr_sheng'] = $userArr['shr_sheng'];
-                $zhipeiuser['shr_shi'] = $userArr['shr_shi'];
-                //                $zhipeiuser['shr_xian'] = $user['shr_xian'];
-                if ($userArr['shr_xian'] != '') {
-                    $zhipeiuser['shr_xian'] = $userArr['shr_xian'];
-                } else {
-                    $zhipeiuser['shr_xian'] = '无';
-                }
-                if ($userArr['shr_adress'] != '') {
-                    $zhipeiuser['shr_adress'] = $userArr['shr_adress'];
-                } else {
-                    $zhipeiuser['shr_adress'] = '无';
-                }
-                $zhipei['construction_date'] = date("Y-m-d H:i:s");
-                $zhipei['car_brand'] = $userArr['car_make'];
-                $zhipei['car_frame'] = '';
-                $zhipei['order_status'] = $data['order_status'];//订单状态
-                $zhipeigood = [];
-                foreach ($goods as $k => $v) {
-                    //$['cd_id']  商品所属类型
-                    $zhipeigoods['goods_name'] = $v['goods_name'];
-                    $zhipeigoods['goods_number'] = GoodsService::getGoodsByKey('pg_id', $v['goods_id'], ['general_version']);
-                    $zhipeigoods['goods_num'] = $v['goods_num'];
-                    $zhipeigoods['goods_brand'] = $v['goods_brand'];
-                    $zhipeigoods['goods_price'] = $v['goods_price'];
-                    $zhipeigood[$k] = $zhipeigoods;
-                }
-                //print_r($zhipeiuser);
-                $res = zhiPeiOrder::complete($input['skb_bh'], $zhipei, $zhipeigood, $zhipeiuser);
-                //$res['code'] = 200;
-                $inputs['data']['zhipei'] = $zhipei;
-                $inputs['data']['zhipeigood'] = $zhipeigood;
-                $inputs['data']['zhipeiuser'] = $zhipeiuser;
-                $inputs['return'] = $res;
-                CommonService::addLog('库房添加服务订单', json_encode($inputs), $input['skb_bh'],'warehouse-service');
-            }*/
            $preliminary_note = PreliminaryNote::where('order_num',trim($input['skb_bh']))->select('remarks','user','creactid','type','id')->get()->toArray();
            if(!empty($preliminary_note)) {
                foreach( $preliminary_note as $k => $v ){
@@ -302,6 +252,13 @@ class OrderaddService extends Service{
                    PreliminaryNote::where('id',$v['id'])->update($tb_type);
                }
            }
+            if($input['clientAccount']!=''){
+                $ordernum = Orders::where('clientAccount',$input['clientAccount'])->count();
+                if($ordernum>1){
+                    Orders::where('clientAccount',$input['clientAccount'])->update(['repeat_num'=>$ordernum]);
+                    CommonService::accMe($input['sys_bh'],'数量验证','账号多次下单','','2',$session['admin_groupnew'],$session['admin_acc'],$session['id']);
+                }
+            }
            //$this->add_pt_order(trim($input['skb_bh']));
            $BaseController = new BaseController();
            $BaseController->insertingLog("添加订单，",$input['sys_bh'],"添加订单","添加订单",$ip,$session['admin_acc']);

--- a/app/Services/StatementsListService.php
+++ b/app/Services/StatementsListService.php
@@ -517,7 +517,7 @@ class StatementsListService extends Service{
            }
            $passa['til_state'] = '20';
            $passa['til_wats'] = $stl_wat;
-            $ras = TicketList::whereRaw("til_creactime<='".$input['end_time']." 23:59:59' and til_state=10 and til_watnum='' and til_serid = '".$input['stl_serid']."'")->update($passa);
+            $ras = TicketList::whereRaw("til_creactime<='".$input['end_time']." 23:59:59' and til_state=10 and (til_wats='' or til_wats='暂无')  and til_serid = '".$input['stl_serid']."' and company_id = '".$res[0]['company_id']."' and til_state < 30")->update($passa);
            $allmoney3 = TicketList::where('til_wats',$stl_wat)->sum("til_price");
            if($ids) {
                $poss['wat_num'] = $stl_wat;

--- a/routes/api.php
+++ b/routes/api.php
@@ -1167,6 +1167,7 @@ Route::group(
    Route::group(['prefix'=>'jdOrderApi'], function (){
        Route::get('getOrderByJd', 'JdOrderApiController@getOrderByJd');//获取京东社会化门店订单
        Route::get('getOrderCancelAuditList', 'JdOrderApiController@getOrderCancelAuditList');//获取社会化门店获取退款单
+        Route::get('getOrderCancelByJd', 'JdOrderApiController@getOrderCancelByJd');//获取社会化门店获取退款单
    });
    #天猫服务单
 /*    Route::group(['prefix'=>'tmOrder'], function (){