临时提交

app/Http/Controllers/TestController.php

@@ -484,16 +484,10 @@ class TestController extends Controller
         $startDate = \Illuminate\Support\Carbon::parse('2020-05-06 13:16:51')->toDateTimeString();
         /** @var OrderTrackingService $orderTrackingService */
         $orderTrackingService  = app('orderTrackingService');
-
         $orderTrackingService->根据设置从WMS同步追踪货主的订单($startDate);
 
     }
 
-    public function doctype(){
-
-        $a=\Doctrine\DBAL\Types\Type::getTypesMap();
-        dd($a);
-    }
     public function orderTrckingOwnerAll(){
         $owners = Owner::all();
         foreach ($owners as $owner) {
@@ -508,7 +502,7 @@ class TestController extends Controller
         }
     }
 
-    public function updateOrderTracking(){
+    public function updateOrderTracking(){  // update  client  order_remark
         $orderTrackings = OrderTracking::query()
             ->with('commodities.package.order')
             ->get();

app/Services/OrderPackageCommoditiesService.php

@@ -207,10 +207,10 @@ class OrderPackageCommoditiesService
         try {
             if(count($fillables) > 0){
                 OrderPackageCommodities::query()->insert($fillables);
-                LogService::log(__METHOD__,__FUNCTION__,'批量创建'.count($fillables).json_encode($fillables));
+                LogService::log(__METHOD__,__FUNCTION__,'批量创建 OrderPackageCommodities'.count($fillables).json_encode($fillables));
             }
         } catch (\Exception $e) {
-            LogService::log(__METHOD__,__FUNCTION__,'批量创建异常:'.$e->getMessage().$e->getTraceAsString());
+            LogService::log(__METHOD__,__FUNCTION__,'批量创建异常 OrderPackageCommodities error '.json_encode($fillables).$e->getMessage().$e->getTraceAsString());
         } finally {
             $orderIds = data_get($orders,'*.id');
             return Order::query()->with('packages.commodities')->whereIn('id',$orderIds)->get();
@@ -271,6 +271,7 @@ class OrderPackageCommoditiesService
         }catch (\Exception $e) {
             LogService::log(__METHOD__, __FUNCTION__, '添加打包信息失败' . json_encode($newItems).$e->getMessage().$e->getTraceAsString());
         }
+
         if(count($multipleData) > 1){
             try {
                 /** @var BatchUpdateService $batchUpdateService */

app/Services/OrderPackageService.php

@@ -262,7 +262,7 @@ class OrderPackageService
                     //$updateArr['weight'] +=(intval($commodity['weight'] ?? 0) )  * ( intval($packageCommodity['amount'] ?? 0) );
                     //$updateArr['bulk'] += (intval($commodity['bulk']  ?? 0)) * (intval($packageCommodity['amount'] ?? 0) );
                 }
-                if($package['weight'] == $updateArr['weight'] && $package['weight'] == $updateArr['bulk']){
+                if($package['weight'] == $updateArr['weight'] && $package['bulk'] == $updateArr['bulk']){
                     continue;
                 }
                 // 订单同步步时 重量 体积不覆盖已有值