From b677771328432cc0fc78789722b0858fc9324cd0 Mon Sep 17 00:00:00 2001
From: xuanchen120 <122383162@qq.com>
Date: Wed, 23 Feb 2022 17:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WoUnicom.php | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/WoUnicom.php b/src/WoUnicom.php
index 7dfbf38..db0c286 100644
--- a/src/WoUnicom.php
+++ b/src/WoUnicom.php
@@ -3,6 +3,7 @@
 namespace XuanChen\WoUnicom;
 
 use App\Models\ActivitySchoolOrder;
+use App\Models\ActivityPetroOrder;
 use App\Models\Payment;
 use App\Models\Welfare;
 use App\Models\WelfareOrder;
@@ -26,6 +27,7 @@ class WoUnicom
 
     /**
      * Notes: 下单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:36
      * @return \XuanChen\WoUnicom\Action\Order
@@ -41,6 +43,7 @@ class WoUnicom
 
     /**
      * Notes: 查询订单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:39
      * @return \XuanChen\WoUnicom\Action\Query
@@ -55,6 +58,7 @@ class WoUnicom
 
     /**
      * Notes: 退款
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:37
      */
@@ -69,6 +73,7 @@ class WoUnicom
 
     /**
      * Notes: 验签
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 11:51
      * @param $params
@@ -83,6 +88,7 @@ class WoUnicom
 
     /**
      * Notes: 回调数据
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 15:54
      * @param $params
@@ -122,9 +128,24 @@ class WoUnicom
                 $order = ActivitySchoolOrder::where('orderid', $data['orderid'])->first();
                 if ($order && $order->state == 'UNPAY') {
                     $payment = \App\Models\Payment::where('orderable_type', get_class($order))
-                                                  ->where('orderable_id', $order->id)
-                                                  ->latest()
-                                                  ->first();
+                        ->where('orderable_id', $order->id)
+                        ->latest()
+                        ->first();
+
+                    $payment->state        = 'SUCCESS';
+                    $payment->out_trade_no = $data['payfloodid'];
+                    $payment->type         = 'UNICOM';
+                    $payment->paid_at      = Carbon::now();
+                    $payment->save();
+                    $order->paid();
+                }
+            } elseif (Str::is('ASO*', $data['orderid'])) {
+                $order = ActivityPetroOrder::where('orderid', $data['orderid'])->first();
+                if ($order && $order->state == 'UNPAY') {
+                    $payment = \App\Models\Payment::where('orderable_type', get_class($order))
+                        ->where('orderable_id', $order->id)
+                        ->latest()
+                        ->first();
 
                     $payment->state        = 'SUCCESS';
                     $payment->out_trade_no = $data['payfloodid'];
@@ -138,9 +159,9 @@ class WoUnicom
 
                 if ($order && $order->state == 'UNPAY') {
                     $payment = \App\Models\Payment::where('orderable_type', get_class($order))
-                                                  ->where('orderable_id', $order->id)
-                                                  ->latest()
-                                                  ->first();
+                        ->where('orderable_id', $order->id)
+                        ->latest()
+                        ->first();
 
                     $payment->state        = 'SUCCESS';
                     $payment->out_trade_no = $data['payfloodid'];