更换目录

app/Admin/Controllers/Unionpay/IndexController.php

@@ -36,7 +36,7 @@ class IndexController extends AdminController
         $grid = new Grid(new UnionpayLog);
 
         $grid->disableActions();
-
+        $grid->disableCreateButton();
         $grid->model()->orderBy('id', 'desc');
 
         $grid->filter(function ($filter) {

composer.json

@@ -46,9 +46,9 @@
             "App\\": "app/",
             "RuLong\\Bonus\\": "packages/bonus/src/",
             "RuLong\\Identity\\": "packages/identity/src/",
-            "XuanChen\\Coupon\\": "packages/coupon/src/",
-            "XuanChen\\UnionPay\\": "packages/unionpay/src/",
-            "XuanChen\\Sinopec\\": "packages/sinopec/src/"
+            "XuanChen\\Coupon\\": "packages/xuanchen/coupon/src/",
+            "XuanChen\\UnionPay\\": "packages/xuanchen/unionpay/src/",
+            "XuanChen\\Sinopec\\": "packages/xuanchen/sinopec/src/"
         },
         "classmap": [
             "database/seeds",

packages/xuanchen/coupon/composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "laravel/framework": "*"
+        "../../../vendor/laravel/framework": "*"
     },
     "autoload": {
         "psr-0": {

packages/xuanchen/sinopec/composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "laravel/framework": "*"
+        "../../../vendor/laravel/framework": "*"
     },
     "autoload": {
         "psr-0": {

packages/xuanchen/unionpay/config/unionpay.php

@@ -103,7 +103,7 @@ return [
             "msg_type",
             "msg_txn_code",
             "msg_crrltn_id",
-            "msg_flg",
+            //            "msg_flg",
             "msg_sender",
             "msg_time",
             "msg_ver",
@@ -115,7 +115,7 @@ return [
             "msg_type",
             "msg_txn_code",
             "msg_crrltn_id",
-            "msg_flg",
+            //            "msg_flg",
             "msg_sender",
             "msg_time",
             "msg_sys_sn",
@@ -128,7 +128,7 @@ return [
             "msg_type",
             "msg_txn_code",
             "msg_crrltn_id",
-            "msg_flg",
+            //            "msg_flg",
             "msg_sender",
             "msg_time",
             "msg_sys_sn",
@@ -140,7 +140,7 @@ return [
             "msg_type",
             "msg_txn_code",
             "msg_crrltn_id",
-            "msg_flg",
+            //            "msg_flg",
             "msg_sender",
             "msg_time",
             "msg_sys_sn",

packages/xuanchen/unionpay/src/Action/Init.php

@@ -2,10 +2,7 @@
 
 namespace XuanChen\UnionPay\Action;
 
-use App\Exceptions\ApiException;
-use App\Exceptions\ApiUnionpayException;
 use App\Models\Log as LogModel;
-use Illuminate\Http\Request;
 
 class Init
 {

packages/xuanchen/unionpay/src/ServiceProvider.php

@@ -13,6 +13,7 @@ class ServiceProvider extends LaravelServiceProvider
      */
     public function register()
     {
+        info('323');
         if ($this->app->runningInConsole()) {
             $this->publishes([__DIR__ . '/../config/unionpay.php' => config_path('unionpay.php')]);
         }

packages/xuanchen/unionpay/src/UnionPay.php

@@ -3,13 +3,10 @@
 namespace XuanChen\UnionPay;
 
 use App\Models\UnionpayLog;
-use App\Models\User;
 use XuanChen\UnionPay\Action\Init;
-use XuanChen\Coupon\Coupon;
 use XuanChen\UnionPay\Action\Query;
 use XuanChen\UnionPay\Action\Redemption;
 use XuanChen\UnionPay\Action\Reversal;
-use XuanChen\UnionPay\Action\Skyxu;
 
 /**
  * 银联入口
@@ -78,6 +75,7 @@ class UnionPay extends Init
                     case '002025'://聚合营销优惠查询接口
                         $action = new Query($this);
                         $action->start();
+                        $this->outdata = $action->back();
                         break;
                     case '002100'://销账交易接口
                         $action = new Redemption($this);
@@ -134,13 +132,17 @@ class UnionPay extends Init
      */
     public function checkInData()
     {
+        try {
             //验签
-        //        $res = $this->checkSign(false, false);
-        //
-        //        if ($res !== true) {
-        //            $this->msg_rsp_code = 9996;
-        //            $this->msg_rsp_desc = '验签失败';
-        //        }
+            $res = $this->checkSign(false, false);
+            if ($res !== true) {
+                $this->msg_rsp_code = 9996;
+                $this->msg_rsp_desc = '验签失败';
+            }
+        } catch (\Exception $e) {
+            $this->msg_rsp_code = 9996;
+            $this->msg_rsp_desc = $e->getMessage();
+        }
 
         if ($this->msg_txn_code && $this->msg_rsp_code == '0000') {
             $rule_code = config('unionpay.validator')[$this->msg_txn_code];