From e85fda2b908757483c21f8e12e577ef6afdd08cc Mon Sep 17 00:00:00 2001 From: elf <360197197@qq.com> Date: Tue, 30 May 2023 01:02:20 +0800 Subject: [PATCH] yb --- .../{JinlingCommand.php => MineCommand.php} | 190 ++++-------------- app/Helper/OmiPay/AbstractApi.php | 78 ------- app/Helper/OmiPay/Api.php | 49 ----- app/Helper/OmiPay/Config.php | 21 -- app/Helper/OmiPay/Request/AbstractRequest.php | 34 ---- .../OmiPay/Request/GetExchangeRateRequest.php | 26 --- .../OmiPay/Request/MakeJSAPIOrderRequest.php | 50 ----- .../OmiPay/Request/QueryOrderRequest.php | 14 -- .../OmiPay/Request/QueryRefundRequest.php | 14 -- app/Helper/OmiPay/Request/RefundRequest.php | 22 -- app/Helper/OmiPay/Result.php | 36 ---- app/Helper/OmiPay/Signer.php | 23 --- 12 files changed, 43 insertions(+), 514 deletions(-) rename app/Command/{JinlingCommand.php => MineCommand.php} (50%) delete mode 100644 app/Helper/OmiPay/AbstractApi.php delete mode 100644 app/Helper/OmiPay/Api.php delete mode 100644 app/Helper/OmiPay/Config.php delete mode 100644 app/Helper/OmiPay/Request/AbstractRequest.php delete mode 100644 app/Helper/OmiPay/Request/GetExchangeRateRequest.php delete mode 100644 app/Helper/OmiPay/Request/MakeJSAPIOrderRequest.php delete mode 100644 app/Helper/OmiPay/Request/QueryOrderRequest.php delete mode 100644 app/Helper/OmiPay/Request/QueryRefundRequest.php delete mode 100644 app/Helper/OmiPay/Request/RefundRequest.php delete mode 100644 app/Helper/OmiPay/Result.php delete mode 100644 app/Helper/OmiPay/Signer.php diff --git a/app/Command/JinlingCommand.php b/app/Command/MineCommand.php similarity index 50% rename from app/Command/JinlingCommand.php rename to app/Command/MineCommand.php index fe6a7e5..6cf13aa 100644 --- a/app/Command/JinlingCommand.php +++ b/app/Command/MineCommand.php @@ -4,26 +4,20 @@ declare(strict_types=1); namespace App\Command; -use App\Helper\Efps\Api; -use App\Helper\Signer; use App\Helper\StringHelper; use App\Request\BindCardRequest; use App\Request\PaymentQueryRequest; use App\Request\ProtocolPayConfirmRequest; use App\Request\ProtocolPayPreRequest; use App\Request\RefundQueryRequest; -use App\Request\RegisterRequest; -use App\Service\AppService; -use App\Service\MerchantService; -use App\Service\PaymentService; -use Hyperf\Command\Annotation\Command; +use App\Request\UnBindCardRequest; use Hyperf\Command\Command as HyperfCommand; use Hyperf\Contract\ContainerInterface; /** * @Command */ -class JinlingCommand extends HyperfCommand +class MineCommand extends HyperfCommand { /** * @var ContainerInterface @@ -36,13 +30,13 @@ class JinlingCommand extends HyperfCommand { $this->container = $container; - parent::__construct('jinling'); + parent::__construct('mine'); } public function configure(): void { parent::configure(); - $this->setDescription('廖金灵测试'); + $this->setDescription('我的测试'); } public function handle(): void @@ -53,125 +47,9 @@ class JinlingCommand extends HyperfCommand // $this->confirmPay(); // $this->refund(); // $this->refundQuery(); - $this->paymentQuery(); + // $this->paymentQuery(); + $this->unbindCard(); return; - /*$ret = Api::certifiedPayment([ - 'outTradeNo' => time() . rand(1000, 9999), - 'userName' => 'abc', - 'phoneNum' => '18760419185', - 'bankCardNo' => '6214835911385365', - 'certificatesNo' => '350824199001105476', - 'payAmount' => 100, - ]); - var_dump($ret); - return;*/ - /*$ret = Api::unifiedPayment(); - var_dump($ret); - return;*/ - /*$params = [ - 'app_id' => '202304270000004', - 'timestamp' => time(), - 'nonce_str' => StringHelper::getRandomString(32), - 'data' => json_encode([ - 'test' => 1, - ]), - ]; - $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); - $params['sign'] = $sign; - var_dump($params); - $request = new RegisterRequest($params); - $params = $request->getData(); - var_dump($params); - return;*/ - /*$ret = Api::unifiedPayment(); - var_dump($ret); - return;*/ - /*$ret = Api::register([ - 'merId' => "T100", // 562238003185933 - 'backUrl' => 'http://www.baidu.com', - 'certificateName' => '测试', - 'lawyerCertType' => 0, - 'lawyerCertNo' => '430481198104234557', - 'lawyerCertPhotoFront' => 'http://5b0988e595225.cdn.sohucs.com/images/20191031/e6a31c2611f042bbbfd39297243437a7.png', - 'lawyerCertPhotoBack' => 'http://5b0988e595225.cdn.sohucs.com/images/20191031/e6a31c2611f042bbbfd39297243437a7.png', - 'certificateTo' => '20500211', - 'contactPhone' => '18888888888', - 'accountType' => 3, - 'canDownType' => '01', - ]); - var_dump($ret); - return;*/ - $ret = Api::bindCard([ - 'mchtOrderNo' => time() . rand(1000, 9999), - 'memberId' => 'T01', - 'userName' => '饶丽秀', - 'phoneNum' => '13817896134', - // 'bankCardNo' => '622908113000409396', - 'bankCardNo' => '6212261402022689613', - 'bankCardType' => 'debit', - 'certificatesNo' => '350824199001045864', - ]); - var_dump($ret); - return; - echo \App\Helper\Efps\Signer::sign('sss'); - $sm3 = new \OneSm\Sm3(); - -// 字符串签名 - echo $sm3->sign('abc') . PHP_EOL; - echo $sm3->sign(str_repeat("adfas哈哈哈", 100)) . PHP_EOL; - return; - /** - * @var PaymentService $paymentService - */ - $paymentService = $this->container->make(PaymentService::class); - $paymentService = $this->container->make(PaymentService::class); - $paramsJson = '{"return_code":"SUCCESS","nonce_str":"4a40481401bb47cc81411ab3a8181bad","timestamp":1682659313039,"sign":"5AD859576B783CB44D1FAA0E7DD4C463","order_no":"TR23042830042195760003775","out_order_no":"2023042813194700001","total_amount":2,"currency":"AUD","order_time":"20230428151948","pay_time":"20230428152021","exchange_rate":459899100,"cny_amount":9}'; - $params = json_decode($paramsJson, true); - $ret = $paymentService->notify($params); - var_dump($ret); - return; - $this->buildPayPrams(); - return; - /** - * @var MerchantService $merchantService - */ - $merchantService = $this->container->make(MerchantService::class); - - /** - * @var AppService $appService - */ - $appService = $this->container->make(AppService::class); - $merchant = $merchantService->createMerchant([ - 'username' => 'elf', - 'password' => '123456', - 'email' => '360197197@qq.com', - 'mobile' => '18760419185', - 'ip' => '127.0.0.1', - ]); - $appService->createApp($merchant); - } - - public function buildPayPrams(): void - { - $params = [ - 'app_id' => '202304270000004', - 'timestamp' => time(), - 'nonce_str' => 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O', - ]; - $data = [ - 'order_name' => '测试订单', - 'currency' => 'CNY', - 'amount' => '10', - 'notify_url' => 'https://www.baidu.com', - 'redirect_url' => 'https://www.google.com', - 'out_order_no' => '1122', - 'direct_pay' => 0, - 'show_pc_pay_url' => 0, - ]; - $params['data'] = json_encode($data); - $sign = Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); - $params['sign'] = $sign; - var_dump(json_encode($params)); } public function bindCard() @@ -182,13 +60,12 @@ class JinlingCommand extends HyperfCommand 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ 'mchtOrderNo' => time() . rand(1000, 9999), - 'memberId' => 'T01', - 'userName' => '饶丽秀', - 'phoneNum' => '13817896134', - // 'bankCardNo' => '622908113000409396', - 'bankCardNo' => '6212261402022689613', + 'memberId' => 'ABC', + 'userName' => '测试者', + 'phoneNum' => '18888888888', + 'bankCardNo' => '62122610000000000', 'bankCardType' => 'debit', - 'certificatesNo' => '350824199001045864', + 'certificatesNo' => '350000000000000000', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -206,9 +83,9 @@ class JinlingCommand extends HyperfCommand 'timestamp' => time(), 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ - 'memberId' => 'T01', - 'smsNo' => 'QY202305292233394504122', - 'smsCode' => '485608', + 'memberId' => 'ABC', + 'smsNo' => 'QY888888888888888', + 'smsCode' => '123456', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -228,7 +105,7 @@ class JinlingCommand extends HyperfCommand 'data' => json_encode([ 'memberId' => 'T01', 'outTradeNo' => time() . rand(1000, 9999), - 'protocol' => 'p202305296288304915744', + 'protocol' => 'p88888888888888888', 'payAmount' => 1, ]), ]; @@ -247,9 +124,9 @@ class JinlingCommand extends HyperfCommand 'timestamp' => time(), 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ - 'token' => '83f93a2b0a134d358dde920d9b7abca0', - 'protocol' => 'p202305296288304915744', - 'smsCode' => '466592', + 'token' => 's3skls8d3402skfj23', + 'protocol' => 'p88888888888888888', + 'smsCode' => '123456', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -268,10 +145,10 @@ class JinlingCommand extends HyperfCommand 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ 'outRefundNo' => time() . rand(1000, 9999), - 'remark' => '退款', - 'amount' => 1, - 'refundAmount' => 1, - 'outTradeNo' => '16853732799380', + 'remark' => 'xxx', + 'amount' => 88, + 'refundAmount' => 88, + 'outTradeNo' => '123423423532', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -289,7 +166,7 @@ class JinlingCommand extends HyperfCommand 'timestamp' => time(), 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ - 'outRefundNo' => '16853743952501', + 'outRefundNo' => '237427342388', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -307,7 +184,7 @@ class JinlingCommand extends HyperfCommand 'timestamp' => time(), 'nonce_str' => StringHelper::getRandomString(32), 'data' => json_encode([ - 'outTradeNo' => '16853732799380', + 'outTradeNo' => '3423423432', ]), ]; $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); @@ -317,4 +194,23 @@ class JinlingCommand extends HyperfCommand $params = $request->getData(); var_dump($params); } + + public function unbindCard() + { + $params = [ + 'app_id' => '202304270000004', + 'timestamp' => time(), + 'nonce_str' => StringHelper::getRandomString(32), + 'data' => json_encode([ + 'protocol' => 'p88888888888888888', + 'memberId' => 'ABC', + ]), + ]; + $sign = \App\Helper\Platform\Signer::sign($params, 'lSHKbuFngCXHN8Ue1s8QHAAzPvOL3u9O'); + $params['sign'] = $sign; + var_dump($params); + $request = new UnBindCardRequest($params); + $params = $request->getData(); + var_dump($params); + } } diff --git a/app/Helper/OmiPay/AbstractApi.php b/app/Helper/OmiPay/AbstractApi.php deleted file mode 100644 index 59fc511..0000000 --- a/app/Helper/OmiPay/AbstractApi.php +++ /dev/null @@ -1,78 +0,0 @@ - Config::get('app_id'), - 'timestamp' => TimeHelper::getMillisecond(), - 'nonce_str' => StringHelper::getRandomString(32), - ]; - $params['sign'] = Signer::sign($params); - return $params; - } - - public static function request(AbstractRequest $request) { - $params = self::getCommonParams(); - $params = array_merge($params, $request->getParams()); - try { - Log::info('url:' . $request->getUrl(), [], 'omipay'); - $response = self::getClient()->post($request->getUrl(), [ - 'query' => $params - ]); - Log::info('request:', $params, 'omipay'); - $body = (string)$response->getBody(); - Log::info('response:' . $body, [], 'omipay'); - $result = json_decode($body, true); - if (empty($result)) { - $result = [ - 'return_code' => 'FAIL', - 'error_code' => 'RESPONSE_ERROR', - 'error_msg' => '返回数据异常', - ]; - } - return new Result($result); - } catch (Exception $e) { - Log::error('error:' . $e->getMessage(), [], 'omipay'); - return new Result([ - 'return_code' => 'FAIL', - 'error_code' => 'NETWORK_ERROR', - 'error_msg' => '网络错误', - ]); - } - - } - - protected static function getClient(): Client { - if (!self::$client) { - self::$client = new Client([ - 'base_uri' => Config::get('base_url'), - 'handler' => HandlerStack::create(new CoroutineHandler()), - 'headers' => [ - 'Content-Type' => 'application/json', - ], - 'timeout' => 5, - 'swoole' => [ - 'timeout' => 10, - 'socket_buffer_size' => 1024 * 1024 * 2, - ], - ]); - } - return self::$client; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Api.php b/app/Helper/OmiPay/Api.php deleted file mode 100644 index 93ddbd0..0000000 --- a/app/Helper/OmiPay/Api.php +++ /dev/null @@ -1,49 +0,0 @@ -setCurrency($currency); - $request->setBaseCurrency($baseCurrency); - $request->setPlatform($platform); - $request->setLanguage($language); - return self::request($request); - } - - public static function makeJSAPIOrder($orderName, $outOrderNo, $currency, $amount, $notifyUrl, $redirectUrl) { - $request = new MakeJSAPIOrderRequest(); - $request->setOrderName($orderName); - $request->setCurrency($currency); - $request->setOutOrderNo($outOrderNo); - $request->setAmount($amount); - $request->setNotifyUrl($notifyUrl); - $request->setRedirectUrl($redirectUrl); - $request->setDirectPay(0); - $request->setShowPcPayUrl(0); - return self::request($request); - } - - public static function refund($orderNo, $outRefundNo, $amount) { - $request = new RefundRequest(); - $request->setOrderNo($orderNo); - $request->setOutRefundNo($outRefundNo); - $request->setAmount($amount); - return self::request($request); - } - - public static function queryRefund($refundNo) { - $request = new QueryRefundRequest(); - $request->setRefundNo($refundNo); - return self::request($request); - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Config.php b/app/Helper/OmiPay/Config.php deleted file mode 100644 index 1a25ef9..0000000 --- a/app/Helper/OmiPay/Config.php +++ /dev/null @@ -1,21 +0,0 @@ - '30042195760', - 'secret_key' => 'cea6f34bea8640dea91fd8b7a926a9a5', - 'base_url' => 'https://www.omipay.com.cn', - ]; - - public static function get($key) { - return self::$params[$key] ?: null; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/AbstractRequest.php b/app/Helper/OmiPay/Request/AbstractRequest.php deleted file mode 100644 index 7cb0636..0000000 --- a/app/Helper/OmiPay/Request/AbstractRequest.php +++ /dev/null @@ -1,34 +0,0 @@ -uri; - } - - public function getParams() { - return $this->_params; - } - - public function __get($name) - { - return $this->_params[$name]; - } - - public function __set($name, $value) - { - $this->_params[$name] = $value; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/GetExchangeRateRequest.php b/app/Helper/OmiPay/Request/GetExchangeRateRequest.php deleted file mode 100644 index 159e42a..0000000 --- a/app/Helper/OmiPay/Request/GetExchangeRateRequest.php +++ /dev/null @@ -1,26 +0,0 @@ -currency = $currency; - } - - public function setBaseCurrency($baseCurrency) { - $this->base_currency = $baseCurrency; - } - - public function setPlatform($platform) { - $this->platform = $platform; - } - - public function setLanguage($language) { - $this->language = $language; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/MakeJSAPIOrderRequest.php b/app/Helper/OmiPay/Request/MakeJSAPIOrderRequest.php deleted file mode 100644 index 660a438..0000000 --- a/app/Helper/OmiPay/Request/MakeJSAPIOrderRequest.php +++ /dev/null @@ -1,50 +0,0 @@ -order_name = $orderName; - } - - public function setOutOrderNo($outOrderNo) { - $this->out_order_no = $outOrderNo; - } - - public function setCurrency($currency) { - $this->currency = $currency; - } - - public function setAmount($amount) { - $this->amount = $amount; - } - - public function setNotifyUrl($notifyUrl) { - $this->notify_url = $notifyUrl; - } - - public function setRedirectUrl($redirectUrl) { - $this->redirect_url = $redirectUrl; - } - - public function setDirectPay($directPay) { - $this->direct_pay = $directPay; - } - - public function setShowPcPayUrl($showPcPayUrl) { - $this->show_pc_pay_url = $showPcPayUrl; - } - - public function setONumber($oNumber) { - $this->o_number = $oNumber; - } - - public function setPosNo($posNo) { - $this->pos_no = $posNo; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/QueryOrderRequest.php b/app/Helper/OmiPay/Request/QueryOrderRequest.php deleted file mode 100644 index 2a0aa1c..0000000 --- a/app/Helper/OmiPay/Request/QueryOrderRequest.php +++ /dev/null @@ -1,14 +0,0 @@ -order_no = $orderNo; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/QueryRefundRequest.php b/app/Helper/OmiPay/Request/QueryRefundRequest.php deleted file mode 100644 index dff511c..0000000 --- a/app/Helper/OmiPay/Request/QueryRefundRequest.php +++ /dev/null @@ -1,14 +0,0 @@ -refund_no = $refundNo; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Request/RefundRequest.php b/app/Helper/OmiPay/Request/RefundRequest.php deleted file mode 100644 index ad018e7..0000000 --- a/app/Helper/OmiPay/Request/RefundRequest.php +++ /dev/null @@ -1,22 +0,0 @@ -order_no = $orderNo; - } - - public function setOutRefundNo($outRefundNo) { - $this->out_refund_no = $outRefundNo; - } - - public function setAmount($amount) { - $this->amount = $amount; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Result.php b/app/Helper/OmiPay/Result.php deleted file mode 100644 index 98af0b9..0000000 --- a/app/Helper/OmiPay/Result.php +++ /dev/null @@ -1,36 +0,0 @@ -data = $data; - } - - public function isSuccess() { - return $this->data['return_code'] == 'SUCCESS'; - } - - public function get($key) { - return $this->data[$key] ?? null; - } - - public function toArray() - { - $data = []; - if ($this->isSuccess()) { - $data['is_success'] = true; - $data['pay_url'] = $this->get('casherUrl'); - } else { - $data['error_code'] = $this->get('returnCode'); - $data['error_msg'] = $this->get('returnMsg'); - } - return $data; - } -} \ No newline at end of file diff --git a/app/Helper/OmiPay/Signer.php b/app/Helper/OmiPay/Signer.php deleted file mode 100644 index e8471d8..0000000 --- a/app/Helper/OmiPay/Signer.php +++ /dev/null @@ -1,23 +0,0 @@ -