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

app/Http/Controllers/TestController.php

@@ -169,32 +169,8 @@ class TestController extends Controller
 
     public function test()
     {
-        DeliveryAppointmentCar::query()->whereHas("deliveryAppointment",function ($query){
-            /** @var Builder $query */
-            $query->where("appointment_date",date("Y-m-d"))
-                ->where("warehouse_id",2)->whereIn("status",[0,2]);
-        })->where(function ($query){
-            /** @var Builder $query */
-            $query->where("status",1)->orWhereHas("deliveryAppointment",function (Builder $query){
-                $query->where("date_period",">=",0);
-            });
-        })->orderByRaw("(CASE WHEN status=0 THEN 2 WHEN status=2 THEN 3 END),IF(ISNULL(delivery_time),1,0),delivery_time")
-            ->limit(10)->get()->each(function ($car)use(&$list){
-                //$diff = $car->delivery_time ? (strtotime($car->delivery_time)+1799)-time() : 0;
-                dump($car->deliveryAppointment->cars_count);
-                $count = $car->deliveryAppointment->cars_count ?? 0;
-                $list[] = [
-                    "id" => $car->id,
-                    "license_plate_number" => $car->license_plate_number,
-                    "driver_name" => $car->driver_name,
-                    "driver_phone" => $car->driver_phone,
-                    "status" => $car->status,
-                    "cubic_meter" => isset($car->deliveryAppointment->cubic_meter) ? ($count>1 ? $car->deliveryAppointment->cubic_meter."/".$count : $car->deliveryAppointment->cubic_meter) : "",
-                    "tonne" => isset($car->deliveryAppointment->tonne) ? ($count>1 ? $car->deliveryAppointment->tonne."/".$count : $car->deliveryAppointment->tonne) : "",
-                    //"diff" => $diff>0 ? $diff*1000 : 0,
-                ];
-            });
-        dd();
+        $service = new OrderService();
+        dd($service->createInstantBill(Order::query()->find(2617624)));
         return view("test");
     }
 

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

@@ -31,8 +31,7 @@ class ProcessController extends Controller
                 $basCodeMap[$basCode->code] = $basCode->codename_c;
             }
             $docASNs=OracleDOCASNDetail::query()->where("ASNNo",$wms_code)->get();   //入库单
-        }
-        catch (\Exception $e){
+        }catch (\Exception $e){
             return ['error'=>'数据库连接失败'];
         }
         if (count($docASNs)>0){

app/Services/OwnerPriceOperationService.php

@@ -411,9 +411,10 @@ class OwnerPriceOperationService
             if ($result)$rule->unit_price = explode(",",$rule->discount_price)[key($result)]; //满足满减条件，单价调整为满减单价
 
             if ($rule->strategy=='起步'){
-                if ($unitName && $unitName != $units[$rule->unit_id])return -3; //校验单位是否一致
                 $money = $rule->unit_price;
                 $startNumber = $rule->amount;
+                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;

resources/views/customer/project/index.blade.php

@@ -66,7 +66,7 @@
                     <td><span>@{{ owner.customer_name }}</span></td>
                     <td><span>@{{ owner.user_owner_group_name }}</span></td>
                     <td><span>@{{ owner.user_work_group_name }}</span></td>
-                    <td><b>@{{owner.relevance ? owner.relevance.length : 0}}</b>/5</td>
+                    <td><span><b>@{{owner.relevance ? owner.relevance.length : 0}}</b>/5</span></td>
                     <td><span>@{{ owner.created_at }}</span></td>
                     <td><span>@{{ owner.customer_company_name }}</span></td>
                     <td><span>@{{ ownerSubjection[owner.subjection] }}</span></td>