调整日志

config/config.php

@@ -11,11 +11,11 @@ return [
     'uri'           => [
         'unicom' => [
             //下单
-            'order'  => 'https://www.unicompayment.com/wappay3.0/httpservice/wapPayPageAction.do?reqcharset=UTF-8',
+            'order'  => 'https://epay.10010.com/wappay3.0/httpservice/wapPayPageAction.do?reqcharset=UTF-8',
             //查询
-            'query'  => 'https://www.unicompayment.com/CashierWeb/query/order.htm?reqCharSet=UTF-8',
+            'query'  => 'https://epay.10010.com/CashierWeb/query/order.htm?reqCharSet=UTF-8',
             //单笔退款
-            'refund' => 'https://www.unicompayment.com/CashierWeb/trade/singleRefund.htm?reqCharSet=UTF-8',
+            'refund' => 'https://epay.10010.com/CashierWeb/trade/singleRefund.htm?reqCharSet=UTF-8',
         ],
         'ysd'    => [
             'order' => env('APP_URL', 'https://card.ysd-bs.com'),

src/Action/Init.php

@@ -139,7 +139,7 @@ class Init
             $result = (bool) openssl_verify($signStr, $sign, $pub_key_id, 'SHA256');
             openssl_free_key($pub_key_id);
         } else {
-            throw new \Exception('私钥格式有误');
+            throw new \Exception('公钥格式有误');
         }
 
         return $result;
@@ -315,11 +315,15 @@ class Init
 
                 parse_str($content, $data);
 
+                $this->data = $data;
+
                 if ($data['transRet'] != 'SUCCESS') {
                     $this->code    = false;
                     $this->message = $data['resultDis'];
                 }
 
+                $this->code = true;
+
             } else {
                 $this->code    = false;
                 $this->message = '接口错误 Post';

src/Action/Sign.php

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

src/Model/Wounicom.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace XuanChen\WoUnicom\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Wounicom extends Model
+{
+
+    protected $guarded = [];
+    
+    public    $casts   = [
+        'source'    => 'json',
+        'outsource' => 'json',
+    ];
+
+}

src/Traits/Log.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace XuanChen\WoUnicom\Traits;
+
+use XuanChen\WoUnicom\Model\Wounicom as LogModel;
+
+trait Log
+{
+
+    public $log;
+
+    /**
+     * Notes: 输入日志
+     * @Author: 玄尘
+     * @Date  : 2021/5/11 15:58
+     * @param $data
+     */
+    public function createLog($data, $str)
+    {
+        return $this->log = LogModel::create([
+            'orderId'              => $data['orderid'],
+            'payFloodId'           => $data['payfloodid'],
+            'payResult'            => $data['payresult'],
+            'payBalance'           => $data['paybalance'],
+            'paymentBalanceDetail' => $data['paymentbalancedetail'],
+            'respTime'             => $data['resptime'],
+            'source'               => [
+                'data'       => $data,
+                'check_sign' => $str,
+            ],
+        ]);
+    }
+
+    /**
+     * Notes: 更新
+     * @Author: 玄尘
+     * @Date  : 2021/7/23 11:03
+     * @param $data
+     */
+    public function updateLog($data)
+    {
+        $this->log->outsource = $data;
+        $this->log->save();
+    }
+
+}

src/WoUnicom.php

@@ -3,12 +3,16 @@
 namespace XuanChen\WoUnicom;
 
 use App\Models\Payment;
+use App\Models\Welfare;
+use App\Models\WelfareOrder;
+use App\Models\WelfarePayment;
 use Carbon\Carbon;
 use XuanChen\WoUnicom\Action\Init;
 use XuanChen\WoUnicom\Action\Order;
 use XuanChen\WoUnicom\Action\Query;
 use XuanChen\WoUnicom\Action\Refund;
 use XuanChen\WoUnicom\Action\Sign;
+use XuanChen\WoUnicom\Traits\Log;
 
 /**
  * 沃钱包支付
@@ -16,6 +20,8 @@ use XuanChen\WoUnicom\Action\Sign;
 class WoUnicom
 {
 
+    use Log;
+
     /**
      * Notes: 下单
      * @Author: 玄尘
@@ -89,54 +95,50 @@ class WoUnicom
         $res = $this->sign()->setParams($data)->start();
 
         //日志
-        $this->unicomLog($data, $res);
+        $this->createLog($data, $res);
 
         //验签成功
         if ($res === true) {
 
-            $order = \App\Models\Order::where('orderid', $data['orderid'])->first();
+            //福利订单
-            if ($order && $order->state == 'UNPAY') {
+            if (str_contains($data['orderid'], 'WEAL')) {
-                $payment = \App\Models\Payment::where('orderable_type', get_class($order))
+                $order = WelfareOrder::where('orderid', $data['orderid'])->first();
-                                              ->where('orderable_id', $order->id)
+                if ($order && $order->status == 'UNPAY') {
-                                              ->latest()
+                    $payment = $order->payment;
-                                              ->first();
+
+                    $payment->paid([
+                        'type'       => 'UNICOM',
+                        'payfloodid' => $data['payfloodid'],
+                    ]);
+                    $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)
+                                                  ->latest()
+                                                  ->first();
+
+                    $payment->state        = 'SUCCESS';
+                    $payment->out_trade_no = $data['payfloodid'];
+                    $payment->type         = 'UNICOM';
+                    $payment->paid_at      = Carbon::now();
+                    $payment->save();
+                    $order->paid();
+                }
 
-                $payment->state        = 'SUCCESS';
-                $payment->out_trade_no = $data['payfloodid'];
-                $payment->type         = 'UNICOM';
-                $payment->paid_at      = Carbon::now();
-                $payment->save();
-                $order->paid();
             }
+            $this->updateLog(['SUCCESS']);
 
             return 'SUCCESS';
         } else {
+            $this->updateLog(['验签失败']);
+
             return '验签失败';
         }
     }
 
-    /**
-     * Notes: 输入日志
-     * @Author: 玄尘
-     * @Date  : 2021/5/11 15:58
-     * @param $data
-     */
-    public function unicomLog($data, $str)
-    {
-        $inputData = [
-            'orderId'              => $data['orderid'],
-            'payFloodId'           => $data['payfloodid'],
-            'payResult'            => $data['payresult'],
-            'payBalance'           => $data['paybalance'],
-            'paymentBalanceDetail' => $data['paymentbalancedetail'],
-            'respTime'             => $data['resptime'],
-            'source'               => [
-                'data'       => $data,
-                'check_sign' => $str,
-            ],
-        ];
-
-        return \App\Models\Wounicom::create($inputData);
-    }
-
 }