修不过

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,6 +2,9 @@
 
 namespace XuanChen\WoUnicom;
 
+use App\Helpers\Helper;
+use App\Models\ActivitySchoolOrder;
+use App\Models\ActivityPetroOrder;
 use App\Models\Payment;
 use App\Models\Welfare;
 use App\Models\WelfareOrder;
@@ -25,6 +28,7 @@ class WoUnicom
 
     /**
      * Notes: 下单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:36
      * @return \XuanChen\WoUnicom\Action\Order
@@ -40,6 +44,7 @@ class WoUnicom
 
     /**
      * Notes: 查询订单
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:39
      * @return \XuanChen\WoUnicom\Action\Query
@@ -54,6 +59,7 @@ class WoUnicom
 
     /**
      * Notes: 退款
+     *
      * @Author: 玄尘
      * @Date  : 2021/4/30 9:37
      */
@@ -68,6 +74,7 @@ class WoUnicom
 
     /**
      * Notes: 验签
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 11:51
      * @param $params
@@ -82,6 +89,7 @@ class WoUnicom
 
     /**
      * Notes: 回调数据
+     *
      * @Author: 玄尘
      * @Date  : 2021/5/11 15:54
      * @param $params
@@ -103,9 +111,9 @@ class WoUnicom
 
         //验签成功
         if ($res === true) {
-
-            //福利订单
-            if (Str::is('WEAL*', $data['orderid'])) {
+            $channel = Helper::getChannel($data['orderid']);
+            switch ($channel) {
+                case 'welfare':
                     $order = WelfareOrder::where('orderid', $data['orderid'])->first();
                     if ($order && $order->status == 'UNPAY') {
                         $payment = $order->payment;
@@ -116,12 +124,11 @@ class WoUnicom
                         ]);
                         $order->paid();
                     }
-
-            } else {
-                $order = \App\Models\Order::where('orderid', $data['orderid'])->first();
-
+                    break;
+                case 'school':
+                    $order = ActivitySchoolOrder::where('orderid', $data['orderid'])->first();
                     if ($order && $order->state == 'UNPAY') {
-                    $payment = \App\Models\Payment::where('orderable_type', get_class($order))
+                        $payment = Payment::where('orderable_type', get_class($order))
                             ->where('orderable_id', $order->id)
                             ->latest()
                             ->first();
@@ -133,14 +140,45 @@ class WoUnicom
                         $payment->save();
                         $order->paid();
                     }
+                    break;
+                case 'petro':
+                    $order = ActivityPetroOrder::where('orderid', $data['orderid'])->first();
+                    if ($order && $order->state == 'UNPAY') {
+                        $payment = 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();
+                    }
+                    break;
+                case 'web':
+                default:
+                    $order = \App\Models\Order::where('orderid', $data['orderid'])->first();
+                    if ($order && $order->state == 'UNPAY') {
+                        $payment = 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();
+                    }
+                    break;
             }
             $this->updateLog(['SUCCESS']);
-
             return 'SUCCESS';
         } else {
             $this->updateLog(['验签失败']);
-
             return '验签失败';
         }
     }