reapal 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f666bd5dcc641e0493de86b32007b2a1f7126a64
-  data.tar.gz: 737efdcae2f36ec7c1b6566a744c3b734ce9ea3b
+  metadata.gz: b2b8e99a85cdd0e5502e22b10d9e24682807e051
+  data.tar.gz: 21f711b8f01acedb9d2ce46a021f7ac136421e4c
 SHA512:
-  metadata.gz: fcb581a2aa92fc6bbeaa692735f753d0bd6f399bcd123c46c20a2fefa0ca4826598720d384ddf7e181e2a1d41c5ef11578bbc7aeddd1ffacc34260a29b012e8d
-  data.tar.gz: 80ab50ee402a58d45458830682df502418a2888dd4bcf656862e4b48c36d7a3b17765001da966abf9298cae1226262bb6f48deaf534bb44bd698fdbd8e53dbfa
+  metadata.gz: 716347461f3350e848eff7a1f6c35c26851116e4bbdf3ad063e83fda89daab81811dd0f4478ae3c9917dffcb1b14328934f1dace912983856fb1372b7e3e427a
+  data.tar.gz: b6808b06c2f6605f8d60a1a0c3326cf826cfe81955e2447ecfc47ee1b9c5d150f88a54e9d8679e01d3889118e1c537f5ea1bfe38f3c15d1ff9fab0f59fb51f59

data/.gitignore

@@ -8,6 +8,7 @@
 /tmp/
 
 .byebug_history
+reapal-*.gem
 Gemfile.lock
 
 # rspec failure tracking

data/README.md

@@ -27,13 +27,50 @@ TODO: Write usage instructions here
 ### logger
 
 ``` ruby
-SuckerPunch.logger = Logger.new('sucker_punch.log')
-SuckerPunch.logger # => #<Logger:0x007fa1f28b83f0>
+Reapal.logger = Logger.new('reapal.log')
+Reapal.logger # => #<Logger:0x007fa1f28b83f0>
 ```
 
 * Note: If Reapal is being used within a Rails application, Reapal's logger is set to Rails.logger by default. *
 
-## Development
+## 开发
+
+### 怎么加入
+
+```
+# 先 fork 此项目
+# checkout 自己的项目后操作：
+$ git remote -v # 查看主机源，如果只有自己的 origin 那还没有设置 upstream
+$ git remote add upstream https://github.com/omniaccountcorp/reapal
+$ git fetch upstream
+$ git checkout master
+$ git merge --no-ff upstream/master
+# 如果有冲突解决...
+$ git add 修改的文件
+$ git commit -m 'merge from origin-git'
+$ git push origin [自己开发的分支]
+```
+
+### 开发新 api 指南
+1. 根据 service 名字，确定好 module ，新 api 文件名，方法名，比如：
+    ``` ruby
+    # 假如服务名: reapal.trust.mobileModify
+    # 文件名：lib/reapal/api/trust/mobile_modify.rb
+    module Reapal
+      module Api
+        module MobileModify
+          def mobile_modify(...)
+             # ...
+          end
+        end
+      end
+    end
+    
+    ```
+2. 新 api 文件中写好注释（记得标明是文档中的哪一节），确定好函数输入输出
+3. 写 spec
+4. 实现 api
+5. 测试通过后向作者提交 spec
 
 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.
 

data/lib/reapal.rb

@@ -7,19 +7,19 @@ require "base64"
 require 'macaddr'
 require 'byebug'
 require 'logger'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 require "reapal/version"
 require "reapal/utils"
+require "reapal/extensions"
 require "reapal/sign/md5"
 require "reapal/encrypt/rsa"
 require "reapal/encrypt/aes"
 require "reapal/http/communicate"
 require "reapal/http/response"
-
 # 自动加载所有 api
-Dir["#{File.dirname(__FILE__)}/reapal/api/**/*.rb"].each { |file|
-  require file
-}
+Dir["#{File.dirname(__FILE__)}/reapal/api/**/*.rb"].each { |file| require file }
 
 require "reapal/client"
 

data/lib/reapal/api/trust/balance_query.rb

@@ -0,0 +1,58 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Agreement
+      module BalanceQuery
+
+        # 1.6 查询余额（API）
+        #
+        # @param contracts [ String ] 用户协议号
+        #
+        # @return [ Hash ] 结果集
+        #   * :success [bool] 查询结果是否有效
+        #   * :data [Hash] 成功数据
+        #       * :total_amount [BigDecimal] 账户总额
+        #       * :usable_amount [BigDecimal] 可用金额
+        #       * :tender_amount [BigDecimal] 投标金额
+        #
+        def balance_query(contracts)
+          service = 'reapal.trust.balanceQuery'
+          post_path = '/reagw/agreement/agreeApi.htm'
+
+          params = {
+            contracts: contracts,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          response = Http.post(service, params, @config, post_path)
+
+          # 如果数据不合法
+          unless response.data_valid
+            return {success: false}
+          end
+
+          # 如果网络出错，包括超时或者非200类数据
+          unless response.http_response.kind_of?(Net::HTTPSuccess)
+            return {success: false}
+          end
+
+          # 如果 api 出异常
+          if response.data[:errorCode]
+            return {success: false}
+          end
+
+          {
+            success: true,
+            data: {
+              total_amount: response.data[:totalAmount].to_d,
+              usable_amount: response.data[:usableAmount].to_d,
+              tender_amount: response.data[:tenderAmount].to_d,
+            }
+          }
+        end
+
+      end # module Agree
+    end
+  end
+end

data/lib/reapal/api/{agreement/agree_query.rb → trust/contract_query.rb}

@@ -2,23 +2,19 @@
 
 module Reapal
   module Api
-    module Agreement
-      module AgreeQuery
+    module Trust
+      module ContractQuery
 
-        # 个人一键签约（API）
+        # 1.5 签约查询，支持个人和企业（API）
         #
-        # @param flow_id [ String ] 订单号
-        # @param true_name [ String ] 真实姓名
-        # @param identity_id [ String ] 身份证号
-        # @param phone [ String ] 手机号
-        # @param bus_way [ String ] 00：PC端；01：手机端；02：Pad端；03：其它
+        # @param ori_flow_id [ String ] 原订单号
         #
         # @return [ Hash ] 结果集
         #   * :result [String] "S"/"F"/"P"
         #   * :error_msg [String] 错误提示
         #   * :data [Hash] 成功数据，解析和【个人签约API】/【企业签约API】一致
         #
-        def agree_query(ori_flow_id)
+        def contract_query(ori_flow_id)
           # TODO(tony): 目前我们只用个人签约，个人签约都是同步返回，所以先不做实现
           raise "Not Implement"
 

data/lib/reapal/api/trust/find_trade_password.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Trust
+      module FindTradePassowrd
+
+        # 1.9 设置/修改交易密码
+        #
+        # @param
+        #
+        # @return [ Hash ] 结果集
+        #   * :merchant_id
+        #   * :encryptkey
+        #   * :data
+        #   * :url
+        #   * :method
+        #
+        def find_trade_password(contracts, busway='01')
+          service = 'reapal.trust.findTradePassword'
+          post_path = '/reagw/findTradePassword/findTradePassword.htm'
+
+          params = {
+            contracts: contracts,
+            busway: busway,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          request = Http.get_body(service, params, @config)
+          request[:method] = :post
+          request[:url] = config[:server_url] + post_path
+
+          request
+        end
+
+      end
+    end
+  end
+end

data/lib/reapal/api/trust/mobile_modify.rb

@@ -0,0 +1,42 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Trust
+      module MobileModify
+
+        # 1.7 签约手机号修改
+        #
+        # @param
+        #
+        # @return [ Hash ] 结果集
+        #   * :merchant_id
+        #   * :encryptkey
+        #   * :data
+        #   * :url
+        #   * :method
+        #
+        def mobile_modify(contracts, new_phone, busway='01')
+          service = 'reapal.trust.mobileModify'
+          post_path = '/reagw/user/rest.htm'
+
+          params = {
+            contracts: contracts,
+            mobile: new_phone,
+            busway: busway,
+            returnUrl: '',
+            notifyUrl: '',
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          request = Http.get_body(service, params, @config)
+          request[:method] = :post
+          request[:url] = config[:server_url] + post_path
+
+          request
+        end
+
+      end
+    end
+  end
+end

data/lib/reapal/api/trust/onekey_batch_contract.rb

@@ -0,0 +1,83 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Trust
+      module OnekeyBatchContract
+
+        # 1.1 个人一键签约（API）新版本，迁移老数据
+        #
+        # @param flow_id [ String ] 订单号
+        #
+        # @return [ Hash ] 结果集
+        #   * :result [String] "S"/"F"/"P"
+        #   * :error_msg [String] 错误提示
+        #   * :error_code [String] 融宝的错误编号
+        #   * :data [Hash] 成功数据，返回的数据不一定是上送数据，比如手机号。所以要以返回数据为准
+        #       * :contracts [String] 用户签约协议号
+        #       * :userName [String] 姓名
+        #       * :userIdentity [String] 身份证
+        #       * :userMobile [String] 手机号
+        #
+        def onekey_batch_contract(flow_id, true_name, identity_id, phone, is_to_sms,
+                                  bank_code, card_id, card_province, card_city, card_branch, card_sub_branch,
+                                  bus_way='01')
+          service = 'reapal.trust.onekeyBatchContract'
+          post_path = '/reagw/agreement/agree.htm'
+
+          params = {
+            orderNo: flow_id,
+            userName: true_name,
+            userIdentity: identity_id,
+            userMobile: phone,
+            busway: bus_way,
+            remark: '',
+            isToSms: is_to_sms,
+            bankCode: bank_code,
+            bankAccountNo: card_id,
+            accountProvince: card_province,
+            accountCity: card_city,
+            branch: card_branch,
+            subbranch: card_sub_branch,
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          response = Http.post(service, params, @config, post_path)
+
+          error_result = {
+            data: nil,
+            result: "F",
+            error_msg: "未知错误",
+          }
+
+          # 如果数据不合法
+          unless response.data_valid
+            error_result[:error_msg] = "返回数据不合法"
+            return error_result
+          end
+
+          # 如果网络出错，包括超时或者非200类数据
+          unless response.http_response.kind_of?(Net::HTTPSuccess)
+            error_result[:error_msg] = "网络出错"
+            return error_result
+          end
+
+          # 个人签约只有返回码是 '0000', '0007' 才成功
+          if ['0000', '0007'].include?(response.data[:resultCode])
+            return {
+              data: response.data,
+              result: "S",
+              error_msg: nil,
+            }
+          else
+            # 普通错误
+            error_result[:error_code] = response.data[:errorCode]
+            error_result[:error_msg] = response.data[:errorMsg]
+            return error_result
+          end
+        end
+
+      end # module Agree
+    end
+  end
+end

data/lib/reapal/api/{agreement/agree.rb → trust/onekey_contract.rb}

@@ -2,10 +2,10 @@
 
 module Reapal
   module Api
-    module Agreement
-      module Agree
+    module Trust
+      module OnekeyContract
 
-        # 个人一键签约（API）
+        # 1.2 个人一键签约（API）
         #
         # @param flow_id [ String ] 订单号
         # @param true_name [ String ] 真实姓名
@@ -23,7 +23,7 @@ module Reapal
         #       * :userIdentity [String] 身份证
         #       * :userMobile [String] 手机号
         #
-        def agree(flow_id, true_name, identity_id, phone, bus_way='01')
+        def onekey_contract(flow_id, true_name, identity_id, phone, bus_way='01')
           service = 'reapal.trust.onekeyContract'
           post_path = '/reagw/agreement/agree.htm'
 

data/lib/reapal/api/trust/withdraw_apply.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+
+module Reapal
+  module Api
+    module Trust
+      module WithdrawApply
+
+        # 2.7 提现申请
+        #
+        # @param
+        #
+        # @return [ Hash ] 结果集
+        #   * :merchant_id
+        #   * :encryptkey
+        #   * :data
+        #   * :url
+        #   * :method
+        #
+        def withdraw_apply(contracts, flow_id, money, charge, busway='01')
+          service = 'reapal.trust.withdrawApply'
+          post_path = '/reagw/service/withdraw.htm'
+
+          params = {
+            orderNo: flow_id,
+            contracts: contracts,
+            amount: money,
+            charge: charge,
+            busway: busway,
+            returnUrl: '',
+            notifyUrl: '',
+            applyTime: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          }
+
+          request = Http.get_body(service, params, @config)
+          request[:method] = :post
+          request[:url] = config[:server_url] + post_path
+
+          request
+        end
+
+      end
+    end
+  end
+end

data/lib/reapal/extensions.rb

@@ -0,0 +1,7 @@
+module NilClassExtension
+  def to_d
+    0.to_d
+  end
+end
+
+NilClass.send(:include, NilClassExtension)

data/lib/reapal/http/communicate.rb

@@ -47,8 +47,7 @@ module Reapal
       result
     end
 
-    private
-
+    # 表单的 body
     def self.get_body(service, params, config)
       data = {
         version: VERSION,
@@ -67,6 +66,8 @@ module Reapal
       }
     end
 
+    private
+
     def self.unpack_body(body_string, config)
       # 返回是 json 字符串格式
       body = Utils.symbolize_keys(JSON.parse(body_string))

data/lib/reapal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reapal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - tony
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,11 +124,17 @@ files:
 - bin/console
 - bin/setup
 - lib/reapal.rb
-- lib/reapal/api/agreement/agree.rb
-- lib/reapal/api/agreement/agree_query.rb
+- lib/reapal/api/trust/balance_query.rb
+- lib/reapal/api/trust/contract_query.rb
+- lib/reapal/api/trust/find_trade_password.rb
+- lib/reapal/api/trust/mobile_modify.rb
+- lib/reapal/api/trust/onekey_batch_contract.rb
+- lib/reapal/api/trust/onekey_contract.rb
+- lib/reapal/api/trust/withdraw_apply.rb
 - lib/reapal/client.rb
 - lib/reapal/encrypt/aes.rb
 - lib/reapal/encrypt/rsa.rb
+- lib/reapal/extensions.rb
 - lib/reapal/http/communicate.rb
 - lib/reapal/http/response.rb
 - lib/reapal/railtie.rb