chan_pay 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d7c70b34dbd0487cd8238f9399de59df96fb316
-  data.tar.gz: f81dd32e452c871df1d20f581871f547434cf3a3
+  metadata.gz: b3d9ed83edfada8388e102fcd1345977c5cf9108
+  data.tar.gz: d9b0a665d39ed30a1600844cfd1ec8ff87a28b9c
 SHA512:
-  metadata.gz: 2e49ecda7d3418f8539d51b30a0f743bb405b856d5f7a0b291c8cc500ebf244a7f3537f412fb9f8f00a130eb1efecc40c581c2ee15ec05cb80ba13b2cba66fad
-  data.tar.gz: d245c4b2650720f459cc110efbba8ce9c1490d645bfccee9656a57c8133d0227cd50fb29555f56b2f2d2aabb51102fcc85d557cb459cc752fea9d6bef17caed8
+  metadata.gz: 122a3f26eefd382947f1b2dacd3cc6c18bbefdbb75f1fe71c5bbffc3ab238e42d73eeded8c7c5c0181acf48725a48dd6d5698595a3745b3060c945e65b9778ab
+  data.tar.gz: ed1397100c2a5f4d73aa66db390305b7b475d471615b9fee0bea1370d8a84edc9653763b1b7e9aaeec717da4a8017afdc5f8a4f7a651aefda32143d80acb70ec

data/lib/chan_pay/api/query_balance.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+# 4.2.13 商户余额查询
+
+module ChanPay
+  module Api
+    module QueryBalance
+
+      SERVICE_NAME = 'cjt_dsf'
+
+      # 商户余额查询
+      #
+      # @param flow_id [String] 订单号（需要保证唯一）
+      #
+      # @return [Hash] 返回结果集
+      #
+      def query_balance(flow_id)
+        params = {
+          :TransCode => 'C00005',
+          :OutTradeNo => flow_id,
+        }
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        {
+          result: response[:AcceptStatus],
+          balance: response[:RecBalance].to_f,
+        }
+      end
+
+    end
+  end
+end

data/lib/chan_pay/api/query_order.rb

@@ -8,14 +8,48 @@ module ChanPay
 
       SERVICE_NAME = 'nmg_api_query_trade'
 
-      def query_order(flow_id, vendor_order_id)
+      # 确认收货接口
+      #
+      # @param flow_id [String] 订单号（需要保证唯一）
+      # @param ori_flow_id [String] 原业务订单号
+      #
+      # @return [Hash] 返回结果集
+      #
+      def query_order(flow_id, ori_flow_id)
         params = {
           :TrxId => flow_id,
-          :OrderTrxId => vendor_order_id,
+          :OrderTrxId => ori_flow_id,
           :TradeType => 'pay_order',
         }
 
         response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:RetMsg],
+          ret_code: response[:RetCode],
+          flow_id: response[:TrxId],
+          vendor_order_id: response[:OrderTrxid],
+          extension: response[:Extension],
+          log: [params.to_json, response.to_json],
+        }
+
+        # 因为是查询，所以如果受理失败，状态还是按 P
+        if response[:AcceptStatus] == 'F'
+          res[:result] = 'P'
+        end
+
+        # 受理成功但是结果失败
+        if response[:AcceptStatus] == 'S' && response[:Status] == 'F'
+          res[:result] = 'F'
+        end
+
+        # 受理成功并且结果成功，才是成功
+        if response[:AcceptStatus] == 'S' && response[:Status] == 'S'
+          res[:result] = 'S'
+        end
+
+        res
       end
 
     end

data/lib/chan_pay/api/quick_pay.rb

@@ -46,24 +46,6 @@ module ChanPay
         params[:CstmrNm]  = Encrypt::RSA.encrypt(@public_key, true_name)
         params[:MobNo]    = Encrypt::RSA.encrypt(@public_key, phone)
 
-        # api 返回
-        # TrxId, 商户网站唯一订单号, String(32)
-        # OrderTrxId, 畅捷流水号, String(32)
-        # Status, 订单状态, String(2), S:成功，F:失败；P：处理中
-        # RetCode, 业务返回码, String(64)
-        # RetMsg, 返回描述, String (200)
-        # Extension, 扩展字段, String(4000), json格式
-        # 例子：
-        # {:AcceptStatus=>"S",
-        #  :InputCharset=>"UTF-8",
-        #  :OrderTrxid=>"101150831263182558262",
-        #  :PartnerId=>"200001280051",
-        #  :RetCode=>"S0001",
-        #  :RetMsg=>"受理成功",
-        #  :Status=>"S",
-        #  :TradeDate=>"20171018",
-        #  :TradeTime=>"154354",
-        #  :TrxId=>"1508312631562"}
         response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
 
         res = {

data/lib/chan_pay/api/sms_pay_confirm.rb

@@ -0,0 +1,58 @@
+# coding: utf-8
+
+# 4.4.2.6 支付确认接口（API）
+
+module ChanPay
+  module Api
+    module SmsPayConfirm
+
+      SERVICE_NAME = 'nmg_api_quick_payment_smsconfirm'
+
+      # 支付确认接口
+      #
+      # @param flow_id [String] 订单号（需要保证唯一）
+      # @param ori_flow_id [String] 原发短信验证码订单号
+      # @param sms [String] 验证码
+      #
+      # @return [Hash] 返回结果集
+      #
+      def sms_pay_confirm(flow_id, ori_flow_id, sms)
+        params = {
+          :TrxId => flow_id.to_s, # 最长 32 位唯一订单号
+          :OriPayTrxId => ori_flow_id,
+          :SmsCode => sms,
+        }
+
+        # 这里是明文参数输出
+        puts "\n[#{SERVICE_NAME}] 请求参数为：\n#{params.inspect}"
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:RetMsg],
+          ret_code: response[:RetCode],
+          # TODO(tony): 本来这个字段应该是 flow_id，但是目前返回不是，畅捷正在和技术确认中
+          # flow_id: response[:TrxId],
+          flow_id: flow_id,
+          vendor_order_id: response[:OrderTrxid],
+          extension: response[:Extension],
+          log: [params.to_json, response.to_json],
+        }
+
+        # 受理失败 || 受理成功但是结果失败
+        if response[:AcceptStatus] == 'F' || (response[:AcceptStatus] == 'S' && response[:Status] == 'F')
+          res[:result] = 'F'
+        end
+
+        # 受理成功并且结果成功，才是成功
+        if response[:AcceptStatus] == 'S' && response[:Status] == 'S'
+          res[:result] = 'S'
+        end
+
+        res
+      end
+
+    end
+  end
+end

data/lib/chan_pay/api/sms_pay_request.rb

@@ -0,0 +1,79 @@
+# coding: utf-8
+
+# 4.4.2.7 直接支付请求接口（API）
+
+module ChanPay
+  module Api
+    module SmsPayRequest
+
+      SERVICE_NAME = 'nmg_zft_api_quick_payment'
+
+      # 快捷直接支付请求接口
+      #
+      # @param flow_id [String] 订单号（需要保证唯一）
+      # @param user_id [String] 唯一用户识别号，比如数据库 ID（但要考虑分布式）
+      # @param card_id [String] 支付银行卡号
+      # @param identity_id [String] 身份证号
+      # @param true_name [String] 真实姓名
+      # @param phone [String] 银行卡预留手机号
+      # @param money [String] 支付金额（单位：元，精确到 2 位小数点）
+      #
+      # @return [Hash] 返回结果集
+      #
+      def sms_pay_request(flow_id, user_id,
+                          card_id, identity_id, true_name, phone, money)
+        params = {
+          :TrxId => flow_id.to_s, # 最长 32 位唯一订单号
+          :OrdrName => '快捷充值', # 商品名称
+          :MerUserId => user_id, # 商户网站用户唯一标识，不建议手机号
+          :SellerId => @seller_id, # 畅捷提供的商户编号
+          :ExpiredTime => '90m', # 订单有效期
+          :BkAcctTp => '01', # 卡类型
+          :BkAcctNo => card_id, # 卡号，需要 rsa 加密
+          :IDTp => '01', # 证件类型，01 身份证
+          :IDNo => identity_id, # 证件号，rsa 加密
+          :CstmrNm => true_name, # 持卡人姓名，rsa 加密
+          :MobNo => phone, # 银行预留手机号，rsa 加密
+          :TradeType => '11', # 交易类型（即时 11 担保 12）
+          :TrxAmt => money.to_s, # 交易金额
+          # 'NotifyUrl' => '', # 异步通知地址，可空
+          # 'Extension' => '', # 扩展字段，可空
+        }
+
+        # 这里是明文参数输出
+        puts "\n[#{SERVICE_NAME}] 请求参数为：\n#{params.inspect}"
+
+        # 敏感字段加密
+        params[:BkAcctNo] = Encrypt::RSA.encrypt(@public_key, card_id)
+        params[:IDNo]     = Encrypt::RSA.encrypt(@public_key, identity_id)
+        params[:CstmrNm]  = Encrypt::RSA.encrypt(@public_key, true_name)
+        params[:MobNo]    = Encrypt::RSA.encrypt(@public_key, phone)
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:RetMsg],
+          ret_code: response[:RetCode],
+          flow_id: response[:TrxId],
+          vendor_order_id: response[:OrderTrxid],
+          extension: response[:Extension],
+          log: [params.to_json, response.to_json],
+        }
+
+        # 受理失败 || 受理成功但是结果失败
+        if response[:AcceptStatus] == 'F' || (response[:AcceptStatus] == 'S' && response[:Status] == 'F')
+          res[:result] = 'F'
+        end
+
+        # 受理成功并且结果成功，才是成功
+        if response[:AcceptStatus] == 'S' && response[:Status] == 'S'
+          res[:result] = 'S'
+        end
+
+        res
+      end
+
+    end
+  end
+end

data/lib/chan_pay/api/sms_pay_resend.rb

@@ -0,0 +1,57 @@
+# coding: utf-8
+
+# 4.4.2.11 短信验证码重发接口
+
+module ChanPay
+  module Api
+    module SmsPayResend
+
+      SERVICE_NAME = 'nmg_api_quick_payment_resend'
+
+      # 短信验证码重发接口
+      #
+      # @param flow_id [String] 订单号（需要保证唯一）
+      # @param ori_flow_id [String] 原发短信验证码订单号
+      #
+      # @return [Hash] 返回结果集
+      #
+      def sms_pay_resend(flow_id, ori_flow_id)
+        params = {
+          :TrxId => flow_id.to_s, # 最长 32 位唯一订单号
+          :OriTrxId => ori_flow_id,
+          :TradeType => 'pay_order',
+        }
+
+        # 这里是明文参数输出
+        puts "\n[#{SERVICE_NAME}] 请求参数为：\n#{params.inspect}"
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:RetMsg],
+          ret_code: response[:RetCode],
+          # TODO(tony): 本来这个字段应该是 flow_id，但是目前返回不是，畅捷正在和技术确认中
+          # flow_id: response[:TrxId],
+          flow_id: flow_id,
+          vendor_order_id: response[:OrderTrxid],
+          extension: response[:Extension],
+          log: [params.to_json, response.to_json],
+        }
+
+        # 受理失败 || 受理成功但是结果失败
+        if response[:AcceptStatus] == 'F' || (response[:AcceptStatus] == 'S' && response[:Status] == 'F')
+          res[:result] = 'F'
+        end
+
+        # 受理成功并且结果成功，才是成功
+        if response[:AcceptStatus] == 'S' && response[:Status] == 'S'
+          res[:result] = 'S'
+        end
+
+        res
+      end
+
+    end
+  end
+end

data/lib/chan_pay/client.rb

@@ -7,6 +7,10 @@ module ChanPay
 
     include ChanPay::Api::QuickPay
     include ChanPay::Api::QueryOrder
+    include ChanPay::Api::QueryBalance
+    include ChanPay::Api::SmsPayRequest
+    include ChanPay::Api::SmsPayConfirm
+    include ChanPay::Api::SmsPayResend
 
     def initialize(options_arg)
       options = Utils.symbolize_keys(options_arg)

data/lib/chan_pay/sign/rsa.rb

@@ -12,7 +12,9 @@ module ChanPay
       def self.verify?(key, hash, sign)
         content = link_hash(hash)
         rsa = OpenSSL::PKey::RSA.new(key)
-        rsa.verify('sha1', Base64.strict_decode64(sign), content)
+        result = rsa.verify('sha1', Base64.strict_decode64(sign), content)
+        puts "\nrsa verify：#{result}; 回过来的 sign 为：#{sign}\n" unless result
+        result
       end
 
       private

data/lib/chan_pay/version.rb

@@ -1,3 +1,3 @@
 module ChanPay
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/chan_pay.rb

@@ -10,8 +10,12 @@ require "chan_pay/sign/rsa"
 require "chan_pay/encrypt/rsa"
 require "chan_pay/http/ret_code"
 require "chan_pay/http/communicate"
+require "chan_pay/api/sms_pay_request"
+require "chan_pay/api/sms_pay_confirm"
+require "chan_pay/api/sms_pay_resend"
 require "chan_pay/api/quick_pay"
 require "chan_pay/api/query_order"
+require "chan_pay/api/query_balance"
 require "chan_pay/client"
 
 module ChanPay

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chan_pay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,12 @@ files:
 - bin/setup
 - chan_pay.gemspec
 - lib/chan_pay.rb
+- lib/chan_pay/api/query_balance.rb
 - lib/chan_pay/api/query_order.rb
 - lib/chan_pay/api/quick_pay.rb
+- lib/chan_pay/api/sms_pay_confirm.rb
+- lib/chan_pay/api/sms_pay_request.rb
+- lib/chan_pay/api/sms_pay_resend.rb
 - lib/chan_pay/client.rb
 - lib/chan_pay/encrypt/rsa.rb
 - lib/chan_pay/http/communicate.rb