edit

app/Console/Kernel.php

@@ -38,7 +38,7 @@ class Kernel extends ConsoleKernel
         // $schedule->command('inspire')
         //          ->hourly();
         $schedule->command('getOrder')->everyFiveMinutes();//每五分钟执行一次
-        $schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次
+//        $schedule->command('decJdOrder')->everyFiveMinutes();//每五分钟执行一次
         $schedule->command('SynJdPopCancel')->everyFiveMinutes();//每五分钟一次抓取十二小时内撤销的pop订单
 //        $schedule->command('getJdSelfOrder')->everyFiveMinutes();//每五分钟执行一次
         $schedule->command('getJdSelfRefund')->everyFiveMinutes();//每五分钟执行一次

app/Http/Controllers/Api/SynJdPopDataController.php

@@ -823,7 +823,7 @@ class SynJdPopDataController extends BaseController
      */
     public function decOrder(){
 
-        $token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
+        /*$token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
         foreach ($token as $k =>$v) {
             //  CommonService::addLog('token', json_encode($v['app_key']), $v['pt_id'],'jd_token');
             $res_ult = [];
@@ -861,7 +861,7 @@ class SynJdPopDataController extends BaseController
                 }
             }
 
-        }
+        }*/
     }
 
 

app/Http/Controllers/Api/SynJdPurchaseController.php

@@ -475,7 +475,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
         return $this->decrypt($data,$str);
         exit;*/
 
-        $token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
+       /* $token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
         foreach ($token as $k =>$v) {
             //  CommonService::addLog('token', json_encode($v['app_key']), $v['pt_id'],'jd_token');
             $res_ult = [];
@@ -513,7 +513,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
             }
         }
 
-        }
+        }*/
     }
 
 

app/Http/Controllers/Api/SynJdSelfDataController.php

@@ -557,7 +557,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
         return $this->decrypt($data,$str);
         exit;*/
 
-        $token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
+        /*$token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
         foreach ($token as $k =>$v) {
             //  CommonService::addLog('token', json_encode($v['app_key']), $v['pt_id'],'jd_token');
             $res_ult = [];
@@ -595,7 +595,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
             }
         }
 
-        }
+        }*/
     }
 
 

app/Http/Controllers/Api/SynJdSelfDataNewController.php

@@ -569,7 +569,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
         return $this->decrypt($data,$str);
         exit;*/
 
-        $token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
+        /*$token = DB::table('jdpop_token')->where('status',1)->select('app_key','app_secret','access_token','pt_id')->get()->toarray();
         foreach ($token as $k =>$v) {
             //  CommonService::addLog('token', json_encode($v['app_key']), $v['pt_id'],'jd_token');
             $res_ult = [];
@@ -607,7 +607,7 @@ $url = 'jx.bluearp.com/m/index.php/Automatic/TzPopOrderGetPhone';
             }
         }
 
-        }
+        }*/
     }
 
 

app/Http/Controllers/Dou/MyTestController.php

@@ -1360,9 +1360,9 @@ class MyTestController extends BaseController
             try {
                 //获取取消的订单信息
                 $order1 = RechargeOrder::where('reo_company_id', $v)
-                    ->where('reo_sg', 1)
-                    ->where('reo_type', 2)
-                    ->where('reo_refund', 1)
+                    ->where('reo_sg', 1)//是否已经上图1否2是
+                    ->where('reo_type', 2)//类型1充值2扣费
+                    ->where('reo_refund', 1)//退费类型1未退费2取消退费3阶梯退费
                     ->whereBetween('reo_create_time', [$start_time, $end_time])
                     ->leftjoin('orders', 'orders.order_num', '=', 'recharge_order.reo_order_number')
                     ->whereIn('order_status', [50, 55])

app/Http/Controllers/Orders/OrderListController.php

@@ -1569,11 +1569,13 @@ class OrderListController extends BaseController
             $MsgArr = OrderListService::getOrderMsgById($orderListArr['order_goods_id']);
             $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
                 ->where('ser_id',$orderListArr['ser_id'])
+                ->where('company_id',$orderListArr['company_id'])
                 ->orderBy('id','Desc')
                 ->value('supply_price');
             if(!$supply_price){
                 $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
                     ->where('ser_id',0)
+                    ->where('company_id',$orderListArr['company_id'])
                     ->orderBy('id','Desc')
                     ->value('supply_price');
                 if(!$supply_price){

app/Http/Controllers/Service/SupplierPriceController.php

@@ -565,7 +565,7 @@ public function index(Request $request)
             }else{
                 $poss['ser_id'] = $data['ser_id'];
                 if($data['ser_name']!='统一结算价'){
-                    $ser_id = Admin::where("company_name",$data['ser_name'])->where("company_id",$data['company_id'])->value("id");
+                    $ser_id = Admin::where("company_name",$data['ser_name'])->where("id",$data['ser_id'])->value("id");
                     if(empty($ser_id) || $data['ser_id']!=$ser_id){
                         $res = GhPriceLead::where('id',$data['id'])->where('is_state',1)->update(['is_state'=>'2','state_explain'=>'服务商id与服务商名称不符','update_time'=>date("Y-m-d H:i:s")]);
                         return $this->error('操作失败', ErrorInc::MYSQL_STEP_FAILED, []);

app/Services/Api/MobileWeb/OrderListService.php

@@ -411,11 +411,13 @@ class OrderListService extends Model
         }
         $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
             ->where('ser_id',$orderListArr['ser_id'])
+            ->where('company_id',$orderListArr['company_id'])
             ->orderBy('id','Desc')
             ->value('supply_price');
         if(!$supply_price){
             $supply_price = GhPrice::where('goods_id',$MsgArr['goods_id'])
                 ->where('ser_id',0)
+                ->where('company_id',$orderListArr['company_id'])
                 ->orderBy('id','Desc')
                 ->value('supply_price');
             if(!$supply_price){
@@ -582,7 +584,7 @@ class OrderListService extends Model
                     } else {
                         CommonService::addLog('派单出库失败', $result, $order_num, $filename);
                     }
-                }elseif ($token['type'] == 3 && $order_num=='202606301725'){
+                }elseif ($token['type'] == 3 && $order_num=='2026063017251526'){
                     $data['order_num'] = $order_num;
                     $data['accessToken'] = $token['access_token'];
                     $data['appKey'] = $token['app_key'];
@@ -598,7 +600,7 @@ class OrderListService extends Model
                     } else {
                         CommonService::addLog('派单出库失败', $result, $order_num, $filename);
                     }
-                }elseif ($token['type'] == 4){
+                }elseif ($token['type'] == 4 && $order_num=='2026070611021526'){
                     $data['orderId'] = $order_num;
                     $data['access_token'] = $token['access_token'];
                     $data['app_key'] = $token['app_key'];