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

app/Http/Controllers/DeliveryAppointmentController.php

@@ -228,12 +228,12 @@ class DeliveryAppointmentController extends Controller
                 $available = $total-$result->capacity;
                 if ($available < $appointment->capacity)$this->success(["isFail"=>true]);
             }
-            $appointment = $appointment->update([
+            $appointment->update([
                 "appointment_date"      => $selectDate["date"],
                 "date_period"           => $selectDate["time"],
             ]);
         });
-        dispatch(new DeliveryAppointmentCheck($appointment->id))->delay(Carbon::parse($appointment->appointment_date." ".(explode("-",DeliveryAppointment::PERIOD[$appointment->date_period])[1]).":00:01"));
+        dispatch(new DeliveryAppointmentCheck($appointment->id))->delay(Carbon::parse($selectDate["date"]." ".(explode("-",DeliveryAppointment::PERIOD[$selectDate["time"]])[1]).":00:01"));
         $this->success();
     }
 

app/Http/Controllers/TestController.php

@@ -179,16 +179,9 @@ class TestController extends Controller
 
     public function test()
     {
-        $waybills = Waybill::query()->where("status","!=",'已完结')
-            ->whereNull("ordering_remark")->whereNotNull("order_id")->get();
-        foreach ($waybills as $waybill){
-            $notes = DB::connection("oracle")->selectOne(DB::raw("SELECT notes FROM DOC_ORDER_HEADER WHERE ORDERNO = ?"),[$waybill->wms_bill_number]);
-            if ($notes && $notes->notes)$waybill->update(["ordering_remark"=>$notes->notes]);
-        }
-
-       /* $order = Order::query()->find(2734474);
-        $ser = new OrderService();
-        $ser->createInstantBill($order);*/
+        $store = Store::query()->find(164944);
+        $ser = new StoreService();
+        $ser->createInstantBill($store);
     }
     public function restoreResetInstantBill()
     {

app/Services/OwnerPriceOperationService.php

@@ -438,10 +438,10 @@ class OwnerPriceOperationService
             if ($result)$rule->unit_price = explode(",",$rule->discount_price)[key($result)]; //满足满减条件，单价调整为满减单价
 
             if ($rule->strategy=='起步'){
-                $money = $rule->unit_price;
                 $startNumber = $rule->amount;
-                if ($unitName && $startNumber && $unitName != $units[$rule->unit_id])return -3; //校验单位是否一致
+                $money = $startNumber ? $startNumber*$rule->unit_price : $rule->unit_price;
 
+                if ($unitName && $startNumber && $unitName != $units[$rule->unit_id])return -3; //校验单位是否一致
                 if ($startNumber)$matchObject=$this->settingCount($matchObject,$columnMapping[8],$startNumber);
                 if ($matchObject)foreach ($matchObject as $package)$money += $package[$columnMapping[8]] * $package["price"];
                 if (!$startNumber && $money<$rule->unit_price)$money = $rule->unit_price;
@@ -487,6 +487,10 @@ class OwnerPriceOperationService
             if ($package[$amountColumn] <= 0){
                 unset($packages[$i]);continue;
             }
+            if (!($package["price"] ?? false)){
+                $package["price"] = 0;
+                $packages[$i]["price"] = 0;
+            }
             if ($package["price"] > $maxPrice || ($package["price"]==0 && $maxPrice==0)){
                 $maxPrice = $package["price"];
                 $index = $i;