Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/TestController.php

@@ -186,16 +186,18 @@ class TestController extends Controller
     public function restoreResetInstantBill()
     {
         ini_set('max_execution_time', 2500);
-        foreach (OwnerFeeDetail::query()->whereBetween("worked_at",["2021-04-01 00:00:00","2021-04-27 00:00:00"])->cursor() as $detail){
+        $date = \request("date");
+        foreach (OwnerFeeDetail::query()->whereBetween("worked_at",["{$date} 00:00:00","{$date} 23:59:59"])->cursor() as $detail){
             dispatch(new ResetInstantBill($detail));
         }
     }
     public function restoreResetInstantBillOrder()
     {
         ini_set('max_execution_time', 2500);
-        $orders = Order::query()->where("wms_status","订单完成")->whereBetween("updated_at",["2021-04-01 00:00:00","2021-04-27 00:00:00"])
+        $date = \request("date");
+        $orders = Order::query()->where("wms_status","订单完成")->whereBetween("updated_at",["{$date} 00:00:00","{$date} 23:59:59"])
             ->whereNotIn("id",OwnerFeeDetail::query()->select("outer_id")->where("outer_table_name","orders")
-                ->whereBetween("worked_at",["2021-04-01 00:00:00","2021-04-27 00:00:00"]))->get();
+                ->whereBetween("worked_at",["{$date} 00:00:00","{$date} 23:59:59"]))->get();
         foreach ($orders->chunk(50) as $or){
             dispatch(new OrderCreateInstantBill($or));
         }
@@ -203,9 +205,10 @@ class TestController extends Controller
     public function restoreResetInstantBillStore()
     {
         ini_set('max_execution_time', 2500);
-        $stores = Store::query()->where("status","已入库")->whereBetween("updated_at",["2021-04-01 00:00:00","2021-04-27 00:00:00"])
+        $date = \request("date");
+        $stores = Store::query()->where("status","已入库")->whereBetween("updated_at",["{$date} 00:00:00","{$date} 23:59:59"])
             ->whereNotIn("id",OwnerFeeDetail::query()->select("outer_id")->where("outer_table_name","stores")
-                ->whereBetween("worked_at",["2021-04-01 00:00:00","2021-04-27 00:00:00"]))->get();
+                ->whereBetween("worked_at",["{$date} 00:00:00","{$date} 23:59:59"]))->get();
         foreach ($stores->chunk(50) as $st){
             dispatch(new OrderCreateInstantBill($st));
         }

app/Http/Controllers/api/thirdPart/flux/WaybillController.php

@@ -82,7 +82,7 @@ class WaybillController extends Controller
                 'recipient_mobile'=>$recipient_mobile??'',
                 'source_bill'=>$receiveInputting['ReservedField01']??'',
                 'is_to_pay'=>strstr($receiveInputting['CarrierID']??'','DF')===false ? 0 : 1,
-                'destination_city_id'=>app(RegionService::class)->getCity($receiveInputting['C_City']),
+                'destination_city_id'=>$receiveInputting['C_City'] ? app(RegionService::class)->getCity($receiveInputting['C_City']) : null,
             ]);
             $dflist=config('merchantsInfo.waybill.DFList');
             if (isset($dflist[$receiveInputting['CarrierID']]) && $dflist[$receiveInputting['CarrierID']])$waybill->collect_fee=0;

app/Services/OrderService.php

@@ -1106,10 +1106,10 @@ sql
         $weight = 0;
         $logistic_bill = "";
 
+        $isBunched = false;
         if (!$order->logistic || $order->logistic->type == "物流")$logistic_fee = null;
-
+        else $isBunched = $order->logistic->is_bunched=='Y';
         $items = [];
-        $isBunched = $order->logistic->is_bunched=='Y';
         $weightExceptionMark = false;
         $provinceId = null;
         $logisticTaxFee = 0;