记录提交

app/Console/Commands/SyncBatchTask.php

@@ -45,7 +45,7 @@ class SyncBatchTask extends Command
         DB::transaction(function ()use($date){
             //获取更新时间与WMS数据
             if (!$date){
-                $valueStore = ValueStore::query()->where("name","wave_last_sync_date")->lockForUpdate()->first();
+                $valueStore = ValueStore::query()->where("name","wave_last_sync_date")->first();
                 $date = $valueStore->value ?? Carbon::now()->subSeconds(65)->toDateTimeString();
             }
 

app/Console/Commands/SyncOrderPackageLogisticRouteTask.php

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 use App\Services\LogService;
 use App\Services\OrderPackageReceivedSyncService;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 class SyncOrderPackageLogisticRouteTask extends Command
 {
@@ -43,10 +44,13 @@ class SyncOrderPackageLogisticRouteTask extends Command
      */
     public function handle()
     {
-        LogService::log(SyncOrderPackageLogisticRouteTask::class, "同步快递信息定时任务启动", '');
+        $usage = memory_get_usage();
+        $exeTime = microtime(true);
         ini_set('memory_limit', '2226M');
         $this->service = app('OrderPackageReceivedSyncService');
         $this->service->syncLogisticRoute();
         $this->service->syncLogisticRouteByAliJiSu();
+        Log::warning("快递路由同步任务",["usage"=>(memory_get_usage()-$usage)/1048576,
+            "elapsedTime"=>round(microtime(true)-$exeTime,3)]);//MB SECOND
     }
 }

app/Http/Controllers/TestController.php

@@ -289,20 +289,14 @@ class TestController extends Controller
     private static $delayedHour = 48;
     public function test(Request $request)
     {
-        \App\Authority::query()->where("name","波次修复")->update([
-            "name"          => "波次恢复",
-        ]);
-        $s = new AuthorityService();
-        $s->removeAdminAuth();
-        dd("OK");
-
-        $s = new LogisticService();
-        dd($s->assertExpressCompany("312087577032867"));
-        dd(DB::connection("aliyunMysql")->select(DB::raw("select * from units limit 1")));
-        $s = new LogisticService();
-        $val = "integer";
-        dd(is_numeric('432128378574910'));
-        dd(eval("return is_{$val}('432128378574910');"));
+
+        echo 'Now memory_get_usage: ' . memory_get_usage() . '<br />';
+        $t1 = microtime(true);
+// ... 执行代码 ...
+        $t2 = microtime(true);
+        echo '耗时'.round($t2-$t1,3).'秒<br>';
+        echo 'Now memory_get_usage: ' . memory_get_usage() . '<br />';
+        return;
         $a = new \App\Http\Controllers\api\thirdPart\syrius\producer\OrderController();
         dd($a->createOrder($this->t1())->body());
     }

app/Jobs/PackageCollectingAllocation.php

@@ -47,7 +47,7 @@ class PackageCollectingAllocation implements ShouldQueue
                     DB::rollBack();
                     Log::warning("自动揽收失败",["message"=>$result["message"],"param"=>$this->orderPackage->logistic_number]);
                     return;
-                }else Log::info("揽收成功",["id"=>$this->orderPackage->id,"number"=>$this->orderPackage->logistic_number]);
+                }
             }else Log::warning("自动揽收异常",["message"=>"未能成功修改揽收标记","param"=>["id"=>$this->orderPackage->id,
                 "number"=>$this->orderPackage->logistic_number],"line"=>$result]);
             DB::commit();

app/Services/OrderService.php

@@ -142,6 +142,7 @@ SQL;
         $edisendflag = $params["edisendflag"] ?? null;
         $manualflag = $params["manualflag"] ?? null;
         $checkAllSign = $params['checkAllSign'] ?? null;
+        $presentDelayed = $params['presentDelayed'] ?? null;
         if ($params["query"] ?? false){
             $sql .= $params["query"];
         }
@@ -153,6 +154,15 @@ SQL;
             $c_tel2 = str_replace("'", '"', $c_tel2);
             $sql .= " AND (c_tel2 like '" . $c_tel2 . "' OR c_tel1 like '" . $c_tel2 . "')";
         }
+        if ($presentDelayed){
+            $dateTime = date("Y-m-d H:i:s");
+            $sql .= <<<SQL
+ AND TO_DATE('{$dateTime}','yyyy-mm-dd,hh24:mi:ss') > TO_DATE(NVL(H_EDI_20,H_EDI_03),'yyyy-mm-dd,hh24:mi:ss')+({$presentDelayed}/24)
+  AND NVL(H_EDI_20,H_EDI_03) IS NOT NULL AND NVL(DOC_ORDER_HEADER.H_EDI_20,DOC_ORDER_HEADER.H_EDI_03) <> 'ERP订单取消' AND SOSTATUS < 63
+  AND ADDTIME > TO_DATE('{$dateTime}','yyyy-mm-dd,hh24:mi:ss')-(({$presentDelayed}/24)+7)
+SQL;
+            $orderdate_start = null;$addtime = null;
+        }
         if ($c_province) {
             $c_province = str_replace("'", '"', $c_province);
             if ($c_province == '空') $sql .= " AND c_province is null";

resources/views/order/index/delivering.blade.php

@@ -558,7 +558,8 @@
                             placeholder: '是否人工回传',
                             data: [{name: 'Y', value: '是'}, {name: 'N', value: '否'}]
                         },
-                        {name: 'delayedDeliver', type: 'input', tip: 'M：延时发货,填写整数,单位/时', placeholder: '延时发货'},
+                        /*{name: 'delayedDeliver', type: 'input', tip: 'M：延时发货,填写整数,单位/时', placeholder: '历史延时发货'},*/
+                        {name: 'presentDelayed', type: 'input', tip: 'M：延时发货,填写整数,单位/时', placeholder: '延时发货'},
                     ],
                 ];
                 this.form = new query({