edit

app/ExcelTemp/ExcelTemp.php

@@ -943,6 +943,10 @@ trait ExcelTemp
                 ['field_name' => '12小时履约达标', 'field_value' => 'Standard12Hours', 'field_with' => 20],
                 ['field_name' => '24小时履约达标', 'field_value' => 'Standard24Hours', 'field_with' => 20],
                 ['field_name' => '是否计入时效考核', 'field_value' => 'takeEffect', 'field_with' => 20],
+                ['field_name' => '省份', 'field_value' => 'shr_sheng', 'field_with' => 30],
+                ['field_name' => '城市', 'field_value' => 'shr_shi', 'field_with' => 30],
+                ['field_name' => '区县', 'field_value' => 'shr_xian', 'field_with' => 30],
+                ['field_name' => '详细地址', 'field_value' => 'shr_adress', 'field_with' => 50],
             ]
         ];
 

app/Exports/BasicExport.php

@@ -376,6 +376,10 @@ class BasicExport
             }else{
                 $return[$k]['takeEffect'] = "否";//是否计入时效考核
             }
+            $return[$k]['shr_sheng'] = $v['shr_sheng'];//省份
+            $return[$k]['shr_shi'] = $v['shr_shi'];//城市
+            $return[$k]['shr_xian'] = $v['shr_xian'];//区县
+            $return[$k]['shr_adress'] = $v['shr_adress'];//详细地址
             $highestRow++;
             foreach( $group as $kg => $vg ){
                 if($vg == 'order_num'){

app/Http/Controllers/Dou/MyTestController.php

@@ -13,6 +13,7 @@
 namespace App\Http\Controllers\Dou;
 
 use App\Exports\BasicExport;
+use App\Http\Controllers\Api\SynJdRapidController;
 use App\Http\Controllers\BaseController;
 use App\Http\Controllers\Orders\AotuorderController;
 use App\Models\Admin;
@@ -33,7 +34,7 @@ use BlueCity\Core\Traits\ResourceControllerMethod;
 use App\Services\TechnicalLevelService;
 use BlueCity\Core\Inc\ErrorInc;
 use DB;
-
+use ACES\TDEClient;
 class MyTestController extends BaseController
 {
     public function test ( Request $request ){
@@ -1225,14 +1226,30 @@ class MyTestController extends BaseController
      * |---------------------------------------------------------------------------------
     */
     public function getDataDecrypt ( $input ){
-        $datafullname['accessToken'] = $input['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
-        $datafullname['appKey'] = $input['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84';
-        $datafullname['appSecret'] = $input['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751';
-        $fullname =  $this->decrypt($datafullname,$input['str'],$input['orderId']);
-        echo "解密信息：".$fullname;exit;
+//        $datafullname['accessToken'] = $input['access_token'];//'e0a1c90e617f4b3a9865ed059f99c5f42ztb';
+//        $datafullname['appKey'] = $input['app_key'];;//'41D9668E8CB81C9890A065BEC300FD84';
+//        $datafullname['appSecret'] = $input['app_secret'];//'93bff142bf5c4422ae7bec9eb992e751';
+//        $fullname =  $this->decrypt($datafullname,$input['str'],$input['orderId']);
+//        echo "解密信息：".$fullname;exit;
+//        phpinfo();
+//        die();
+//        $encrypted = base64_decode('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');
+//
+//        // 解密
+//        $decrypted = openssl_decrypt(
+//            $encrypted,
+//            'AES-128-CBC',
+//            '285ad85204144f41',
+//            OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING,
+//            '981bab04953790b1'
+//        );
+        $SynJdRapidController = new SynJdRapidController();
+//        $decrypted = $SynJdRapidController->sysJdData($input['orderId'],$input['token'],$input['type']);
+        $decrypted = $SynJdRapidController->searchJdOrder();
+//        dump($decrypted);
+        return $decrypted;
 
     }
-
     /**|---------------------------------------------------------------------------------
      * @name 计算订单退款
      * @param string ju_ordernum 订单单号

app/Http/Controllers/Orders/OrderListController.php

@@ -750,7 +750,7 @@ class OrderListController extends BaseController
         $id = $request->get('session_token')['id'];
         $db = new OrderList;
         $params = ['sys_num'=>$input['sys_num']];
-        $select = ['order_num','sys_num','serial_number','stauas','ser_id','p_id','order_goods_id','store_type','ol_dispamount','customer_id'];
+        $select = ['order_num','sys_num','serial_number','stauas','ser_id','p_id','order_goods_id','store_type','ol_dispamount','customer_id','company_id'];
         $orderBy = ['stauas'=>'DESC'];
         $orderListArrs = CommonService::getMysqlData($db, $params,$select,$orderBy);
         if(!$orderListArrs){

app/Http/Controllers/Orders/OrdersController.php

@@ -579,7 +579,7 @@ class OrdersController extends BaseController
             if (!empty($sett_status)) {
                 OrderService::updataReplaceMoney($input, $sett_status, $session);
             }
-            if ($input['goods_state'] == 3 || $input['goods_state'] == 4 || $input['goods_state'] == 5) {
+            if (($input['goods_state'] == 3 || $input['goods_state'] == 4 || $input['goods_state'] == 5 ) && $orderinfo['company_id']!=14) {
                 $ArrSett['locksel_type'] = 2;//锁定
                 $submit_stauas = 1;//差额处理，1申请中
             } else {

app/Services/AfterSaleService.php

@@ -226,7 +226,7 @@ class AfterSaleService extends Service
      */
     public static function getButtonDatas($all_button,$list){
 
-    	$labArr = SetmoneyType::where('lt_statues','!=',2)->pluck('sety_name','sety_id')->toArray();
+    	$labArr = SetmoneyType::pluck('sety_name','sety_id')->toArray();
     	foreach ($list as $k => $v){
             $buttonData = [];
     		$list[$k]['labname'] = $labArr[$v['afs_type']];

app/Services/Api/MobileWeb/OrderListService.php

@@ -65,6 +65,10 @@ class OrderListService extends Model
                 $wheres['stauas_searchin'] = [34,40];
             }
         }
+        if(!empty($request['keyword'])) {
+            $wheres['search_searchor']['order_num_like'] = $request['keyword'];
+            $wheres['search_searchor']['shr_name_like'] = $request['keyword'];
+        }
         $wheres = array_merge($where, $wheres);
         $wheres = CommonService::jointWhere($wheres);
         $list_data = $list_data->whereRaw($wheres)

app/Services/Api/MobileWeb/StatementsListService.php

@@ -58,6 +58,9 @@ class StatementsListService extends Model
                 }else {
                     $list_data = $list_data->where('s.ser_id', $session['admin_id']);
                 }
+                if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
+                    $list_data = $list_data->where('s.order_num','like', "%".$request['keyword']."%");
+                }
                 $list_data = $list_data->where('list_service_type', 40)
                 ->whereIn('sett_status', [1,60,63])
                 ->select('s.id','s.order_num as sys_num', 's.create_time', 'all_price', 'list_id', 'om.goods_name', 'om.goods_num', 'o.id as wor_id', 'o.stauas as wor_state')
@@ -204,15 +207,21 @@ class StatementsListService extends Model
             $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'])
+                ->where('s.ser_id', $session['admin_id']);
+                if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
+                    $info_data = $info_data->where('o.order_num','like', "%".$request['keyword']."%");
+                }
+            $info_data = $info_data->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')
                 ->orderBy('s.id', 'asc')
                 ->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')
+            $info_data = TicketList::where('til_wats',$data['stl_wat']);
+                if(isset($request['keyword']) && !empty($request['keyword'])){//查询单号
+                    $info_data = $info_data->where('o.til_ticnum','like', "%".$request['keyword']."%");
+                }
+            $info_data = $info_data->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();

app/Services/CommonService.php

@@ -1824,4 +1824,14 @@ class CommonService extends Service{
             AdminToken::where('at_token',$search_token['at_token'])->insert($arr);
         }
     }
+    public static function https_get ($url){
+        $arrContextOptions=array(
+            "ssl"=>array(
+                "verify_peer"=>false,
+                "verify_peer_name"=>false,
+            ),
+        );
+        $resp = file_get_contents($url, false, stream_context_create($arrContextOptions));
+        return $resp;
+    }
 }

app/Services/DataStatisticsService.php

@@ -178,9 +178,10 @@ class DataStatisticsService extends Service{
         }
         $paginate = OrderList::leftjoin('orders', 'orders.order_num', '=', 'order_list.order_num')
             ->leftjoin('order_msg', 'order_msg.id', '=', 'order_list.order_goods_id')
+            ->leftjoin('user', 'user.id', '=', 'order_list.customer_id')
             ->whereBetween('order_list.create_time',[$time_start,$time_end])
             ->whereRaw("gone_order_list.company_id='".$session['company_id']."' and gone_order_list.is_delete=1".$where)
-            ->selectRaw("(UNIX_TIMESTAMP(gone_order_list.feeds_time)-UNIX_TIMESTAMP(gone_order_list.get_time)) AS sgtime,(UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time)) AS jdtime,stauas,gone_order_list.order_num,gone_order_list.ser_id,gone_order_list.create_time,gone_order_list.get_time,gone_order_list.feeds_time,gone_order_msg.goods_name")
+            ->selectRaw("(UNIX_TIMESTAMP(gone_order_list.feeds_time)-UNIX_TIMESTAMP(gone_order_list.get_time)) AS sgtime,(UNIX_TIMESTAMP(gone_order_list.get_time)-UNIX_TIMESTAMP(gone_order_list.create_time)) AS jdtime,stauas,gone_order_list.order_num,gone_order_list.ser_id,gone_order_list.create_time,gone_order_list.get_time,gone_order_list.feeds_time,gone_order_msg.goods_name,gone_user.shr_sheng,gone_user.shr_shi,gone_user.shr_xian,gone_user.shr_adress")
             ->orderBy('create_time','ASC')
             ->paginate($page_size);
         if ($is_excel == 2) {

app/Services/JdDataService.php

+<?php
+/**
+ * 文件名称（处理京东数据）
+ * 文件简单描述（处理京东数据）
+ * @author DouBin
+ * @Date: 2025/9/18
+ * @Time: 15:59
+ * @Email: db@sudianwang.com
+ * @version 1.0
+ * @copyright BlueCity
+ */
+
+namespace App\Services;
+
+use BlueCity\Core\Service\Service;
+
+class JdDataService extends Service{
+
+    /**|---------------------------------------------------------------------------------
+     * @name 生成签名
+     * @param string $params 参数
+     * @param string $appsecret appsecret
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2025/9/18 15:33
+     * |---------------------------------------------------------------------------------
+     */
+    public static function generateSign($params,$appsecret) {
+        if ($params != null) { // 所有请求参数按照字母先后顺序排序
+            ksort($params);
+            // 定义字符串开始 结尾所包括的字符串
+            $stringToBeSigned = $appsecret;
+            // 把所有参数名和参数值串在一起
+            foreach ($params as $k => $v) {
+                $stringToBeSigned .= "$k$v";
+            }
+            unset($k, $v);
+
+            // 把venderKey加在字符串的两端
+            $stringToBeSigned .= $appsecret;
+        } else {
+            // 定义字符串开始 结尾所包括的字符串
+            $stringToBeSigned = $appsecret;
+            // 把venderKey加在字符串的两端
+            $stringToBeSigned .= $appsecret;
+        }
+        // 使用MD5进行加密，再转化成大写
+
+        return strtoupper(md5($stringToBeSigned));
+    }
+
+    /**|---------------------------------------------------------------------------------
+     * @name 解密京东秒送加密信息
+     * @param string $encrypted 加密信息
+     * @param string $appsecret appsecret
+     * @retrun \Illuminate\Http\JsonResponse
+     * @author dou 2025/9/18 16:03
+     * |---------------------------------------------------------------------------------
+    */
+    public static function decryptAES ( $encrypted,$appsecret ){
+        $k =  substr($appsecret, 0, 16);
+        $v = substr($appsecret, -16);
+        $encrypted = base64_decode($encrypted);
+        $decrypted = openssl_decrypt(
+            $encrypted,
+            'AES-128-CBC',
+            $k,
+            OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING,
+            $v
+        );
+        $decrypted = trim($decrypted);
+        return $decrypted;
+    }
+}

composer.json

@@ -8,6 +8,7 @@
         "php": ">=7.0.0",
         "bluecity/core": "^0.1.23",
         "bluecity/data": "^0.1.9",
+        "bluecity/jos": "1.0.0",
         "chumper/zipper": "^1.0",
         "fideloper/proxy": "~3.3",
         "guzzlehttp/guzzle": "^7.3",
@@ -81,6 +82,10 @@
         "bluecity/data": {
             "type": "git",
             "url": "https://gitlab.bluearp.com/bluecity/data.git"
+        },
+        "bluecity/jos": {
+            "type": "git",
+            "url": "http://gitlab.bluearp.com/bluecity/jos.git"
         }
     }
 }

routes/api.php

@@ -1167,6 +1167,13 @@ Route::group(
     Route::group(['prefix'=>'SynOrderRejected'], function (){
         Route::get('rejectedOrder', 'SynOrderRejectedController@rejectedOrder');//自动拒单
     });
+    #系统任务 >> 京东秒送
+    Route::group(['prefix'=>'SynJdRapid'], function (){
+        Route::post('receiveToken', 'SynJdRapidController@receiveToken');//接收 token
+        Route::post('djsw/newOrder', 'SynJdRapidController@newOrder');//接收 订单
+        Route::post('djsw/userCancelOrder', 'SynJdRapidController@userCancelOrder');//接收 取消订单
+        Route::post('djsw/applyCancelOrder', 'SynJdRapidController@applyCancelOrder');//接收 用户申请取消
+    });
     #系统任务 >> 电话通知
     Route::group(['prefix'=>'SingLeCallByTts'], function (){
         Route::get('getSingleCallByTts', 'SingLeCallByTtsController@getSingleCallByTts');//电话通知