pingpp 2.1.3 → 2.2.0

data/test/test_data.rb

@@ -0,0 +1,191 @@
+module Pingpp
+  module TestData
+    @charge_id_created = nil
+
+    def get_api_key
+      'sk_test_ibbTe5jLGCi5rzfH4OqPW9KC'
+    end
+
+    def get_api_key_live
+    end
+
+    def get_app_id
+      'app_1Gqj58ynP0mHeX1q'
+    end
+
+    def get_sub_app_id
+      'app_mX1mPSGyTqP4mPCK'
+    end
+
+    def sub_app_id_to_delete
+      'app_ayTqP4mX1PPSGCKm'
+    end
+
+    def set_charge_id(ch_id)
+      @charge_id_created = ch_id
+    end
+
+    def get_charge_id
+      'ch_TanbTO9OmjP4TGW5a1j1mPiL'
+    end
+
+    def get_refund_id
+      're_f1iHq5CuDSSKGCS8y1SeDSqT'
+    end
+
+    def get_bat_re_id
+      '1501702241124307723'
+    end
+
+    def get_bat_tr_id
+      '1801702281011244578'
+    end
+
+    def get_user_id
+      'test_user_001'
+    end
+
+    def get_txn_id
+      '310317022810333800188901'
+    end
+
+    def get_coupon_template_id
+      '300117012016532300016701'
+    end
+
+    def get_unpaid_order_id
+      '2001702280000033651'
+    end
+
+    def make_charges_for_batch_refund
+      [
+        'ch_D8uDO4fPSS40SOSmT4WfTCm9',
+        'ch_rPOO4SbDqP04O8Sa9SaDa9u1'
+      ]
+    end
+
+    def get_settle_account_id
+      'test_user_001'
+    end
+
+    # 订单 (order) 相关 ID 信息
+    def existed_order_id
+      '2001709040000026131'
+    end
+
+    def existed_charge_id_of_order
+      ['2001709040000026131', 'ch_fbD0SKiPynnLznT0S0zrvDSK']
+    end
+
+    def existed_refund_id_of_order
+      ['2001709040000026131', 're_mnX90SPmzjnDvv1CWPyn5arH']
+    end
+
+    def order_to_cancel
+      '2001709040000028901'
+    end
+
+    def order_and_charge_to_refund
+      ['2001709040000026131', 'ch_fbD0SKiPynnLznT0S0zrvDSK']
+    end
+
+    def order_to_pay
+      '2001709040000027851'
+    end
+
+    # 充值 (recharge) 相关 ID 信息
+    def existed_recharge_id
+      '220170904816730992640002'
+    end
+
+    def recharge_to_refund
+      '220170904816730992640002'
+    end
+
+    def existed_refund_id_of_recharge
+      ['220170904816730992640002', 're_arDqzHPurrHGvD4KeD54O84K']
+    end
+
+    # 用户 user 相关 ID 信息
+    def existed_user_id
+      'user_007'
+    end
+
+    def existed_user_id_for_balance_transfer
+      'test_user_001'
+    end
+
+    # 余额赠送 balance_bonus 相关 ID 信息
+    def existed_balance_bonus_id
+      '650170904814419589120001'
+    end
+
+    # 余额转账 balance_transfer 相关 ID 信息
+    def existed_balance_transfer_id
+      '660170904814247700480002'
+    end
+
+    # 提现 withdrawal 相关 ID 信息
+    def existed_withdrawal_id
+      '1701709081542133945'
+    end
+
+    # 批量提现 batch_withdrawal 相关 ID 信息
+    def existed_batch_withdrawal_id
+      '1901709081656012102'
+    end
+
+    # 分润相关 ID 信息
+    def existed_royalty_template_id
+      '450170908173700001'
+    end
+
+    def royalty_template_id_to_delete
+      '450170908172300001'
+    end
+
+    def get_royalty_ids_to_update
+      [
+        '410170908205700002',
+        '410170908205700001',
+      ]
+    end
+
+    def existed_royalty_id
+      '410170908205700001'
+    end
+
+    def get_payer_app
+      'app_1Gqj58ynP0mHeX1q'
+    end
+
+    def existed_royalty_settlement_id
+      '430170908211000001'
+    end
+
+    def existed_royalty_transaction_id
+      '440170908213000001'
+    end
+
+    # 优惠券相关 ID 信息
+    def coupon_id_and_user
+      ['300317082315265100025202', 'test_user_001']
+    end
+
+    def coupon_id_and_user_to_delete
+      ['300317082315160100056601', 'test_user_001']
+    end
+
+    def coupon_id_and_user_to_update
+      ['300317090822145900061202', '488c35c2e06a']
+    end
+
+    def existed_coupon_template_id
+      '300117090822064600031402'
+    end
+
+    def coupon_template_id_to_delete
+      '300117090822195700031902'
+    end
+  end
+end

data/test/user_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../test_assistant', __FILE__)
+require "digest/md5"
+
+module Pingpp
+  class UserTest < Test::Unit::TestCase
+    should "execute should return a new user when passed correct parameters" do
+      user_id = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
+    
+      params = {
+        :id  => user_id
+      }
+    
+      u = Pingpp::User.create(params)
+    
+      assert u.object == 'user'
+      assert u.id == user_id
+    end
+
+    should "execute should return an exist user when passed correct id" do
+      u = Pingpp::User.retrieve(get_user_id)
+
+      assert u.object == 'user'
+      assert u.id == get_user_id
+    end
+
+    should "execute should return a list of users when passed correct parameters" do
+      u = Pingpp::User.list(:per_page => 3)
+
+      assert u.object == 'list'
+      assert u.data.count <= 3
+    end
+
+    should "execute should return an updated user" do
+      new_address = 'Shanghai ' + Time.now.iso8601
+      u = Pingpp::User.update(get_user_id, {:address => new_address})
+
+      assert u.object == 'user'
+      assert u.id == get_user_id
+      assert u.address == new_address
+    end
+  end
+end

data/test/withdrawal_test.rb

@@ -0,0 +1,121 @@
+require File.expand_path('../test_assistant', __FILE__)
+
+module Pingpp
+  class WithdrawalTest < Test::Unit::TestCase
+    # 创建提现
+    should "return an withdrawal object when passed correct parameters" do
+      params = {
+        # 提现用户 ID  optional|string
+        :user => existed_user_id,
+
+        # 提现金额  required|integer
+        :amount => 10,
+
+        # 提现用户手续费  optional|integer
+        :user_fee => 0,
+
+        # 描述信息  optional|string
+        :description => "用户提现",
+
+        # 提现渠道  required|string
+        :channel => "alipay",
+
+        # 用户账号相关额外参数  conditional|hash; 使用 settle_account 时不需要此参数
+        :extra => {
+          # 收款账号  conditional|string; alipay 渠道为支付宝账号或 ID
+          :account => "user@gmail.com",
+
+          # 姓名  conditional|string
+          :name => "姓名",
+        },
+
+        # 结算账号 ID  conditional|string; 与 user 绑定的结算账号 ID
+        # :settle_account => "SETTLE_ACCOUNT",
+
+        # metadata  optional|hash
+        :metadata => {
+          :custom_key => "custom_value",
+          # ...
+        }
+      }
+
+      if params[:channel] == "allinpay"
+        params[:order_no] = "301002#{Time.now.to_i.to_s}#{rand(999999).to_s.rjust(6, "0")}"
+      else
+        params[:order_no] = "#{Time.now.to_i.to_s}#{rand(9999).to_s.rjust(4, "0")}"
+      end
+
+      o = Pingpp::Withdrawal.create(
+        params,
+        {
+          # URL 中的 {app_id}  optional|string; 用于覆盖 Pingpp.app_id
+          :app => get_app_id
+        }
+      )
+
+      assert o.kind_of?(Pingpp::Withdrawal)
+      assert o.order_no == params[:order_no]
+      assert o.app == get_app_id
+      assert o.amount == params[:amount]
+      assert o.user == params[:user]
+    end
+
+    # 提现确认
+    should "return an pending withdrawal when passed a created withdrawal id" do
+      begin
+        o = Pingpp::Withdrawal.confirm(
+          existed_withdrawal_id,
+          { :app => get_app_id } # App 信息
+        )
+
+        assert o.id == existed_withdrawal_id
+        assert o.app == get_app_id
+        assert o.kind_of?(Pingpp::Withdrawal)
+      rescue => e
+        assert e.kind_of?(Pingpp::InvalidRequestError)
+        assert e.message.include?("不能被更新状态") || e.message.include?("cannot be updated")
+      end
+    end
+
+    # 提现取消
+    should "return an canceled withdrawal when passed a created withdrawal id" do
+      begin
+        o = Pingpp::Withdrawal.cancel(
+          existed_withdrawal_id,
+          { :app => get_app_id } # App 信息
+        )
+
+        assert o.id == existed_withdrawal_id
+        assert o.app == get_app_id
+        assert o.status == "canceled"
+        assert o.kind_of?(Pingpp::Withdrawal)
+      rescue => e
+        assert e.kind_of?(Pingpp::InvalidRequestError)
+        assert e.message.include?("不能被更新状态") || e.message.include?("cannot be updated")
+      end
+    end
+
+    # 查询提现
+    should "return an existed withdrawal when passed correct id" do
+      o = Pingpp::Withdrawal.retrieve(
+        existed_withdrawal_id,
+        { :app => get_app_id } # App 信息
+      )
+
+      assert o.id == existed_withdrawal_id
+      assert o.app == get_app_id
+      assert o.kind_of?(Pingpp::Withdrawal)
+    end
+
+    # 查询提现列表
+    should "return a list object of withdrawal" do
+      o = Pingpp::Withdrawal.list(
+        { :per_page => 3, :page => 1 },
+        { :app => get_app_id } # App 信息
+      )
+
+      assert o.kind_of?(Pingpp::ListObject)
+      assert o.data[0].kind_of?(Pingpp::Withdrawal)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingpp
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - Xufeng Weng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -46,9 +46,17 @@ files:
 - lib/pingpp/api_operations/request.rb
 - lib/pingpp/api_operations/update.rb
 - lib/pingpp/api_resource.rb
+- lib/pingpp/app_based_resource.rb
+- lib/pingpp/balance_bonus.rb
+- lib/pingpp/balance_transaction.rb
+- lib/pingpp/balance_transfer.rb
 - lib/pingpp/batch_refund.rb
 - lib/pingpp/batch_transfer.rb
+- lib/pingpp/batch_withdrawal.rb
+- lib/pingpp/channel.rb
 - lib/pingpp/charge.rb
+- lib/pingpp/coupon.rb
+- lib/pingpp/coupon_template.rb
 - lib/pingpp/customs.rb
 - lib/pingpp/errors/api_connection_error.rb
 - lib/pingpp/errors/api_error.rb
@@ -60,17 +68,52 @@ files:
 - lib/pingpp/event.rb
 - lib/pingpp/identification.rb
 - lib/pingpp/list_object.rb
+- lib/pingpp/order.rb
 - lib/pingpp/pingpp_object.rb
+- lib/pingpp/recharge.rb
 - lib/pingpp/red_envelope.rb
 - lib/pingpp/refund.rb
+- lib/pingpp/royalty.rb
+- lib/pingpp/royalty_settlement.rb
+- lib/pingpp/royalty_template.rb
+- lib/pingpp/royalty_transaction.rb
+- lib/pingpp/settle_account.rb
 - lib/pingpp/singleton_api_resource.rb
+- lib/pingpp/singleton_app_based_resource.rb
+- lib/pingpp/sub_app.rb
+- lib/pingpp/sub_app_based_resource.rb
 - lib/pingpp/transfer.rb
+- lib/pingpp/user.rb
+- lib/pingpp/user_based_resource.rb
 - lib/pingpp/util.rb
 - lib/pingpp/version.rb
 - lib/pingpp/webhook.rb
+- lib/pingpp/withdrawal.rb
 - lib/pingpp/wx_pub_oauth.rb
-- test/charge_reverse_test.rb
-- test/settle_account_tes.rb
+- test/balance_bonus_test.rb
+- test/balance_transaction_test.rb
+- test/balance_transfer_test.rb
+- test/batch_refund_test.rb
+- test/batch_transfer_test.rb
+- test/batch_withdrawal_test.rb
+- test/charge_test.rb
+- test/coupon_template_test.rb
+- test/coupon_test.rb
+- test/customs_test_bak.rb
+- test/order_test.rb
+- test/recharge_test.rb
+- test/refund_test.rb
+- test/royalty_settlement_test.rb
+- test/royalty_template_test.rb
+- test/royalty_test.rb
+- test/royalty_transaction_test.rb
+- test/settle_account_test.rb
+- test/sub_app_channel_test.rb
+- test/sub_app_test.rb
+- test/test_assistant.rb
+- test/test_data.rb
+- test/user_test.rb
+- test/withdrawal_test.rb
 homepage: https://www.pingxx.com/api
 licenses:
 - MIT
@@ -91,10 +134,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the PingPlusPlus API
 test_files:
-- test/charge_reverse_test.rb
-- test/settle_account_tes.rb
+- test/batch_transfer_test.rb
+- test/batch_withdrawal_test.rb
+- test/test_assistant.rb
+- test/sub_app_test.rb
+- test/batch_refund_test.rb
+- test/sub_app_channel_test.rb
+- test/test_data.rb
+- test/royalty_transaction_test.rb
+- test/royalty_test.rb
+- test/charge_test.rb
+- test/balance_bonus_test.rb
+- test/withdrawal_test.rb
+- test/coupon_test.rb
+- test/royalty_settlement_test.rb
+- test/order_test.rb
+- test/recharge_test.rb
+- test/settle_account_test.rb
+- test/customs_test_bak.rb
+- test/balance_transfer_test.rb
+- test/coupon_template_test.rb
+- test/royalty_template_test.rb
+- test/refund_test.rb
+- test/user_test.rb
+- test/balance_transaction_test.rb

data/test/charge_reverse_test.rb

@@ -1,84 +0,0 @@
-# require File.expand_path('../test_assistant', __FILE__)
-require "digest/md5"
-require 'pingpp'
-require 'test/unit'
-require 'shoulda/context'
-
-module Pingpp
-  class ChargeReverseTest < Test::Unit::TestCase
-
-    should "charge reverse" do
-      Pingpp.api_base = "https://apidev.afon.ninja"
-
-
-      Pingpp.api_key = "sk_test_ibbTe5jLGCi5rzfH4OqPW9KC"
-
-      order_no = Time.now.to_i.to_s[0,12]
-      channel = "isv_wap"
-
-      extra = {
-        # 必须，终端号，1~8 位英文或数字，要求不同终端此号码不一样，会显示在对账单中。
-        :terminal_id => 'A0000007',
-
-        # 必须，客户端软件中展示的条码值，扫码设备扫描获取。1~32 位字符串。
-        :pay_channel => 'alipay',
-
-        :result_url => 'https://example.com',
-
-        # 可选，商品列表，上送格式参照下面示例。
-        :goods_list => [
-          {
-            'goods_id' => 'iphone6s16G', # 商户定义商品编号（一般为商品条码）。
-            'unified_goods_id' => '1001', # 统一商品编号，可选。
-            'goods_name' => 'iPhone 6s 16G', # 商品名称。
-            'goods_num' => 1, # 商品数量。
-            'price' => 528800, # 商品价格，单位为分。
-            'goods_category' => 'smartphone', # 商品类目，可选。
-            'body' => '苹果手机 iPhone 6s 16G', # 商品描述信息，可选。
-            'show_url' => 'https://www.example.com', # 商品的展示网址，可选。
-          }
-        ]
-      }
-
-      ch = Pingpp::Charge.create(
-        :order_no  => order_no,
-        :app       => { :id => "app_1Gqj58ynP0mHeX1q" },
-        :channel   => channel,# 支付使用的第三方支付渠道取值，请参考：https://www.pingxx.com/api#api-c-new
-        :amount    => 100,# 订单总金额, 人民币单位：分（如订单总金额为 1 元，此处请填 100）
-        :client_ip => "127.0.0.1",# 发起支付请求客户端的 IP 地址，格式为 IPV4，如: 127.0.0.1
-        :currency  => "cny",
-        :subject   => "Your Subject",
-        :body      => "Your Body",
-        :extra     => extra # extra 对应各渠道的取值规则请查看 charge_extra 相应方法内说明
-      )
-      puts ch
-
-      ch = Pingpp::Charge.reverse(ch.id)
-      puts ch
-
-      assert ch.object == 'charge'
-      assert ch.order_no == order_no
-    end
-
-    # should "settle_account update" do
-
-    #   u = Pingpp::SettleAccount.update(get_settle_account_id, {}, {:user => get_user_id})
-
-    #   assert u.object == 'list'
-    #   assert u.data.count <= 3
-    # end
-
-    # should "settle_account list" do
-    #   l = Pingpp::SettleAccount.list({:per_page => 3}, {:user => get_user_id})
-    #
-    #   assert l.object == 'list'
-    #   assert l.data.count <= 3
-    # end
-
-    # should "settle_account delete" do
-    #   u = Pingpp::SettleAccount.delete(get_settle_account_id, {:user => get_user_id})
-
-    #   assert u.object == 'deleted'
-    # end
-  end
-end

data/test/settle_account_tes.rb

@@ -1,53 +0,0 @@
-require File.expand_path('../test_assistant', __FILE__)
-require "digest/md5"
-
-module Pingpp
-  class SettleAccountTest < Test::Unit::TestCase
-    # should "settle_account create" do
-    #   user_id = Digest::MD5.hexdigest(Time.now.to_i.to_s)[0,12]
-    
-    #   params = {
-    #     :id  => user_id
-    #   }
-    
-    #   u = Pingpp::User.create(params)
-    
-    #   assert u.object == 'user'
-    #   assert u.id == user_id
-    # end
-
-    should "settle_account retrieve" do
-      puts RUBY_VERSION
-      puts OpenSSL::OPENSSL_LIBRARY_VERSION
-      puts OpenSSL::OPENSSL_VERSION
-      puts OpenSSL::VERSION
-
-
-      u = Pingpp::User.retrieve(get_user_id)
-
-      assert u.object == 'user'
-      assert u.id == get_user_id
-    end
-
-    # should "settle_account update" do
-
-    #   u = Pingpp::SettleAccount.update(get_settle_account_id, {}, {:user => get_user_id})
-
-    #   assert u.object == 'list'
-    #   assert u.data.count <= 3
-    # end
-
-    should "settle_account list" do
-      l = Pingpp::SettleAccount.list({:per_page => 3}, {:user => get_user_id})
-
-      assert l.object == 'list'
-      assert l.data.count <= 3
-    end
-
-    # should "settle_account delete" do
-    #   u = Pingpp::SettleAccount.delete(get_settle_account_id, {:user => get_user_id})
-
-    #   assert u.object == 'deleted'
-    # end
-  end
-end