chan_pay 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d9ed83edfada8388e102fcd1345977c5cf9108
-  data.tar.gz: d9b0a665d39ed30a1600844cfd1ec8ff87a28b9c
+  metadata.gz: 1b660e51012104b31a2a35ef0125c38529d2892d
+  data.tar.gz: bbc38f701057995bacae192f2a213f5937af6494
 SHA512:
-  metadata.gz: 122a3f26eefd382947f1b2dacd3cc6c18bbefdbb75f1fe71c5bbffc3ab238e42d73eeded8c7c5c0181acf48725a48dd6d5698595a3745b3060c945e65b9778ab
-  data.tar.gz: ed1397100c2a5f4d73aa66db390305b7b475d471615b9fee0bea1370d8a84edc9653763b1b7e9aaeec717da4a8017afdc5f8a4f7a651aefda32143d80acb70ec
+  metadata.gz: b83041be93f3df9426f921a8d811c9afe2bf45af5b225f7a53d488b48a1d33bdd88461c026333b28997adb673edae36d6a5ba51ee46d856f27e10370445f0b07
+  data.tar.gz: 90d589f11edd3f67c205de143389cc6eebdb921866c45f3551fbdfe172e9b26a32ef94077ccf91c90e46f3c7306430cd025379f084769f7f6a95b96cfa2f7391

data/README.md

@@ -1,39 +1,63 @@
 # ChanPay
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/chan_pay`. To experiment with that code, run `bin/console` for an interactive prompt.
+用友畅捷支付 API ruby sdk，目前提供以下接口
 
-TODO: Delete this and the text above, and describe your gem
+1. 直接支付请求接口
+2. 支付确认接口
+3. 短信验证码重发接口
+4. 确认收货接口
+5. 商户余额查询
+6. 快捷代扣请求接口
 
-## Installation
+## 安装
 
-Add this line to your application's Gemfile:
+Gemfile 中增加:
 
 ```ruby
 gem 'chan_pay'
 ```
 
-And then execute:
+然后执行命令:
 
     $ bundle
 
-Or install it yourself as:
+或者直接安装:
 
     $ gem install chan_pay
 
-## Usage
+## 快速指南
 
-TODO: Write usage instructions here
+1. 初始化
 
-## Development
+```ruby
+    client = ChanPay::Client.new(
+      partner_id: partner_id,
+      seller_id: seller_id,
+      server_url: server_url,
+      private_key: private_key,
+      public_key: public_key,
+    )
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+2. 调用各个 api，比如查询接口：
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```ruby
+    client.query_balance(商户自定义唯一订单号)
+```
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/chan_pay. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## Make a pull request
+
+1. Fork it
+2. Create your feature branch (git checkout -b my-new-feature)
+3. Commit your changes (git commit -am 'Add some feature')
+4. Push to the branch (git push origin my-new-feature)
+5. Create new Pull Request
+6. Please write unit test with your code if necessary.
+
 
 ## License
 

data/chan_pay.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tony@omniaccount.com"]
 
   spec.summary       = %q{"畅捷支付"}
-  spec.description   = %q{"畅捷支付"}
+  spec.description   = %q{"畅捷支付SDK"}
   spec.homepage      = "https://github.com/omniaccountcorp/chan_pay"
   spec.license       = "MIT"
 

data/lib/chan_pay/api/query_order.rb

@@ -22,13 +22,15 @@ module ChanPay
           :TradeType => 'pay_order',
         }
 
-        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+        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],
+          flow_id: flow_id,
           vendor_order_id: response[:OrderTrxid],
           extension: response[:Extension],
           log: [params.to_json, response.to_json],

data/lib/chan_pay/api/query_quick_order.rb

@@ -0,0 +1,45 @@
+# coding: utf-8
+
+# 查询代付代收订单
+
+module ChanPay
+  module Api
+    module QueryQuickOrder
+
+      SERVICE_NAME = 'cjt_dsf'
+
+      def query_quick_order(flow_id, ori_flow_id)
+        params = {
+          :TransCode => 'C00000',
+          :OutTradeNo => flow_id,
+          :OriOutTradeNo => ori_flow_id,
+        }
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:OriginalErrorMessage] || response[:PlatformErrorMessage],
+          ret_code: response[:OriginalRetCode],
+          flow_id: flow_id,
+          vendor_order_id: response[:FlowNo],
+          log: [params.to_json, response.to_json],
+        }
+
+        # AcceptStatus 是请求是否成功， PlatformRetCode 是畅捷支付是否受理成功了，OriginalRetCode 是否交易成功，只要看 OriginalRetCode 是否成功即可
+
+        # 受理成功但是结果失败
+        if response[:AcceptStatus] == 'S' && Http::OriginalRetCode.query_quick_order_fail?(response[:OriginalRetCode])
+          res[:result] = 'F'
+        end
+
+        if response[:AcceptStatus] == 'S' && Http::OriginalRetCode.success?(response[:OriginalRetCode])
+          res[:result] = 'S'
+        end
+
+        res
+      end
+
+    end
+  end
+end

data/lib/chan_pay/api/quick_draw.rb

@@ -0,0 +1,60 @@
+# coding: utf-8
+
+# 单笔同步代付
+
+module ChanPay
+  module Api
+    module QuickDraw
+
+      SERVICE_NAME = 'cjt_dsf'
+
+      def quick_draw(flow_id,
+                     bank_business_name, card_id, true_name,
+                     money,
+                     business_type='0')
+
+        params = {
+          :TransCode => 'T10000',
+          :OutTradeNo => flow_id,
+          :BusinessType => business_type, # 0=私人，1=公司
+          :BankCommonName => bank_business_name,
+          :AcctNo => card_id,
+          :AcctName => true_name,
+          :TransAmt => money,
+        }
+
+        # 这里是明文参数输出
+        puts "\n[#{SERVICE_NAME}] 请求参数为：\n#{params.inspect}"
+
+        # 敏感字段加密
+        params[:AcctNo] = Encrypt::RSA.encrypt(@public_key, card_id)
+        params[:AcctName]  = Encrypt::RSA.encrypt(@public_key, true_name)
+
+        response = Http.post(@partner_id, @private_key, @public_key, @server_uri, SERVICE_NAME, params)
+
+        res = {
+          result: 'P', # 默认 pending
+          msg: response[:OriginalErrorMessage],
+          ret_code: response[:OriginalRetCode],
+          flow_id: flow_id,
+          vendor_order_id: response[:FlowNo],
+          log: [params.to_json, response.to_json],
+        }
+
+        # AcceptStatus 是请求是否成功， PlatformRetCode 是畅捷支付是否受理成功了，OriginalRetCode 是否交易成功，只要看 OriginalRetCode 是否成功即可
+
+        # 受理失败 || 受理成功但是结果失败
+        if response[:AcceptStatus] == 'F' || (response[:AcceptStatus] == 'S' && Http::OriginalRetCode.quick_draw_fail?(response[:OriginalRetCode]))
+          res[:result] = 'F'
+        end
+
+        if response[:AcceptStatus] == 'S' && Http::OriginalRetCode.success?(response[:OriginalRetCode])
+          res[:result] = 'S'
+        end
+
+        res
+      end
+
+    end # module QuickPay
+  end # module Api
+end # module Chanpay

data/lib/chan_pay/api/sms_pay_request.rb

@@ -55,7 +55,7 @@ module ChanPay
           result: 'P', # 默认 pending
           msg: response[:RetMsg],
           ret_code: response[:RetCode],
-          flow_id: response[:TrxId],
+          flow_id: flow_id,
           vendor_order_id: response[:OrderTrxid],
           extension: response[:Extension],
           log: [params.to_json, response.to_json],

data/lib/chan_pay/api/{quick_pay.rb → withhold_pay.rb}

@@ -4,7 +4,7 @@
 
 module ChanPay
   module Api
-    module QuickPay
+    module WithholdPay
 
       SERVICE_NAME = 'nmg_api_quickpay_withhold'
 
@@ -19,7 +19,7 @@ module ChanPay
       #
       # @return [Hash] 返回结果集
       #
-      def quick_pay(flow_id, card_id, identity_id, true_name, phone, money)
+      def withhold_pay(flow_id, card_id, identity_id, true_name, phone, money)
 
         params = {
           :TrxId => flow_id.to_s, # 最长 32 位唯一订单号
@@ -52,7 +52,7 @@ module ChanPay
           result: 'P', # 默认 pending
           msg: response[:RetMsg],
           ret_code: response[:RetCode],
-          flow_id: response[:TrxId],
+          flow_id: flow_id,
           vendor_order_id: response[:OrderTrxid],
           extension: response[:Extension],
           log: [params.to_json, response.to_json],

data/lib/chan_pay/client.rb

@@ -5,12 +5,17 @@
 module ChanPay
   class Client
 
-    include ChanPay::Api::QuickPay
-    include ChanPay::Api::QueryOrder
-    include ChanPay::Api::QueryBalance
+    # 快捷支付的 api
     include ChanPay::Api::SmsPayRequest
     include ChanPay::Api::SmsPayConfirm
     include ChanPay::Api::SmsPayResend
+    include ChanPay::Api::WithholdPay
+    include ChanPay::Api::QueryOrder
+    # 代付代扣的 api
+    include ChanPay::Api::QuickDraw
+    include ChanPay::Api::QueryQuickOrder
+    # 通用 api
+    include ChanPay::Api::QueryBalance
 
     def initialize(options_arg)
       options = Utils.symbolize_keys(options_arg)

data/lib/chan_pay/http/ret_code.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
 module ChanPay
   module Http
-    module RetCode
 
+    module RetCode
       UNKNOWN_ERROR = 'UNKNOWN_ERROR'
       NET_TIMEOUT = 'NET_TIMEOUT'
 
@@ -14,7 +14,40 @@ module ChanPay
           :Status => "F", # 业务失败
         }
       end
-
     end
-  end
-end
+
+    module OriginalRetCode
+      Codes = {
+        "000000" => "成功",
+        "111111" => "失败",
+        "000001" => "未知",
+        "000002" => "已发送",
+        "000004" => "已受理",
+        "000005" => "错误",
+        "000006" => "未受理",
+        "000010" => "超时",
+        "000050" => "重复",
+        "900001" => "无对应批次信息",
+        "900002" => "批次下无明细信息",
+        "900003" => "无对应明细",
+      }
+
+      def self.success?(code)
+        ['000000'].include?(code.to_s)
+      end
+
+      # 同步代付错误代码
+      def self.quick_draw_fail?(code)
+        ['111111', '000005', '000006', '000010', '000050'].include?(code.to_s)
+      end
+
+      # 订单错误代码
+      # TODO(tony): 还需和用友畅捷支付的人沟通确认
+      def self.query_quick_order_fail?(code)
+        ['111111'].include?(code.to_s)
+      end
+
+    end # OriginalRetCode
+
+  end # Http
+end # ChanPay

data/lib/chan_pay/version.rb

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

data/lib/chan_pay.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require "uri"
 require "net/http"
 require "json"
@@ -6,16 +7,24 @@ require "base64"
 
 require "chan_pay/version"
 require "chan_pay/utils"
+# 加密验签
 require "chan_pay/sign/rsa"
 require "chan_pay/encrypt/rsa"
+# 通信
 require "chan_pay/http/ret_code"
 require "chan_pay/http/communicate"
+# 快捷支付的 api
 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/withhold_pay"
 require "chan_pay/api/query_order"
+# 代付代扣的 api
+require "chan_pay/api/quick_draw"
+require "chan_pay/api/query_quick_order"
+# 通用 api
 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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: '"畅捷支付"'
+description: '"畅捷支付SDK"'
 email:
 - tony@omniaccount.com
 executables: []
@@ -73,10 +73,12 @@ files:
 - 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/query_quick_order.rb
+- lib/chan_pay/api/quick_draw.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/api/withhold_pay.rb
 - lib/chan_pay/client.rb
 - lib/chan_pay/encrypt/rsa.rb
 - lib/chan_pay/http/communicate.rb