微调

src/Action/Sign.php

@@ -17,7 +17,6 @@ class Sign extends Init
         //        $signMsg = str_replace('\\', '', $signMsg);
         $signMsg    = str_replace(' ', '+', $signMsg);
         $this->sign = $signMsg;
-        info($this->sign);
 
         return $this->checkSign();
 

src/WoUnicom.php

@@ -2,11 +2,14 @@
 
 namespace XuanChen\WoUnicom;
 
+use App\Models\ActivitySchoolOrder;
+use App\Models\ActivityPetroOrder;
 use App\Models\Payment;
 use App\Models\Welfare;
 use App\Models\WelfareOrder;
 use App\Models\WelfarePayment;
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 use XuanChen\WoUnicom\Action\Init;
 use XuanChen\WoUnicom\Action\Order;
 use XuanChen\WoUnicom\Action\Query;
@@ -24,6 +27,7 @@ class WoUnicom
 
     /**
      * Notes: 下单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:36
      * @return \XuanChen\WoUnicom\Action\Order
@@ -39,6 +43,7 @@ class WoUnicom
 
     /**
      * Notes: 查询订单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:39
      * @return \XuanChen\WoUnicom\Action\Query
@@ -53,6 +58,7 @@ class WoUnicom
 
     /**
      * Notes: 退款
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:37
      */
@@ -67,6 +73,7 @@ class WoUnicom
 
     /**
      * Notes: 验签
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 11:51
      * @param $params
@@ -81,6 +88,7 @@ class WoUnicom
 
     /**
      * Notes: 回调数据
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 15:54
      * @param $params
@@ -104,7 +112,7 @@ class WoUnicom
         if ($res === true) {
 
             //福利订单
-            if (str_contains($data['orderid'], 'WEAL')) {
+            if (Str::is('WEAL*', $data['orderid'])) {
                 $order = WelfareOrder::where('orderid', $data['orderid'])->first();
                 if ($order && $order->status == 'UNPAY') {
                     $payment = $order->payment;
@@ -116,14 +124,44 @@ class WoUnicom
                     $order->paid();
                 }
 
+            } elseif (Str::is('AS*', $data['orderid'])) {
+                $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();
+
+                    $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'];
+                    $payment->type         = 'UNICOM';
+                    $payment->paid_at      = Carbon::now();
+                    $payment->save();
+                    $order->paid();
+                }
             } else {
                 $order = \App\Models\Order::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)
+                        ->where('orderable_id', $order->id)
-                                                  ->latest()
+                        ->latest()
-                                                  ->first();
+                        ->first();
 
                     $payment->state        = 'SUCCESS';
                     $payment->out_trade_no = $data['payfloodid'];