cmb_pay 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fe2d640abbeff5dae77c2c7147635c7d0f2ecf2
-  data.tar.gz: 34ca1429ed56ba1837adc383a9a407021b035b30
+  metadata.gz: 19a26d9fd5d53fda1e1ed76c238698f1ed5c89c8
+  data.tar.gz: c20644e92e5f1495888d1977e6a2f172f655ffdb
 SHA512:
-  metadata.gz: 752436a710d15cf097a43e01924757089c928fae8d4504c66e8f80a0f7df3118a2c7508830a387f82bf5f89225e5cac5f61787c20a34720c2d7bbe9f7e4e5fa7
-  data.tar.gz: 00b0c256eb70de481ee01005f1ef428fe1ca19cf9eea9638ef12a657169d09ecf0fd2305ce9c481b1489d66934a1376ef54104e79d9c06ea6bb8a1e36073e03c
+  metadata.gz: f69018d96dcc1320f6282a13f7146bc3020ab8d4d714fd331fbe3e45205db1552de9330de4745a279524b2ee6385fcd9a85e3d3b827456cae7f332eae9dfef4a
+  data.tar.gz: d0ab70616384d7b3266b7a56736753187ecb567d4fc365e7ff57f78c1ca8cd281b6a27bd19cd7d44df0160d62ed7f21c507996083f5d3cfbe5bcefc737c18d85

data/lib/cmb_pay.rb

@@ -14,15 +14,17 @@ module CmbPay
   autoload(:BillRecordsMessage, File.expand_path('cmb_pay/message/bill_records_message', __dir__))
 
   class << self
-    attr_accessor :branch_id          # 开户分行号
-    attr_accessor :co_no              # 支付商户号/收单商户号
-    attr_accessor :co_key             # 商户校验码/商户密钥，测试环境为空
-    attr_accessor :mch_no             # 协议商户企业编号，或者说是8位虚拟企业网银编号
-    attr_accessor :operator           # 操作员号，一般是9999
-    attr_accessor :operator_password  # 操作员的密码，默认是支付商户号，但建议修改。
-    attr_accessor :expire_in_minutes  # 会话有效时间
-    attr_accessor :environment        # 调用的招商银行支付环境，默认生产，测试填test
-    attr_accessor :default_payee_id   # 默认收款方的用户标识
+    attr_accessor :branch_id             # 开户分行号
+    attr_accessor :co_no                 # 支付商户号/收单商户号
+    attr_accessor :co_key                # 商户校验码/商户密钥，测试环境为空
+    attr_accessor :mch_no                # 协议商户企业编号，或者说是8位虚拟企业网银编号
+    attr_accessor :operator              # 操作员号，一般是9999
+    attr_accessor :operator_password     # 操作员的密码，默认是支付商户号，但建议修改。
+    attr_accessor :expire_in_minutes     # 会话有效时间
+    attr_accessor :environment           # 调用的招商银行支付环境，默认生产，测试填test
+    attr_accessor :default_payee_id      # 默认收款方的用户标识
+    attr_accessor :default_goods_type    # 默认收款方的商品类型
+    attr_accessor :one_cent_as_newspaper # 仅支付一分钱，商品类型直接归类到书报杂志，方便在生产上做快速测试和对账，默认启用
   end
   @co_key = ''
   @mch_no = ''
@@ -30,6 +32,7 @@ module CmbPay
   @operator_password = ''
   @expire_in_minutes = 30
   @environment = :production
+  @one_cent_as_newspaper = true
 
   SUPPORTED_BANK = {
     '招商银行' => nil,
@@ -60,6 +63,40 @@ module CmbPay
     '上海银行' => 313
   }.freeze
 
+  GOODS_TYPE = {
+    '网上支付' => 54_011_600,
+    '充值缴费' => 54_011_610,
+    '彩票' => 54_011_611,
+    '话费' => 54_011_612,
+    '虚拟商品' => 54_011_620,
+    '游戏点卡' => 54_011_621,
+    '旅游出行' => 54_010_6,
+    '酒店' => 54_010_650,
+    '机票' => 54_010_651,
+    '服装' => 54_010_5,
+    '文化教育' => 54_011_630,
+    '书报杂志' => 54_011_631,
+    '考试培训' => 54_011_632,
+    '数码产品' => 54_011_640,
+    '护肤化妆' => 54_010_7,
+    '母婴用品' => 54_011_650,
+    '生活日用' => 54_010_111,
+    '食品' => 54_010_112,
+    '汽车费用' => 54_010_2,
+    '信用卡还款' => 54_010_306, # 此商品类型只允许使用借记卡支付
+    '保险' => 54_011_1,
+    '家居物品' => 54_011_2,
+    '医疗保健' => 54_012_2,
+    '礼品' => 54_012_3,
+    '办公设备' => 54_011_660,
+    '家用电器' => 54_011_670,
+    '体育用品' => 54_011_680,
+    '娱乐休闲' => 54_010_8,
+    '网络服务' => 54_011_690,
+    '收藏爱好' => 54_011_691,
+    '投资理财' => 54_011_692
+  }.freeze
+
   def self.uri_of_pre_pay_euserp(payer_id:, bill_no:, amount_in_cents:, merchant_url:, merchant_para: nil,
                                  protocol:, merchant_ret_url:, merchant_ret_para: nil,
                                  options: {})
@@ -186,6 +223,11 @@ module CmbPay
     cmb_merchant_para = Service.encode_merchant_para(merchant_para)
     trade_date = options.delete(:trade_date) || Time.now.strftime('%Y%m%d')
     payee_id = options.delete(:payee_id) || CmbPay.default_payee_id
+    goods_type = if amount_in_cents == 1 && CmbPay.one_cent_as_newspaper == true
+                   '书报杂志'
+                 else
+                   options.delete(:goods_type) || CmbPay.default_goods_type
+                 end
     random = options.delete(:random)
     if protocol.is_a?(Hash) && !payer_id.nil?
       cmb_reserved_xml = "<Protocol><PNo>#{protocol['PNo']}</PNo><TS>#{protocol['TS'] || Time.now.strftime('%Y%m%d%H%M%S')}</TS><MchNo>#{CmbPay.mch_no}</MchNo><Seq>#{protocol['Seq']}</Seq><MUID>#{payer_id}</MUID><URL>#{merchant_url}</URL><Para>#{cmb_merchant_para}</Para></Protocol>"
@@ -197,7 +239,7 @@ module CmbPay
                                    branch_id: branch_id, co_no: co_no,
                                    bill_no: cmb_bill_no, amount: pay_amount,
                                    merchant_para: cmb_merchant_para, merchant_url: merchant_url,
-                                   payer_id: payer_id, payee_id: payee_id,
+                                   payer_id: payer_id, payee_id: payee_id, goods_type: encode_goods_type(goods_type),
                                    reserved: cmb_reserved_xml)
     uri_params = {
       'BranchID' => branch_id,
@@ -220,4 +262,9 @@ module CmbPay
     return nil if SUPPORTED_BANK[card_bank].nil?
     "<CardBank>#{format('%04d', SUPPORTED_BANK[card_bank])}</CardBank>"
   end
+
+  def self.encode_goods_type(goods_type)
+    return goods_type if /^\d+$/ =~ goods_type.to_s
+    GOODS_TYPE[goods_type]
+  end
 end

data/lib/cmb_pay/version.rb

@@ -1,3 +1,3 @@
 module CmbPay
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmb_pay
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Guo
@@ -30,7 +30,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http

metadata.gz.sig

@@ -1,4 +1,2 @@
-��Άu�L&����W���̙ֈ9�m�g��LԲ�=R��O�j�
A�K�MNגY�/"ZQ䐛>��VB��Z
-�DI�^v{����b��n�ּ2��Cȡʿ�SD["�F�d7�:���ߚـ~����fhͧ�"�]��H�4�
-=x�YdP},�i�e��sПY\3�J%�R�ᑩ-�NV�c�s��́���X�W|֮�+��!??��j�r̙�	���-���:�+x�Yżt��=C��
-CK�F����
+���R*��*
P��9�	~��G����ƒ�S�u2-�%�IGq����&3E��I�p�X����6������H���M�)���BA	��
+���d���+�/s2��ZM|]z���F4�\���v�ߧ��6GhC��&h��A����U��;/Υ ~mM<D)%�$;~�i��kd�i�!�����e�f&�D�q�]�ĸ���A��Os�1t엾��r�A��V���š�>$x�q肤+̤�nh���&3UC<�