From 8cddeb2387e97e24de6b327c43edf8d16bb93100 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 20 May 2022 17:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E9=87=8D=E5=A4=8D=E7=94=9F=E6=88=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Http/Controllers/Order/OrderPreController.php     | 8 ++++++--
 .../Api/Http/Controllers/Order/UnlineController.php       | 2 +-
 app/Listeners/OrderPackage.php                            | 2 +-
 app/Services/DistributeService.php                        | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php b/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php
index f15ed900..f808dc88 100644
--- a/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php
+++ b/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php
@@ -4,7 +4,7 @@ namespace App\Endpoint\Api\Http\Controllers\Order;
 
 use App\Endpoint\Api\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use App\Models\{OrderPre, ProductSku};
+use App\Models\{Order, OrderPre, ProductSku};
 use App\Models\Store\Store;
 use App\Services\OrderService;
 use Illuminate\Support\Facades\DB;
@@ -107,7 +107,11 @@ class OrderPreController extends Controller
         try {
             DB::beginTransaction();
             $service = new OrderService();
-            $order = $service->createOrderByPre($user, $order_pre);
+            // 如果还有未支付的订单, 则不生成新订单
+            $order = $user->orders()->where('status', Order::STATUS_PENDING)->first();
+            if (!$order) {
+                $order = $service->createOrderByPre($user, $order_pre);
+            }
 
             DB::commit();
             return response()->json([
diff --git a/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php b/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
index c9346698..a61c3ad2 100644
--- a/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
+++ b/app/Endpoint/Api/Http/Controllers/Order/UnlineController.php
@@ -106,7 +106,7 @@ class UnlineController extends Controller
             }
             $package = $service_package->createPackage($order, [
                 'shipping_company' => '提货',
-                'shipping_number' => $user->id,
+                'shipping_number' => 'unline',
                 'packages' => $package_params
             ]);
             $package->update([
diff --git a/app/Listeners/OrderPackage.php b/app/Listeners/OrderPackage.php
index 58110210..75f00599 100644
--- a/app/Listeners/OrderPackage.php
+++ b/app/Listeners/OrderPackage.php
@@ -85,7 +85,7 @@ class OrderPackage
                 if (count($package_params) > 0) {
                     $package = $service_package->createPackage($order, [
                         'shipping_company' => '提货',
-                        'shipping_number' => '0',
+                        'shipping_number' => 'auto',
                         'packages' => $package_params
                     ]);
                     $package->update([
diff --git a/app/Services/DistributeService.php b/app/Services/DistributeService.php
index b817f302..af6db38d 100644
--- a/app/Services/DistributeService.php
+++ b/app/Services/DistributeService.php
@@ -42,14 +42,14 @@ class DistributeService
         ]);
         $user->userInfo()->increment('growth_value', $sales_value);
         // 自动升级代理
-        $levels = Agent::orderBy('sort')->get();
+        $levels = Agent::where('slug', Agent::TYPE_FAVOITE)->orderBy('sort')->get();
         $level_up = '';
         foreach($levels->reverse() as $item) {
             if ($user->userInfo->growth_value >= $item->growth_value) {
                 $level_up = $item;
             }
         }
-        if ($level_up && $level_up->slug === 'favoite') {
+        if ($level_up) {
             $user->update([
                 'agent_id' => $level_up->id,
             ]);
@@ -98,7 +98,7 @@ class DistributeService
     }
 
     /**
-     * 使用微信企业付款
+     * 使用微信企业付款, 支付返利金额
      * 调用之前, 需要提前生成商户订单号
      */
     public function wechatTransfer(OrderProfit $profit)