diff --git a/app/Admin/Controllers/Unionpay/IndexController.php b/app/Admin/Controllers/Unionpay/IndexController.php index 106554f..a18086d 100644 --- a/app/Admin/Controllers/Unionpay/IndexController.php +++ b/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) { diff --git a/composer.json b/composer.json index b4fe55c..5e45612 100644 --- a/composer.json +++ b/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", diff --git a/packages/coupon/README.md b/packages/xuanchen/coupon/README.md similarity index 100% rename from packages/coupon/README.md rename to packages/xuanchen/coupon/README.md diff --git a/packages/coupon/composer.json b/packages/xuanchen/coupon/composer.json similarity index 91% rename from packages/coupon/composer.json rename to packages/xuanchen/coupon/composer.json index 8380114..fb4ce19 100644 --- a/packages/coupon/composer.json +++ b/packages/xuanchen/coupon/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": ">=7.1.3", - "laravel/framework": "*" + "../../../vendor/laravel/framework": "*" }, "autoload": { "psr-0": { diff --git a/packages/coupon/config/xuanchen_coupon.php b/packages/xuanchen/coupon/config/xuanchen_coupon.php similarity index 100% rename from packages/coupon/config/xuanchen_coupon.php rename to packages/xuanchen/coupon/config/xuanchen_coupon.php diff --git a/packages/coupon/src/Action/Init.php b/packages/xuanchen/coupon/src/Action/Init.php similarity index 100% rename from packages/coupon/src/Action/Init.php rename to packages/xuanchen/coupon/src/Action/Init.php diff --git a/packages/coupon/src/Action/PinganAction.php b/packages/xuanchen/coupon/src/Action/PinganAction.php similarity index 100% rename from packages/coupon/src/Action/PinganAction.php rename to packages/xuanchen/coupon/src/Action/PinganAction.php diff --git a/packages/coupon/src/Action/YsdAction.php b/packages/xuanchen/coupon/src/Action/YsdAction.php similarity index 100% rename from packages/coupon/src/Action/YsdAction.php rename to packages/xuanchen/coupon/src/Action/YsdAction.php diff --git a/packages/coupon/src/Action/pingan/PingAnInit.php b/packages/xuanchen/coupon/src/Action/pingan/PingAnInit.php similarity index 100% rename from packages/coupon/src/Action/pingan/PingAnInit.php rename to packages/xuanchen/coupon/src/Action/pingan/PingAnInit.php diff --git a/packages/coupon/src/Action/pingan/Query.php b/packages/xuanchen/coupon/src/Action/pingan/Query.php similarity index 100% rename from packages/coupon/src/Action/pingan/Query.php rename to packages/xuanchen/coupon/src/Action/pingan/Query.php diff --git a/packages/coupon/src/Action/pingan/Verification.php b/packages/xuanchen/coupon/src/Action/pingan/Verification.php similarity index 100% rename from packages/coupon/src/Action/pingan/Verification.php rename to packages/xuanchen/coupon/src/Action/pingan/Verification.php diff --git a/packages/coupon/src/Action/ysd/YsdDestroy.php b/packages/xuanchen/coupon/src/Action/ysd/YsdDestroy.php similarity index 100% rename from packages/coupon/src/Action/ysd/YsdDestroy.php rename to packages/xuanchen/coupon/src/Action/ysd/YsdDestroy.php diff --git a/packages/coupon/src/Action/ysd/YsdGrant.php b/packages/xuanchen/coupon/src/Action/ysd/YsdGrant.php similarity index 100% rename from packages/coupon/src/Action/ysd/YsdGrant.php rename to packages/xuanchen/coupon/src/Action/ysd/YsdGrant.php diff --git a/packages/coupon/src/Action/ysd/YsdQuery.php b/packages/xuanchen/coupon/src/Action/ysd/YsdQuery.php similarity index 100% rename from packages/coupon/src/Action/ysd/YsdQuery.php rename to packages/xuanchen/coupon/src/Action/ysd/YsdQuery.php diff --git a/packages/coupon/src/Action/ysd/YsdReversal.php b/packages/xuanchen/coupon/src/Action/ysd/YsdReversal.php similarity index 100% rename from packages/coupon/src/Action/ysd/YsdReversal.php rename to packages/xuanchen/coupon/src/Action/ysd/YsdReversal.php diff --git a/packages/coupon/src/Action/ysd/YsdVerification.php b/packages/xuanchen/coupon/src/Action/ysd/YsdVerification.php similarity index 100% rename from packages/coupon/src/Action/ysd/YsdVerification.php rename to packages/xuanchen/coupon/src/Action/ysd/YsdVerification.php diff --git a/packages/coupon/src/Contracts/CheckCouponContracts.php b/packages/xuanchen/coupon/src/Contracts/CheckCouponContracts.php similarity index 100% rename from packages/coupon/src/Contracts/CheckCouponContracts.php rename to packages/xuanchen/coupon/src/Contracts/CheckCouponContracts.php diff --git a/packages/coupon/src/Contracts/CouponContracts.php b/packages/xuanchen/coupon/src/Contracts/CouponContracts.php similarity index 100% rename from packages/coupon/src/Contracts/CouponContracts.php rename to packages/xuanchen/coupon/src/Contracts/CouponContracts.php diff --git a/packages/coupon/src/Coupon.php b/packages/xuanchen/coupon/src/Coupon.php similarity index 100% rename from packages/coupon/src/Coupon.php rename to packages/xuanchen/coupon/src/Coupon.php diff --git a/packages/coupon/src/ServiceProvider.php b/packages/xuanchen/coupon/src/ServiceProvider.php similarity index 100% rename from packages/coupon/src/ServiceProvider.php rename to packages/xuanchen/coupon/src/ServiceProvider.php diff --git a/packages/coupon/src/Traits/Log.php b/packages/xuanchen/coupon/src/Traits/Log.php similarity index 100% rename from packages/coupon/src/Traits/Log.php rename to packages/xuanchen/coupon/src/Traits/Log.php diff --git a/packages/coupon/src/Traits/SetParams.php b/packages/xuanchen/coupon/src/Traits/SetParams.php similarity index 100% rename from packages/coupon/src/Traits/SetParams.php rename to packages/xuanchen/coupon/src/Traits/SetParams.php diff --git a/packages/sinopec/composer.json b/packages/xuanchen/sinopec/composer.json similarity index 91% rename from packages/sinopec/composer.json rename to packages/xuanchen/sinopec/composer.json index f167c49..d92cb3f 100644 --- a/packages/sinopec/composer.json +++ b/packages/xuanchen/sinopec/composer.json @@ -10,7 +10,7 @@ ], "require": { "php": ">=7.1.3", - "laravel/framework": "*" + "../../../vendor/laravel/framework": "*" }, "autoload": { "psr-0": { diff --git a/packages/sinopec/config/xuanchen_coupon.php b/packages/xuanchen/sinopec/config/xuanchen_coupon.php similarity index 100% rename from packages/sinopec/config/xuanchen_coupon.php rename to packages/xuanchen/sinopec/config/xuanchen_coupon.php diff --git a/packages/sinopec/src/Action/Init.php b/packages/xuanchen/sinopec/src/Action/Init.php similarity index 100% rename from packages/sinopec/src/Action/Init.php rename to packages/xuanchen/sinopec/src/Action/Init.php diff --git a/packages/sinopec/src/Action/SinopecAction.php b/packages/xuanchen/sinopec/src/Action/SinopecAction.php similarity index 100% rename from packages/sinopec/src/Action/SinopecAction.php rename to packages/xuanchen/sinopec/src/Action/SinopecAction.php diff --git a/packages/sinopec/src/Action/sinopec/ZhyCreate.php b/packages/xuanchen/sinopec/src/Action/sinopec/ZhyCreate.php similarity index 100% rename from packages/sinopec/src/Action/sinopec/ZhyCreate.php rename to packages/xuanchen/sinopec/src/Action/sinopec/ZhyCreate.php diff --git a/packages/sinopec/src/Action/sinopec/ZhyQuery.php b/packages/xuanchen/sinopec/src/Action/sinopec/ZhyQuery.php similarity index 100% rename from packages/sinopec/src/Action/sinopec/ZhyQuery.php rename to packages/xuanchen/sinopec/src/Action/sinopec/ZhyQuery.php diff --git a/packages/sinopec/src/Contracts/CheckCouponContracts.php b/packages/xuanchen/sinopec/src/Contracts/CheckCouponContracts.php similarity index 100% rename from packages/sinopec/src/Contracts/CheckCouponContracts.php rename to packages/xuanchen/sinopec/src/Contracts/CheckCouponContracts.php diff --git a/packages/sinopec/src/Contracts/CouponContracts.php b/packages/xuanchen/sinopec/src/Contracts/CouponContracts.php similarity index 100% rename from packages/sinopec/src/Contracts/CouponContracts.php rename to packages/xuanchen/sinopec/src/Contracts/CouponContracts.php diff --git a/packages/sinopec/src/ServiceProvider.php b/packages/xuanchen/sinopec/src/ServiceProvider.php similarity index 100% rename from packages/sinopec/src/ServiceProvider.php rename to packages/xuanchen/sinopec/src/ServiceProvider.php diff --git a/packages/sinopec/src/Sinopec.php b/packages/xuanchen/sinopec/src/Sinopec.php similarity index 100% rename from packages/sinopec/src/Sinopec.php rename to packages/xuanchen/sinopec/src/Sinopec.php diff --git a/packages/sinopec/src/Traits/Log.php b/packages/xuanchen/sinopec/src/Traits/Log.php similarity index 100% rename from packages/sinopec/src/Traits/Log.php rename to packages/xuanchen/sinopec/src/Traits/Log.php diff --git a/packages/sinopec/src/Traits/SetParams.php b/packages/xuanchen/sinopec/src/Traits/SetParams.php similarity index 100% rename from packages/sinopec/src/Traits/SetParams.php rename to packages/xuanchen/sinopec/src/Traits/SetParams.php diff --git a/packages/unionpay/README.md b/packages/xuanchen/unionpay/README.md similarity index 100% rename from packages/unionpay/README.md rename to packages/xuanchen/unionpay/README.md diff --git a/packages/unionpay/composer.json b/packages/xuanchen/unionpay/composer.json similarity index 100% rename from packages/unionpay/composer.json rename to packages/xuanchen/unionpay/composer.json diff --git a/packages/unionpay/config/unionpay.php b/packages/xuanchen/unionpay/config/unionpay.php similarity index 98% rename from packages/unionpay/config/unionpay.php rename to packages/xuanchen/unionpay/config/unionpay.php index b0eb83d..dcbb5f9 100644 --- a/packages/unionpay/config/unionpay.php +++ b/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", diff --git a/packages/unionpay/src/Action/Init.php b/packages/xuanchen/unionpay/src/Action/Init.php similarity index 98% rename from packages/unionpay/src/Action/Init.php rename to packages/xuanchen/unionpay/src/Action/Init.php index ec8af27..ab32a85 100644 --- a/packages/unionpay/src/Action/Init.php +++ b/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 { diff --git a/packages/unionpay/src/Action/Query.php b/packages/xuanchen/unionpay/src/Action/Query.php similarity index 100% rename from packages/unionpay/src/Action/Query.php rename to packages/xuanchen/unionpay/src/Action/Query.php diff --git a/packages/unionpay/src/Action/Redemption.php b/packages/xuanchen/unionpay/src/Action/Redemption.php similarity index 100% rename from packages/unionpay/src/Action/Redemption.php rename to packages/xuanchen/unionpay/src/Action/Redemption.php diff --git a/packages/unionpay/src/Action/Reversal.php b/packages/xuanchen/unionpay/src/Action/Reversal.php similarity index 100% rename from packages/unionpay/src/Action/Reversal.php rename to packages/xuanchen/unionpay/src/Action/Reversal.php diff --git a/packages/unionpay/src/Contracts/Contracts.php b/packages/xuanchen/unionpay/src/Contracts/Contracts.php similarity index 100% rename from packages/unionpay/src/Contracts/Contracts.php rename to packages/xuanchen/unionpay/src/Contracts/Contracts.php diff --git a/packages/unionpay/src/ServiceProvider.php b/packages/xuanchen/unionpay/src/ServiceProvider.php similarity index 96% rename from packages/unionpay/src/ServiceProvider.php rename to packages/xuanchen/unionpay/src/ServiceProvider.php index 3ae5baf..5828510 100644 --- a/packages/unionpay/src/ServiceProvider.php +++ b/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')]); } diff --git a/packages/unionpay/src/UnionPay.php b/packages/xuanchen/unionpay/src/UnionPay.php similarity index 94% rename from packages/unionpay/src/UnionPay.php rename to packages/xuanchen/unionpay/src/UnionPay.php index 12c564e..79d9a0c 100644 --- a/packages/unionpay/src/UnionPay.php +++ b/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() { - //验签 - // $res = $this->checkSign(false, false); - // - // if ($res !== true) { - // $this->msg_rsp_code = 9996; - // $this->msg_rsp_desc = '验签失败'; - // } + try { + //验签 + $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];