allinpay_cnp 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a122d0fc477863ecbad367004a05ecae0b0f1876fe04ba82d3c1e24a6bad69
-  data.tar.gz: 88c28a107d766171b93f35bd0e78ff33324503f85401191e904899dd72a45d0b
+  metadata.gz: 787579a7e6a53167b1a4e104b39333b520e60034f64897e125ddefec64990272
+  data.tar.gz: 7a172d01a6331d8ab71c2407ca6b5b41bf472fb746a26262abb6dad7b554afec
 SHA512:
-  metadata.gz: 6cf074a1b6b0de55d3beb38c9624fc3a784bd5896af05b6f82838fc24b4e0914f769815e5bf6e5345c1752cedc5688a4c1490d423ee6c47b2452ad08dcd33c79
-  data.tar.gz: adfa675fc31a869b101527c8e54aa3b021ff468f8c33254051fb197a22581f3da027cf6af346353041610e6bc7c2669f6c2532e008df3e71d0c6c4b088021870
+  metadata.gz: f7e81f3e83443da5da92bfaa0ae81a43935ee13ae398c823a588789d5355f0cc62fe2dd113b3c27ff1f953dcc64c6b7f7a7195856e4abd10ea649616b71f7b61
+  data.tar.gz: 0e56c1c311629fda04207148a3abb7af9c68c31e8f01989d16a14e72a267621a8ef2c30463d7a024f7edf017641c4f863a2c3d660dc70f6557bcb3b6bcd1a203

data/lib/allinpay_cnp/client.rb

@@ -4,7 +4,15 @@ module AllinpayCnp
   class Client
     VERSION = 'V2.0.0'
 
-    def unified_pay(access_order_id:, amount:, currency:, urls:, **options)
+    def unified_pay(hash_or_opts = nil, **kwargs)
+      opts = (hash_or_opts || {}).merge(kwargs).transform_keys(&:to_sym)
+
+      access_order_id = opts.fetch(:access_order_id)
+      amount          = opts.fetch(:amount)
+      currency        = opts.fetch(:currency)
+      urls            = opts.fetch(:urls)
+      options         = opts.except(:access_order_id, :amount, :currency, :urls)
+
       params = build_unified_pay_params(
         access_order_id: access_order_id,
         amount: amount,
@@ -12,28 +20,42 @@ module AllinpayCnp
         urls: urls,
         **options
       )
+
       request.post(:unified_pay, params)
     end
 
-    def query(ori_access_order_id)
+    def query(hash_or_opts = nil, **kwargs)
+      opts = (hash_or_opts || {}).merge(kwargs).transform_keys(&:to_sym)
+
+      merchant_no = opts.fetch(:merchant_no, config.merchant_id)
+      ori_access_order_id = opts.fetch(:ori_access_order_id)
+
       params = {
         version: VERSION,
-        mchtId: config.merchant_id,
+        mchtId: merchant_no,
         transType: 'Query',
         oriAccessOrderId: ori_access_order_id
       }
       request.post(:quickpay, params)
     end
 
-    def refund(ori_access_order_id:, refund_amount:, access_order_id: nil)
+    def refund(hash_or_opts = nil, **kwargs)
+      opts = (hash_or_opts || {}).merge(kwargs).transform_keys(&:to_sym)
+
+      merchant_no = opts.fetch(:merchant_no)
+      ori_access_order_id = opts.fetch(:ori_access_order_id)
+      refund_amount = opts.fetch(:refund_amount)
+      access_order_id = opts.fetch(:access_order_id, generate_order_id)
+
       params = {
         version: VERSION,
-        mchtId: config.merchant_id,
+        mchtId: merchant_no,
         transType: 'Refund',
         accessOrderId: access_order_id,
         oriAccessOrderId: ori_access_order_id,
-        refundAmount: refund_amount.to_s
-      }
+        refundAmount: refund_amount.to_s,
+        notifyUrl: opts.fetch(:notify_url, nil)
+      }.reject { |_, v| v.nil? }
       request.post(:quickpay, params)
     end
 
@@ -45,6 +67,10 @@ module AllinpayCnp
 
     private
 
+    def generate_order_id
+      Time.now.to_i.to_s
+    end
+
     def config
       AllinpayCnp.config
     end
@@ -53,23 +79,23 @@ module AllinpayCnp
       @request ||= Request.new
     end
 
-    def build_unified_pay_params(access_order_id:, amount:, currency:, urls:, **options)
+    def build_unified_pay_params(access_order_id:, amount:, currency:, urls:, merchant_no: nil, **options)
       build_base_params(access_order_id, amount, currency, urls, options)
         .merge(build_shipping_params(options))
         .merge(build_billing_params(options))
         .compact
     end
 
-    def build_base_params(access_order_id, amount, currency, urls, options)
-      build_order_core_params(access_order_id, amount, currency)
+    def build_base_params(access_order_id, amount, currency, urls, options, merchant_no = nil)
+      build_order_core_params(access_order_id, amount, currency, merchant_no)
         .merge(notify_return_urls(urls))
         .merge(build_base_option_params(options))
     end
 
-    def build_order_core_params(access_order_id, amount, currency)
+    def build_order_core_params(access_order_id, amount, currency, merchant_no = nil)
       {
         version: VERSION,
-        mchtId: config.merchant_id,
+        mchtId: merchant_no || config.merchant_id,
         accessOrderId: access_order_id,
         amount: amount.to_s,
         currency: currency

data/lib/allinpay_cnp/response.rb

@@ -52,7 +52,7 @@ module AllinpayCnp
     end
 
     def payment_url
-      body['paymentUrl'] || body['counterUrl'] || body['url']
+      body['payUrl']
     end
 
     def status

data/lib/allinpay_cnp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AllinpayCnp
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/debug.rb

@@ -0,0 +1,86 @@
+require './allinpay_cnp'
+
+AllinpayCnp.configure do |config|
+  config.merchant_id = '086310058120045'
+  config.private_key = <<~XXX
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFt99S9adbC84l
+LExEF4vjFHiurFNRmBVEMmVVeJQfzQbQ/6fY0s+2Vx0lHVcD5ZVdDRwbTl2LG+8S
+lWH6aXmvOk5j5DI9wGJEwPo2L8GH9RHbHMQu0jr9+UO97kBCjKNZKmWkbNsPrfUb
+HxWuKKFILaZcv4LYNsjBNvVkvRU674lJVQ+TZ8ZsPLvc5+I3anJGLbu5Bt1igqbn
+vpMV1seYsUnNbuDBSoYHl09CPvGRc5krmRyouwwLlXiwcJDNDudl5Uohwj2LCuiC
+TWfkd/Me1ty1YrAZR9a/zh+vM7dLc9aCBnic2/7JYBtPwcKKC0Zix9ODbNehLahE
+Nqvxm9KtAgMBAAECggEAE3lb1rj5Zd9Qy5qEXISRM6mVhWbVwgift5rbHkMFG+i+
+ziEQMCv7Z3NHHJu6MVkQkBy1cv8R+ZyjvInYH6j54kd05yPXyvtC8pCrVGD5x+Fc
+g99ed1ofk1pU0MVBsQxXHnYtkrdiEDZLGQPDx+aalBhi9Wmrgo5K0bUPEIALMkWv
+RIBTkRbA/SB4WatB7zmKJxkqA+YIRzAmLDgUE1qjyhE/1VG/d/aetkwGkMo+HSDU
+x87ERKSbgLCri80UQ9RnMtV/wp9nh0VD3b6+MVFKacfKLHBrAwT3E/8Lv4S0I/Sr
+I94IoxOP4gCxytps+BslNuSCd3mMp8OuxCkqg2PBhQKBgQDmC+SpWH4WU/1XO/w9
+C0HnV7b0mpLt4+BqN/1eHdKK29L4R0iOqRjnO9bCkWGnV8nGU0kzNk9jueK2QBdR
+eOnmwqFCvEaIksyG/sUcHkzCxgtUvHxhy3e9IvjKv/5y47P9w/YgIZn62X+tWsnv
+EzPKPfw2+ALxllkVWZsBqB3hrwKBgQDcBkoL1JRWlrPaaSzcUbyJKUQWwIm9trHj
+XAYzwwsNjhGuV/aefVI7priLOxWR9Djq5IuOabNQ290ve6Bu2BBrEtbIsL/0UXwq
+HAmWXuCFc9/MfocQ+TiE0BuUDKgsYqQU2DE+JLaxvaUv1DNw2bUgm9z3zQyJJed4
+ZAHrYqo0YwKBgE9GGe4hiJG5L7w395wxnOxT1cBE5A0GUfdIhA9Cx6MCTZkxN1ex
+/drxS/iQkM5R+j5VxQvY01LSY8XaIC77M99Jgri0mLnHnKOId/RQnLMh/BWfPl2U
++BY9Tu7Paqe8v/Ha7Z309lLzUIQ0nRG91EMFSTzICnumC9zHnBreDC4RAoGBAMWl
+JKjh6eqqb594MSMsjVcM6awigtkXn05kYPHoeCpR/5IEVHZkjxUkm8v+ZE76+pIO
+gUqJqtms11ELFb/ceUsl3ijjlVssQ4Q0MWyRh9B5mYVB96SIq3uq0cs5X2yXo1tS
+JVH0euTJPfTsAtWRy4IiYOl8mZEtqnNcKtk+hTSPAoGAKSF7NCZU0hQwu/rf8v7v
+go/qdS/oYDUohs5HVLG074Eerb1Q4w/xUfSz8zIJvTg04PLWwiBO3P5hCoXUXEaR
+V3Dl1g4i/pGrurOQQHhH9gdPINGBb7okthIwl02QT1UxX3Ibq1OjuH27qoCRQtWJ
+7oJx+aHeFOuOHjULBy+6/CU=
+-----END PRIVATE KEY-----
+XXX
+  config.public_key = <<~PEM
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsNGWmxYl6uYA/X3k1OOY
+nMlLvmgJpYMvahxDLUc9CEXbaqMoMMuLbsvfR6Zf3JIeYCjjfgNVDJTsJY/HWWbp
+HEd4GvQAgv6wywsQ8AJqIHe3fM3B8iwS3XIxZM9fs92lU+mHuVHQdMvciQyaB3iw
+3IvBBzCEgyqSFcGBrlQOGf1x7fZZKY9RH3EDxqzE+Zrs27BjE8T3sNvUCKcfWGhQ
+GKX80jcqLEnFBl9CIlgL4TRSksQ1U4GhOY0/4Db6UsmbTAQeG2plWgbJ0l0khJ2O
+DYqTtDujl4zN3tGXQ2gwCErxqBbukIFMkT+jS1lxrBeGGrvuOXTz408tDbAsJnbU
+YwIDAQAB
+-----END PUBLIC KEY-----
+PEM
+  config.environment = :test
+  config.logger = Logger.new($stdout)
+end
+
+client = AllinpayCnp.client
+
+# 测试创建订单
+response = client.unified_pay(
+  access_order_id: "TEST_#{Time.now.to_i}",
+  amount: '1.00',
+  currency: 'HKD',
+  urls: {
+    notify_url: 'https://example.com/callback',
+    return_url: 'https://example.com/return'
+  },
+  email: 'test@example.com',
+  product_info: [
+    {
+      # sku: '123456789',
+      productName: 'MacBook Pro'
+      # price: '1.00',
+      # quantity: '1'
+    }
+  ],
+  shipping: {
+    first_name: 'Peter',
+    last_name: 'Zhang',
+    address1: '123 Test Street',
+    city: 'Hong Kong',
+    state: 'Hong Kong',
+    country: 'HK',
+    zip_code: '000000',
+    phone: '12345678'
+  }
+)
+
+q = client.query('TEST_1771053407')
+puts "Success: #{response.success?}"
+puts "Result Code: #{response.result_code}"
+puts "Result Desc: #{response.result_desc}"
+puts "Payment URL: #{response.payment_url}" if response.success?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allinpay_cnp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - DrinE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-05 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,6 +45,7 @@ files:
 - lib/allinpay_cnp/response.rb
 - lib/allinpay_cnp/signature.rb
 - lib/allinpay_cnp/version.rb
+- lib/debug.rb
 homepage: https://github.com/CoolDrinELiu/allinpay
 licenses:
 - MIT