会员升级

app/listener/order/Delivery.php

@@ -31,6 +31,7 @@ class Delivery implements ListenerInterface
         [$orderInfo, $storeName, $data, $type] = $event;
 		$orderInfo = is_object($orderInfo) ? $orderInfo->toArray() : $orderInfo;
         $storeName = substrUTf8($storeName, 20, 'UTF-8', '');
+        IntegralJob::dispatchDo('dealOrderIntegral', [$orderInfo]);
         switch ($type) {
             case 1://快递发货
                 //用户推送消息事件

app/services/order/StoreOrderCreateServices.php

@@ -233,7 +233,7 @@ class StoreOrderCreateServices extends BaseServices
         if ($orderInfo['total_price'] < sys_config('min_price', 0) && sys_config('min_price', 0) > 0) {
             throw new ValidateException('下单金额不低于' . sys_config('max_price'));
         }
-        $orderPre = $this->dao->search(['uid' => $uid])->order('add_time', 'desc')->find();
+        $orderPre = $this->dao->search(['uid' => $uid, 'is_del' => 0, 'is_system_del' => 0])->order('add_time', 'desc')->find();
         if ($orderPre && $orderPre['add_time'] > (time() - (sys_config('order_time', 0) * 60))) {
             throw new ValidateException('请等待' . ((sys_config('order_time', 0) * 60) - (time() - $orderPre['add_time'])) . '秒后再下单');
         }

app/services/order/StoreOrderSuccessServices.php

@@ -97,7 +97,6 @@ class StoreOrderSuccessServices extends BaseServices
 //            //订单收货
 //            OrderTakeJob::dispatch([$orderInfo]);
 //        }
-        IntegralJob::dispatchDo('dealOrderIntegral', [$orderInfo]);
         //订单支付成功事件
         $userInfo = app()->make(UserServices::class)->get($orderInfo['uid']);
         event('order.pay', [$orderInfo, $userInfo]);