cmb_pay 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973b9cf0d5d2974860b0d7fff0cd75d570adc8d6
-  data.tar.gz: 192ec7d563ace627bcd1e832d5691a8f76268ecf
+  metadata.gz: 7cb6e2e16c168adda66116084b9baee9885df88f
+  data.tar.gz: 538974a366f22d25f637d139d1a6422ff368f773
 SHA512:
-  metadata.gz: 3cd712678f799430ce5c34b9382405448f837fe0752c28bfff61aea7b4f8af51043574c946c8f8231d024f9acf157c8753b50943e1a043932de9d2c70c1ea278
-  data.tar.gz: 50472f3eabe787fe14e9a107404775d31b26108fa4a40fd56b77b80681e5ea4867480595a6312e733c804eb53e2629009ec73d7d7d7d39bc3616c5dc0f5def04
+  metadata.gz: 037d0f1f208ca53ba2bfb47d09c87f68d7ee5992e3e63e50d5d956b3bac73a8badf359839049803df0dcc441b94e8d2555ae5ff02715d1da03b5f1daacc06b3a
+  data.tar.gz: a8bfbee55dd68369f559f4f5c013cb330076046481f5948d3542f913791e2f760d68501a79b5f11fce929412084c75c5785cc8dfb19aed6e1afb0759ad6eaf9e

data/.codeclimate.yml

@@ -0,0 +1,18 @@
+---
+engines:
+  duplication:
+    enabled: true
+    exclude_fingerprints:
+    - 02bd778d4f4ff959546967a3bcaffc6e
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- spec/

data/.rubocop.yml

@@ -5,7 +5,7 @@ Documentation:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 150
+  Max: 300
 
 Metrics/AbcSize:
   Max: 57
@@ -21,3 +21,6 @@ Style/NumericLiterals:
 
 Style/AsciiComments:
   Enabled: false
+
+Style/ParameterLists:
+  Max: 15

data/README.md

@@ -3,6 +3,14 @@ CMB Pay [![Gem Version][version-badge]][rubygems] [![Build Status][travis-badge]
 
 An unofficial cmb (China Merchants Bank) pay ruby gem, inspired from [alipay](https://github.com/chloerei/alipay), [wx_pay](https://github.com/jasl/wx_pay) and [cmbchina](https://github.com/yellong/cmbchina) a lot.
 
+## Feature
+
+* Payment URL generation for Web, App and WAP(Mobile Web).
+* CMB Bank notification payment callback parse and verify.
+* Direct refund API.
+* Single order query.
+* Multi orders query by transact/merchant date/settled date.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/cmb_pay/message/bill_records_message.rb

@@ -0,0 +1,85 @@
+require 'rexml/streamlistener'
+
+module CmbPay
+  class BillRecordsMessage
+    attr_reader :raw_http_response, :code, :error_message,
+                :query_loop_flag, :query_loop_pos, :bill_records
+    def initialize(http_response)
+      @raw_http_response = http_response
+      return unless http_response.code == 200
+      @bill_records = []
+
+      REXML::Document.parse_stream(http_response.body, self)
+    end
+
+    def tag_start(name, _attributes)
+      case name
+      when 'Head'      then @in_head = true
+      when 'Body'      then @in_body = true
+      when 'BllRecord' then @current_bill_record = {}
+      else
+        @current_element_name = name
+      end
+    end
+
+    def tag_end(name)
+      case name
+      when 'Head'      then @in_head = false
+      when 'Body'      then @in_body = false
+      when 'BllRecord' then @bill_records << @current_bill_record
+      end
+    end
+
+    def text(text)
+      if @in_head
+        case @current_element_name
+        when 'Code'   then @code = text
+        when 'ErrMsg' then @error_message = text
+        end
+      elsif @in_body
+        case @current_element_name
+        # 续传标记(采用多次通讯方式续传时使用) 默认值为’N’，表示没有后续数据包，’Y’表示仍有后续的通讯包
+        when 'QryLopFlg'    then @query_loop_flag = text
+        # 续传包请求数据
+        when 'QryLopBlk'    then @query_loop_pos = text
+        # 商户定单号
+        when 'BillNo'       then @current_bill_record[:bill_no] = text
+        # 商户日期
+        when 'MchDate'      then @current_bill_record[:merchant_date] = text
+        # 结算日期
+        when 'StlDate'      then @current_bill_record[:settled_date] = text
+        # 订单状态
+        when 'BillState'    then @current_bill_record[:bill_state] = text
+        # 订单金额
+        when 'BillAmount'   then @current_bill_record[:bill_amount] = text
+        # 手续费
+        when 'FeeAmount'    then @current_bill_record[:fee_amount] = text
+        # 卡类型
+        when 'CardType'     then @current_bill_record[:card_type] = text
+        # 交易流水号
+        when 'BillRfn'      then @current_bill_record[:bill_ref_no] = text
+        # 实扣金额
+        when 'StlAmount'    then @current_bill_record[:settled_amount] = text
+        # 优惠金额
+        when 'DecPayAmount' then @current_bill_record[:discount_pay_amount] = text
+        # 订单类型：A表示二维码支付订单，B表示普通订单
+        when 'BillType'     then @current_bill_record[:bill_type] = text
+        # 如果订单类型为A，下述字段才存在
+        when 'Addressee'    then @current_bill_record[:addressee] = text # 收货人姓名
+        when 'Country'      then @current_bill_record[:country] = text   # 国家
+        when 'Province'     then @current_bill_record[:province] = text  # 省份
+        when 'City'         then @current_bill_record[:city] = text      # 城市
+        when 'Address'      then @current_bill_record[:address] = text   # 街道地址
+        when 'Mobile'       then @current_bill_record[:mobile] = text    # 手机号
+        when 'Telephone'    then @current_bill_record[:telephone] = text # 固定电话
+        when 'ZipCode'      then @current_bill_record[:zipcode] = text   # 邮编
+        when 'GoodsURL'     then @current_bill_record[:goodsurl] = text  # 商品详情链接
+        end
+      end
+    end
+
+    def succeed?
+      code.nil? && error_message.nil?
+    end
+  end
+end

data/lib/cmb_pay/message/pay_message.rb

@@ -0,0 +1,81 @@
+module CmbPay
+  class PayMessage
+    attr_reader :succeed        # 消息成功失败,成功为'Y',失败为'N'
+    attr_reader :co_no          # 商户号，6位长数字，由银行在商户开户时确定
+    attr_reader :bill_no        # 订单号(由支付命令送来)；
+    attr_reader :amount         # 实际支付金额(由支付命令送来)
+    attr_reader :date           # 订单下单日期(由支付命令送来)
+    attr_reader :merchant_para  # 商户自定义传递参数(由支付命令送来)
+    attr_reader :msg            # 银行通知用户支付结构消息
+    attr_reader :discount_flag  # 当前订单是否有优惠，Y:有优惠 N：无优惠。
+    attr_reader :discount_amt   # 优惠金额，格式：xxxx.xx，当有优惠的时候，
+                                # 实际用户支付的是amount - discount_amt的金额到商户账号。
+
+    attr_reader :branch_id      # 分行号
+    attr_reader :bank_date      # 银行主机交易日期
+    attr_reader :bank_serial_no # 银行流水号
+
+    attr_reader :signature      # 通知命令签名
+
+    attr_reader :query_string   # 原始的query_string
+
+    def initialize(query_string)
+      query_string = URI.encode_www_form(query_string) if query_string.is_a? Hash
+      @query_string = query_string
+
+      params = URI.decode_www_form(query_string).to_h
+
+      @succeed = params['Succeed']
+      @co_no = params['CoNo']
+      @bill_no = params['BillNo']
+      @amount = params['Amount']
+      @date = params['Date']
+      @merchant_para = params['MerchantPara']
+      @msg = params['Msg']
+      @discount_flag = params['DiscountFlag']
+      @discount_amt = params['DiscountAmt']
+
+      # 银行通知用户的支付结果消息。信息的前38个字符格式为：4位分行号＋6位商户号＋8位银行接受交易的日期＋20位银行流水号；
+      # 可以利用交易日期＋银行流水号＋订单号对该订单进行结帐处理
+      msg = params['Msg'][0..37]
+      @branch_id = msg[0..3]
+      @co_no ||= msg[4..9]
+      @bank_date = msg[10..17]
+      @bank_serial_no = msg[18..37]
+
+      @signature = params['Signature']
+    end
+
+    def valid?
+      Sign::Sha1WithRsa.verify(query_string)
+    end
+
+    def succeed?
+      succeed == 'Y'
+    end
+
+    def discount?
+      discount_flag == 'Y'
+    end
+
+    def amount_cents
+      (amount.to_f * 100).to_i
+    end
+
+    def discount_amount_cents
+      (discount_amt.to_f * 100).to_i
+    end
+
+    def order_date
+      Date.strptime(date, '%Y%m%d')
+    end
+
+    def payment_date
+      Date.strptime(bank_date, '%Y%m%d')
+    end
+
+    def merchant_params
+      URI.decode_www_form(merchant_para.tr('|', '&')).to_h
+    end
+  end
+end

data/lib/cmb_pay/message/refund_order_message.rb

@@ -0,0 +1,34 @@
+require 'rexml/document'
+
+module CmbPay
+  class RefundOrderMessage
+    attr_reader :raw_http_response, :code, :error_message,
+                :refund_no,   # 银行退款流水号
+                :bank_seq_no, # 银行流水号
+                :amount,      # 退款金额
+                :date,        # 银行交易日期YYYYMMDD
+                :time         # 银行交易时间hhmmss
+
+    def initialize(http_response)
+      @raw_http_response = http_response
+      return unless http_response.code == 200
+
+      document_root = REXML::Document.new(http_response.body.to_s).root
+      head = document_root.elements['Head']
+      @code          = head.elements['Code'].text
+      @error_message = head.elements['ErrMsg'].text
+      return unless succeed?
+
+      body = document_root.elements['Body']
+      @refund_no   = body.elements['RefundNo'].text
+      @bank_seq_no = body.elements['BankSeqNo'].text
+      @amount      = body.elements['Amount'].text
+      @date        = body.elements['Date'].text
+      @time        = body.elements['Time'].text
+    end
+
+    def succeed?
+      code.nil? && error_message.nil?
+    end
+  end
+end

data/lib/cmb_pay/message/single_order_message.rb

@@ -0,0 +1,45 @@
+require 'rexml/document'
+
+module CmbPay
+  class SingleOrderMessage
+    attr_reader :raw_http_response, :code, :error_message,
+                :bill_no,       # 定单号
+                :amount,        # 实扣金额
+                :accept_date,   # 受理日期
+                :accept_time,   # 受理时间
+                :bill_amount,   # 定单金额
+                :status,        # 定单状态，0－已结帐，1－已撤销，2－部分结帐，4－未结帐，7-冻结交易-已经冻结金额已经全部结账 8-冻结交易，冻结金额只结帐了一部分
+                :card_type,     # 卡类型：02：一卡通 03：信用卡
+                :fee,           # 手续费
+                :merchant_para, # 商户自定义参数。里面的特殊字符已经转码
+                :card_no,       # 卡号（部分数字用“*”掩盖）
+                :bank_seq_no    # 银行流水号
+    def initialize(http_response)
+      @raw_http_response = http_response
+      return unless http_response.code == 200
+
+      document_root = REXML::Document.new(http_response.body.to_s).root
+      head = document_root.elements['Head']
+      @code          = head.elements['Code'].text
+      @error_message = head.elements['ErrMsg'].text
+      return unless succeed?
+
+      body = document_root.elements['Body']
+      @bill_no       = body.elements['BillNo'].text
+      @amount        = body.elements['Amount'].text
+      @accept_date   = body.elements['AcceptDate'].text
+      @accept_time   = body.elements['AcceptTime'].text
+      @bill_amount   = body.elements['BillAmount'].text
+      @status        = body.elements['Status'].text
+      @card_type     = body.elements['CardType'].text
+      @fee           = body.elements['Fee'].text
+      @merchant_para = body.elements['MerchantPara'].text
+      @card_no       = body.elements['CardNo'].text
+      @bank_seq_no   = body.elements['BankSeqNo'].text
+    end
+
+    def succeed?
+      code.nil? && error_message.nil?
+    end
+  end
+end

data/lib/cmb_pay/service.rb

@@ -5,13 +5,15 @@ module CmbPay
         NP_BindCard:  'https://mobile.cmbchina.com/mobilehtml/DebitCard/M_NetPay/OneNetRegister/NP_BindCard.aspx',
         PrePayEUserP: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayEUserP',
         PrePayC2: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayC2',
-        PrePayWAP: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayWAP'
+        PrePayWAP: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?PrePayWAP',
+        DirectRequestX: 'https://payment.ebank.cmbchina.com/netpayment/basehttp.dll?DirectRequestX'
       },
       test: {
         NP_BindCard:  'http://61.144.248.29:801/mobilehtml/DebitCard/M_NetPay/OneNetRegister/NP_BindCard.aspx',
         PrePayEUserP: 'http://61.144.248.29:801/netpayment/BaseHttp.dll?PrePayEUserP',
         PrePayC2: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?TestPrePayC2',
-        PrePayWAP: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?TestPrePayWAP'
+        PrePayWAP: 'https://netpay.cmbchina.com/netpayment/BaseHttp.dll?TestPrePayWAP',
+        DirectRequestX: 'http://218.17.27.197/netpayment/basehttp.dll?DirectRequestX'
       }
     }.freeze
 

data/lib/cmb_pay/util.rb

@@ -1,11 +1,24 @@
 module CmbPay
   module Util
+    MILLISECONDS_SINCE_UNIX_EPOCH = Time.new(2000, 1, 1).to_i * 1000
+
     def self.hex_to_binary(str)
-      str.scan(/../).map(&:hex).map(&:chr).join
+      [str].pack('H*')
     end
 
     def self.binary_to_hex(s)
-      s.each_byte.map { |b| b.to_s(16).rjust(2, '0') }.join.upcase
+      s.unpack('H*')[0].upcase
+    end
+
+    def self.cmb_timestamp(t: nil)
+      return t if t.is_a?(Integer)
+      t = Time.now if t.nil?
+      t.to_i * 1000 + (t.usec / 1000) - MILLISECONDS_SINCE_UNIX_EPOCH
+    end
+
+    # 招行定单号，6位或10位长数字，由商户系统生成，一天内不能重复
+    def self.cmb_bill_no(bill_no)
+      format('%010d', bill_no.to_i % 10_000_000_000)
     end
   end
 end

data/lib/cmb_pay/version.rb

@@ -1,3 +1,3 @@
 module CmbPay
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/lib/cmb_pay.rb

@@ -1,25 +1,33 @@
 require 'date'
 require 'uri'
-require 'active_support/core_ext/hash'
+require 'http' # https://github.com/httprb/http
 require 'cmb_pay/version'
 require 'cmb_pay/util'
 require 'cmb_pay/sign'
 require 'cmb_pay/merchant_code'
-require 'cmb_pay/message'
 require 'cmb_pay/service'
 
 module CmbPay
+  autoload(:PayMessage, File.expand_path('cmb_pay/message/pay_message', __dir__))
+  autoload(:RefundOrderMessage, File.expand_path('cmb_pay/message/refund_order_message', __dir__))
+  autoload(:SingleOrderMessage, File.expand_path('cmb_pay/message/single_order_message', __dir__))
+  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 :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   # 默认收款方的用户标识
   end
   @co_key = ''
   @mch_no = ''
+  @operator = '9999'
+  @operator_password = ''
   @expire_in_minutes = 30
   @environment = :production
 
@@ -79,19 +87,99 @@ module CmbPay
                          options)
   end
 
-  def self.cmb_pay_message(query_string)
-    CmbPay::Message.new query_string
+  def self.pay_message(query_string)
+    PayMessage.new query_string
+  end
+
+  # 退款接口
+  def self.refund_no_dup(bill_no:, refund_no:, refund_amount_in_cents:, memo:,
+                         bill_date: nil, operator: nil, operator_password: nil,
+                         branch_id: nil, co_no: nil, co_key: nil, time_stamp: nil)
+    refund_in_yuan, refund_in_cent = refund_amount_in_cents.to_i.divmod(100)
+    refund_amount = "#{refund_in_yuan}.#{format('%02d', refund_in_cent)}"
+    desc = memo.encode(xml: :text)
+    bill_date = Time.now.strftime('%Y%m%d') if bill_date.nil?
+    head_inner_xml = build_direct_request_x_head('Refund_No_Dup', branch_id, co_no, time_stamp,
+                                                 with_operator: true, operator: operator, operator_password: operator_password)
+    body_inner_xml = "<Date>#{bill_date}</Date><BillNo>#{Util.cmb_bill_no(bill_no)}</BillNo><RefundNo>#{Util.cmb_bill_no(refund_no)}</RefundNo><Amount>#{refund_amount}</Amount><Desc>#{desc}</Desc>"
+    http_response = hash_and_direct_request_x(co_key, head_inner_xml, body_inner_xml)
+    RefundOrderMessage.new(http_response)
+  end
+
+  # 单笔定单查询接口
+  def self.query_single_order(bill_no:, trade_date: nil,
+                              branch_id: nil, co_no: nil, co_key: nil, time_stamp: nil)
+    trade_date = Time.now.strftime('%Y%m%d') if trade_date.nil?
+    head_inner_xml = build_direct_request_x_head('QuerySingleOrder', branch_id, co_no, time_stamp)
+    body_inner_xml = "<Date>#{trade_date}</Date><BillNo>#{Util.cmb_bill_no(bill_no)}</BillNo>"
+    http_response = hash_and_direct_request_x(co_key, head_inner_xml, body_inner_xml)
+    SingleOrderMessage.new(http_response)
+  end
+
+  # 商户入账查询接口
+  # pos: 当<QryLopFlg>Y</QryLopFlg>续传标记为Y时（表示仍有后续的通讯包，采用多次通讯方式续传时使用)
+  #      填写<QryLopBlk>续传包请求数据</QryLopBlk>中的数据
+  def self.query_transact(begin_date:, end_date:, count:, operator: nil, pos: nil,
+                          branch_id: nil, co_no: nil, co_key: nil, time_stamp: nil)
+    query_order_by_cmb_command('QueryTransact', begin_date, end_date, count, operator, pos, branch_id, co_no, co_key, time_stamp)
+  end
+
+  # 按商户日期查询已结账订单接口
+  def self.query_settled_order_by_merchant_date(begin_date:, end_date:, count:, operator: nil, pos: nil,
+                                                branch_id: nil, co_no: nil, co_key: nil, time_stamp: nil)
+    query_order_by_cmb_command('QuerySettledOrderByMerchantDate', begin_date, end_date, count, operator, pos, branch_id, co_no, co_key, time_stamp)
+  end
+
+  # 按结账日期查询已结账订单接口
+  def self.query_settled_order_by_settled_date(begin_date:, end_date:, count:, operator: nil, pos: nil,
+                                               branch_id: nil, co_no: nil, co_key: nil, time_stamp: nil)
+    query_order_by_cmb_command('QuerySettledOrderBySettledDate', begin_date, end_date, count, operator, pos, branch_id, co_no, co_key, time_stamp)
   end
 
   private_class_method
 
+  def self.query_order_by_cmb_command(cmb_command, begin_date, end_date, count, operator, pos,
+                                      branch_id, co_no, co_key, time_stamp)
+    head_inner_xml = build_direct_request_x_head(cmb_command, branch_id, co_no, time_stamp)
+    body_inner_xml = build_direct_request_x_query_body(begin_date, end_date, count, operator, pos)
+    http_response = hash_and_direct_request_x(co_key, head_inner_xml, body_inner_xml)
+    BillRecordsMessage.new(http_response)
+  end
+
+  def self.build_direct_request_x_head(cmb_command, branch_id, co_no, time_stamp,
+                                       with_operator: false, operator: nil, operator_password: nil)
+    branch_id = CmbPay.branch_id if branch_id.nil?
+    co_no = CmbPay.co_no if co_no.nil?
+    if with_operator
+      operator = CmbPay.operator if operator.nil?
+      operator_password = CmbPay.operator_password if operator_password.nil?
+      "<BranchNo>#{branch_id}</BranchNo><MerchantNo>#{co_no}</MerchantNo><Operator>#{operator}</Operator><Password>#{operator_password}</Password><TimeStamp>#{Util.cmb_timestamp(t: time_stamp)}</TimeStamp><Command>#{cmb_command}</Command>"
+    else
+      "<BranchNo>#{branch_id}</BranchNo><MerchantNo>#{co_no}</MerchantNo><TimeStamp>#{Util.cmb_timestamp(t: time_stamp)}</TimeStamp><Command>#{cmb_command}</Command>"
+    end
+  end
+
+  def self.build_direct_request_x_query_body(begin_date, end_date, count, operator, pos)
+    operator = '9999' if operator.nil?
+    begin_date = begin_date.strftime('%Y%m%d') unless begin_date.is_a?(String)
+    end_date = end_date.strftime('%Y%m%d') unless end_date.is_a?(String)
+    "<BeginDate>#{begin_date}</BeginDate><EndDate>#{end_date}</EndDate><Count>#{count}</Count><Operator>#{operator}</Operator><pos>#{pos}</pos>"
+  end
+
+  def self.hash_and_direct_request_x(co_key, head_inner_xml, body_inner_xml)
+    co_key = CmbPay.co_key if co_key.nil?
+    hash_input = "#{co_key}#{head_inner_xml}#{body_inner_xml}"
+    hash_xml = "<Hash>#{Sign.sha1_digest(hash_input)}</Hash>"
+    request_xml = "<Request><Head>#{head_inner_xml}</Head><Body>#{body_inner_xml}</Body>#{hash_xml}</Request>"
+    HTTP.post(Service.request_gateway_url(:DirectRequestX), form: { 'Request' => request_xml })
+  end
+
   def self.generate_pay_link_of(pay_type, payer_id, bill_no, amount_in_cents, merchant_url, merchant_para,
                                 protocol, merchant_ret_url, merchant_ret_para, card_bank, options)
     branch_id = options.delete(:branch_id) || CmbPay.branch_id
     co_no = options.delete(:co_no) || CmbPay.co_no
     co_key = options.delete(:co_key) || CmbPay.co_key
-    # 定单号，6位或10位长数字，由商户系统生成，一天内不能重复；
-    cmb_bill_no = format('%010d', bill_no.to_i % 10_000_000_000)
+    cmb_bill_no = Util.cmb_bill_no(bill_no)
     expire_in_minutes = options.delete(:expire_in_minutes) || CmbPay.expire_in_minutes
     pay_in_yuan, pay_in_cent = amount_in_cents.to_i.divmod(100)
     pay_amount = "#{pay_in_yuan}.#{format('%02d', pay_in_cent)}"
@@ -100,15 +188,7 @@ module CmbPay
     payee_id = options.delete(:payee_id) || CmbPay.default_payee_id
     random = options.delete(:random)
     if protocol.is_a?(Hash) && !payer_id.nil?
-      cmb_reserved_xml = {
-        'PNo' => protocol['PNo'],
-        'TS' => protocol['TS'] || Time.now.strftime('%Y%m%d%H%M%S'),
-        'MchNo' => CmbPay.mch_no,
-        'Seq' => protocol['Seq'],
-        'MUID' => payer_id,
-        'URL' => merchant_url,
-        'Para' => cmb_merchant_para
-      }.to_xml(root: 'Protocol', skip_instruct: true, skip_types: true, indent: 0)
+      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>"
     else
       cmb_reserved_xml = generate_cmb_card_bank_xml(card_bank)
       payee_id = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmb_pay
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Eric Guo
@@ -30,7 +30,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -52,26 +52,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.1.x
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.1.x
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".idea/vcs.xml"
 - ".rspec"
@@ -132,10 +113,12 @@ files:
 - bin/console
 - bin/setup
 - certs/Eric-Guo.pem
-- checksum/cmb_pay-0.0.3.gem.sha512
 - lib/cmb_pay.rb
 - lib/cmb_pay/merchant_code.rb
-- lib/cmb_pay/message.rb
+- lib/cmb_pay/message/bill_records_message.rb
+- lib/cmb_pay/message/pay_message.rb
+- lib/cmb_pay/message/refund_order_message.rb
+- lib/cmb_pay/message/single_order_message.rb
 - lib/cmb_pay/public.key
 - lib/cmb_pay/service.rb
 - lib/cmb_pay/sign.rb

data/checksum/cmb_pay-0.0.3.gem.sha512

@@ -1 +0,0 @@
-49dec10bce7bd6a94b0b80e6539e209a2297bcc6a6fc23699d78d5f2cdd222b36a7ce4aa6f18cfd27afed3d326891938d7279c5e41fecad986f9ea5f6af49443

data/lib/cmb_pay/message.rb

@@ -1,68 +0,0 @@
-module CmbPay
-  class Message
-    attr_accessor :succeed        # 消息成功失败,成功为'Y',失败为'N'
-    attr_accessor :co_no          # 商户号，6位长数字，由银行在商户开户时确定
-    attr_accessor :bill_no        # 订单号(由支付命令送来)；
-    attr_accessor :amount         # 实际支付金额(由支付命令送来)
-    attr_accessor :date           # 订单下单日期(由支付命令送来)
-    attr_accessor :merchant_para  # 商户自定义传递参数(由支付命令送来)
-    attr_accessor :msg            # 银行通知用户支付结构消息
-
-    attr_accessor :branch_id      # 分行号
-    attr_accessor :bank_date      # 银行主机交易日期
-    attr_accessor :bank_serial_no # 银行流水号
-
-    attr_accessor :signature      # 通知命令签名
-
-    attr_reader   :query_string   # 原始的query_string
-
-    def initialize(query_string)
-      query_string = URI.encode_www_form(query_string) if query_string.is_a? Hash
-      @query_string = query_string
-
-      params = URI.decode_www_form(query_string).to_h
-
-      @succeed = params['Succeed']
-      @co_no = params['CoNo']
-      @bill_no = params['BillNo']
-      @amount = params['Amount']
-      @date = params['Date']
-      @merchant_para = params['MerchantPara']
-      @msg = params['Msg']
-
-      # 银行通知用户的支付结果消息。信息的前38个字符格式为：4位分行号＋6位商户号＋8位银行接受交易的日期＋20位银行流水号；
-      # 可以利用交易日期＋银行流水号＋订单号对该订单进行结帐处理
-      msg = params['Msg'][0..37]
-      @branch_id = msg[0..3]
-      @co_no ||= msg[4..9]
-      @bank_date = msg[10..17]
-      @bank_serial_no = msg[18..37]
-
-      @signature = params['Signature']
-    end
-
-    def valid?
-      Sign::Sha1WithRsa.verify(query_string)
-    end
-
-    def succeed?
-      succeed == 'Y'
-    end
-
-    def amount_cents
-      (amount.to_f * 100).to_i
-    end
-
-    def order_date
-      Date.strptime(date, '%Y%m%d')
-    end
-
-    def payment_date
-      Date.strptime(bank_date, '%Y%m%d')
-    end
-
-    def merchant_params
-      URI.decode_www_form(merchant_para.tr('|', '&')).to_h
-    end
-  end
-end