edit

app/Console/Commands/GetJdOrderCancel.php

+<?php
+
+namespace App\Console\Commands;
+
+use App\Http\Controllers\Api\JdOrderApiController;
+use Illuminate\Console\Command;
+
+class GetJdOrderCancel extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'GetJdOrderCancel';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command GetJdOrderCancel';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        //
+        $getOrder = new JdOrderApiController();
+        $ret = $getOrder->getOrderCancelByJd();
+        print_r($ret);
+    }
+}

app/Console/Kernel.php

@@ -20,7 +20,8 @@ class Kernel extends ConsoleKernel
         Commands\GetJdSelfShhOrder::class,
         Commands\DeductionFee::class,
         Commands\SynJdOrderApi::class,
-        Commands\SynCancelAuditList::class
+        Commands\SynCancelAuditList::class,
+        Commands\GetJdOrderCancel::class
     ];
 
     /**
@@ -41,6 +42,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('DeductionFee')->everyFiveMinutes();//每三十分钟执行一次  everyThirtyMinutes
         $schedule->command('SynJdOrderApi')->everyFiveMinutes();// 抓取京东社会化门店订单 //每五分钟执行一次
         $schedule->command('SynCancelAuditList')->everyFiveMinutes();// 抓取京东社会化门店退款单 //每五分钟执行一次
+        $schedule->command('GetJdOrderCancel')->everyFifteenMinutes();// 抓取京东社会化门店12小时内撤销单 //每十五分钟执行一次
     }
 
     /**

app/Http/Controllers/Api/JdOrderApiController.php

@@ -276,7 +276,7 @@ class JdOrderApiController extends BaseController
                                     if ($sys_num) {
                                         $refund['sys_num'] = $sys_num['sys_num'];
                                         if ($sys_num['order_status'] > 10) {
-                                            $msg = OrderService::getOrderListMsg($sys_num['sys_num']);
+                                            $msg = OrderService::getOrderMsg($sys_num['sys_num']);
                                         } else {
                                             $msg = OrderService::getOrderMsg($sys_num['sys_num']);
                                         }
@@ -321,6 +321,92 @@ class JdOrderApiController extends BaseController
             echo "succese";
         }
     }
+    /**|---------------------------------------------------------------------------------
+     * @name 获取订单列表撤销单
+     * @retrun \Illuminate\Http\JsonResponse /multitype:array
+     * @author dou 2024/12/13 10:48
+     * |---------------------------------------------------------------------------------
+    */
+    public function getOrderCancelByJd( ){
+        $startDate = date("Y-m-d H:i:s",strtotime(" -720 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();
+        foreach($token as $k => $vs) {
+            $urls = $url."&authKey=".$vs['auth_key']."&access_token=".$vs['access_token']."&app_key=".$vs['app_key']."&app_secret=".$vs['app_secret'];
+            $company_id = Pt::where('id',$vs['pt_id'])->value('company_id');
+//            echo $urls;
+            $res = $this->http_get($urls);
+            $ip = $_SERVER["REMOTE_ADDR"];
+            $data = json_decode($res, true);
+            // dump($data);
+            $pt_id = $vs['pt_id'];
+            CommonService::addLog('获取取消订单', $urls.'---'.$res, $vs['pt_id'], 'JdOrderApi-getOrderCancelByJd');
+            $result = $data['jingdong_omnic_order_getorderlist_responce']['result'];
+            $result = json_decode($result, true);
+            if ($result['success'] == true) {
+                $order_data = $result['data'];
+                if (!empty($order_data)) {
+                    if (isset($order_data['data'])) {
+                        $order_data = $order_data['data'];
+                        foreach ($order_data as $kkk => $vvv) {
+                            $flag = 1;
+                            $refundlist = RefundService::getInfoByKeyValue('order_num', $vvv['salesChannelOrderId'], ['state', 'roPreNo']);
+                            if ($refundlist) {
+                                $rea = '退款已存在';
+                                $flag = 2;
+                            }
+                            if ($flag == 1) {
+                                $refund['order_num'] = $vvv['salesChannelOrderId'];
+                                $refund['refund'] = 1;
+                                $refund['content'] = '平台订单已撤销';
+                                $refund['urgent'] = 1;
+                                $refund['recycle_type'] = 0;
+                                $refund['roPreNo'] = $vvv['salesChannelOrderId'];
+                                $sys_num = OrderService::getOrderBy('order_num', $vvv['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['salesChannelOrderId'];
+                        }
+                        CommonService::addLog('添加退款单', json_encode($return), $vs['pt_id'], 'addOrderCancels');
+                    }
+                }
+            }
+        }
+    }
 }

app/Http/Controllers/Api/SynJdPopDataController.php

@@ -49,7 +49,7 @@ class SynJdPopDataController extends BaseController
             $res_ult[$k]['accessToken'] = $v['access_token'];	//token
             $res_ult[$k]['time_start'] = $time_start;				//开始时间
             $res_ult[$k]['time_end'] = $time_end;				//结束时间
-            $res_ult[$k]['setPageSize'] = 20;						//每页条数
+            $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';    //获取的订单字段
 
@@ -62,9 +62,9 @@ class SynJdPopDataController extends BaseController
 
             CommonService::addLog('token1--'.$v['pt_id'], $res, $v['pt_id'],'SynJdPopData-getOrder');
 
-
             $data = json_decode($res,true);
             if($data['jingdong_pop_order_enSearch_responce']['code']==0){
+                $company_id = Pt::where("id",$v['pt_id'])->value('company_id');
 
                 $order_data = $data['jingdong_pop_order_enSearch_responce']['searchorderinfo_result']['orderInfoList'];
                 if(!empty($order_data)){
@@ -197,7 +197,7 @@ class SynJdPopDataController extends BaseController
                             }
 
                             $fullAddress = $fullAddress??$vv['consigneeInfo']['fullAddress'];
-
+                            $fullAddress = str_replace("'", '', $fullAddress);
                             $resjdgoods = DB::table('jdgoods')->where("order_id",$vv['orderId'])->value('id');
                             foreach( $vv['itemInfoList'] as $ka => $va ){
                                 if(!$resjdgoods){
@@ -274,7 +274,7 @@ class SynJdPopDataController extends BaseController
                                 $session['admin_groupnew'] = 7;
                                 $session['admin_acc'] = '系统录入';
                                 $session['id'] = 1133;
-                                $session['company_id'] = 11;
+                                $session['company_id'] = $company_id;
                                 // dump($orders[$kk]);
                                 $return = OrderaddService::addOrder($orders[$kk], $session, $ip);
                                 //    dump($return);

app/Http/Controllers/Common/CommonController.php

@@ -1335,10 +1335,19 @@ class CommonController extends BaseController
      */
     public function getDistributor ( Request $request )
     {
-        $list = DB::table('admin')
-            ->where('admin_groupnew', 3)
-            ->select('id', 'admin_acc', 'admin_name', 'company_name')
-            ->get()->toarray();
+        $session = $request->get('session_token');
+        if($session['admin_groupnew']==8) {
+            $list = DB::table('admin')
+                ->where('admin_groupnew', 3)
+                ->select('id', 'admin_acc', 'admin_name', 'company_name')
+                ->get()->toarray();
+        }else{
+            $list = DB::table('admin')
+                ->where('admin_groupnew', 2)
+                ->where('company_id', $session['company_id'])
+                ->select('id', 'admin_acc', 'admin_name', 'company_name')
+                ->get()->toarray();
+        }
         if($list){
             return $this->success('操作成功', $list);
         }else{

app/Http/Controllers/DatasBase/TipsController.php

@@ -62,7 +62,7 @@ class TipsController extends BaseController
         $timeout = Orders::where('order_status',20)->where('distype',5)->count();
         if($timeout>0){
             $num = count($list);
-            $list[$num]['msg'] = "订单超时未结单";
+            $list[$num]['msg'] = "订单超时未接单";
             $list[$num]['count'] = $timeout;
             $list[$num]['url'] = 'Ordersystem/orders';
         }

app/Http/Controllers/Orders/AftersaleOrderController.php

@@ -712,7 +712,7 @@ class AftersaleOrderController extends BaseController
             $feek_time = date('Y-m-d',strtotime("+1day")).' 17:30:00'; //明天下午5:30时间
             $info['feek_time'] = $feek_time;
             $info['status'] = 10;         //改为处理中
-            $info['day_time'] = $request->input('appoint_time');
+            $info['day_time'] = $request->input('day_time');
             $res = OrderAfter::where('id',$Input['id'])->update($info);
             if ($res){
                 $after_num = OrderAfter::where('id',$Input['id'])->select('after_num','p_id','shr_phone')->first();

app/Services/AftersaleOrderService.php

@@ -370,7 +370,7 @@ class AftersaleOrderService extends Service
             }elseif($v['status']==10){
                 $buttonData[] = 'quality,looktime_sumb';
             }elseif($v['status']==30){
-                $buttonData[] = 'getImgContent,finish_quality,quality_bohuis';
+                $buttonData[] = 'getImgContent,finish_quality,quality_bohuis,lookpics';
             }elseif($v['status']==40){
                 $buttonData[] = 'lookpics,getImgContent';
             }