ccb_connect_client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa8b35d86e633600a752178983e3c81e1ff98c3
-  data.tar.gz: 9c79175e570d327e7c00e5f4f3c3ef966ebe71e2
+  metadata.gz: 3e117ad6c14f5c141c0bf6e60e2b8fd0ed7daa25
+  data.tar.gz: 733eddbfe7f51f2361ec145dbf4c3ead8123f422
 SHA512:
-  metadata.gz: 83ba2ada8f3df3828d4b0834248af25264a1224029f17cae41fbd6927882ad3443c293b9ee0de571e13e3c379a46605a56e139bf6768d6395e56a0340cd617f6
-  data.tar.gz: af807df5ef7a8de5553faa036a1cf1fc9572a16cc8433f9630561cf176578346e2c0eaa385b2987b439cbf70c872c664df950e3268289fe1f090fd547816e688
+  metadata.gz: 0c64881a50068ed9739feca15520deb9b4c513385c94bb2712674e2569e7beac9fa2b981018e568a26681aba7256e7992c1c0f8bffdb446882ab62dfdef676e2
+  data.tar.gz: c853bded6d4e251e0e2ee6327163c06eb8803bda21e721eed523ab7adc8f52be596fbe1affe8173c738604de3a7be2af8c90a9d01ef419969e34e13ba09cdb55

data/lib/ccb_connect_client/models/payment_details_query_request.rb

@@ -3,7 +3,8 @@ require 'builder'
 module CcbConnectClient
 
   class PaymentDetailsQueryRequest < BaseRequest
-    attr_accessor :order
+    attr_accessor :order, :start_day, :start_hour, :start_min, :end_day, :end_hour, :end_min, :kind,
+                  :account, :dexcel, :money, :norderby, :page, :pos_code, :status, :mrch_no
 
     def initialize
       super
@@ -21,22 +22,22 @@ module CcbConnectClient
         xml.TX_CODE "#{@tx_code}"
         xml.LANGUAGE "#{CcbConnectClient.language}"
         xml.TX_INFO{
-          # xml.START "#{@start_day}"
-          # xml.STARTHOUR "#{@start_hour}"
-          # xml.STARTMIN "#{@start_min}"
-          # xml.END "#{@end_day}"
-          # xml.ENDHOUR "#{@end_hour}"
-          # xml.ENDMIN "#{@end_min}"
-          # xml.KIND "0"
+          xml.START "#{@start_day}"
+          xml.STARTHOUR "#{@start_hour}"
+          xml.STARTMIN "#{@start_min}"
+          xml.END "#{@end_day}"
+          xml.ENDHOUR "#{@end_hour}"
+          xml.ENDMIN "#{@end_min}"
+          xml.KIND "#{@kind}"
           xml.ORDER "#{@order}"
-          # xml.ACCOUNT ""
-          # xml.DEXCEL "1"
-          # xml.MONEY "#{@money}"
-          # xml.NORDERBY "1"
-          # xml.PAGE "1"
-          # xml.POS_CODE ""
-          # xml.STATUS ""
-          # xml.Mrch_No ""
+          xml.ACCOUNT "#{@account}"
+          xml.DEXCEL "#{@dexcel}"
+          xml.MONEY "#{@money}"
+          xml.NORDERBY "#{@norderby}"
+          xml.PAGE "#{@page}"
+          xml.POS_CODE "#{@pos_code}"
+          xml.STATUS "#{@status}"
+          xml.Mrch_No "#{@mrch_no}"
         }
       }
       target = xml.target!
@@ -45,7 +46,5 @@ module CcbConnectClient
       end
       target
     end
-
   end
-
 end

data/lib/ccb_connect_client/models/payment_details_query_response.rb

@@ -5,19 +5,21 @@ include REXML
 module CcbConnectClient
   
   class PaymentDetailsQueryResponse < BaseResponse
-    attr_accessor :cust_id, :tx_code, :language, :cur_page, :page_count, :notice, :tran_date, :acc_date,
-                  :order, :account, :acc_name, :payment_money, :refund_money, :pos_id, :rem1, :order_status, :order_status_name
+    attr_accessor :cust_id, :tx_code, :language, :cur_page, :page_count, :notice, :list
 
     def initialize
       super
     end
 
-    def self.from_xml xml
+    def from_xml xml
       response = PaymentDetailsQueryResponse.new
       doc = Document.new(xml)
+      # logger = Logger.new('foo.log', 'monthly')
+      # logger.datetime_format = '%Y-%m-%d %H:%M:%S'
 
       if CcbConnectClient.debug_mode
-        puts "RefundResponse response : #{doc}"
+        # logger.info("PaymentDetailsQueryResponse response xml: #{doc}")
+        puts "PaymentDetailsQueryResponse response xml: #{doc}"
       end
 
       response.request_sn = doc.elements["TX/REQUEST_SN"].text
@@ -29,37 +31,55 @@ module CcbConnectClient
       # INFO
       response.cur_page = doc.elements["TX/TX_INFO/CUR_PAGE"].text
       response.page_count = doc.elements["TX/TX_INFO/PAGE_COUNT"].text
+      response.list = Array.new
       # LIST
-      response.tran_date = doc.elements["TX/TX_INFO/LIST/TRAN_DATE"].text
-      response.acc_date = doc.elements["TX/TX_INFO/LIST/ACC_DATE"].text
-      response.order = doc.elements["TX/TX_INFO/LIST/ORDER"].text
-      response.account = doc.elements["TX/TX_INFO/LIST/ACCOUNT"].text
-      response.acc_name = doc.elements["TX/TX_INFO/LIST/ACC_NAME"].text
-      response.payment_money = doc.elements["TX/TX_INFO/LIST/PAYMENT_MONEY"].text
-      response.refund_money = doc.elements["TX/TX_INFO/LIST/REFUND_MONEY"].text
-      response.pos_id = doc.elements["TX/TX_INFO/LIST/POS_ID"].text
-      response.rem1 = doc.elements["TX/TX_INFO/LIST/REM1"].text
-      response.order_status = doc.elements["TX/TX_INFO/LIST/ORDER_STATUS"].text
-
-      case response.order_status
-      when '0'
-        response.order_status_name = "失败"
-      when '1'
-        response.order_status_name = "成功"
-      when '2'
-        response.order_status_name = "待银行确认"
-      when '3'
-        response.order_status_name = "已部分退款"
-      when '4'
-        response.order_status_name = "已全额退款"
-      else
-        response.order_status_name = "待银行确认"
-      end
+      doc.elements.each("TX/TX_INFO/LIST") { |e|
+        response_element = PaymentDetailsQueryResponseElement.new
+        response_element.tran_date = e.elements["TRAN_DATE"].text
+        response_element.acc_date = e.elements["ACC_DATE"].text
+        response_element.order = e.elements["ORDER"].text
+        response_element.account = e.elements["ACCOUNT"].text
+        response_element.acc_name = e.elements["ACC_NAME"].text
+        response_element.payment_money = e.elements["PAYMENT_MONEY"].text
+        response_element.refund_money = e.elements["REFUND_MONEY"].text
+        response_element.pos_id = e.elements["POS_ID"].text
+        response_element.rem1 = e.elements["REM1"].text
+        response_element.rem2 = e.elements["REM2"].text
+        order_status = OrderStatus.new
+        order_status.status = e.elements["ORDER_STATUS"].text
+        case order_status.status
+          when '0'
+            order_status.status_name = "失败"
+          when '1'
+            order_status.status_name = "成功"
+          when '2'
+            order_status.status_name = "待银行确认"
+          when '3'
+            order_status.status_name = "已部分退款"
+          when '4'
+            order_status.status_name = "已全额退款"
+          when '5'
+            order_status.status_name = "待银行确认"
+        end
+        response_element.order_status = order_status
+        response.list.push(response_element)
+      }
 
       if CcbConnectClient.debug_mode
-        puts "RefundResponse response : #{response.inspect}"
+        # logger.info("PaymentDetailsQueryResponse response xml: #{doc}")
+        puts "PaymentDetailsQueryResponse response object: #{response.inspect}"
       end
       response
     end
   end
+
+  class PaymentDetailsQueryResponseElement
+    attr_accessor :tran_date, :acc_date, :order, :account, :acc_name, :payment_money, :refund_money,
+                  :pos_id, :rem1, :rem2, :order_status
+  end
+
+  class OrderStatus
+    attr_accessor :status, :status_name
+  end
+
 end

data/lib/ccb_connect_client/models/refund_request.rb

@@ -3,7 +3,7 @@ require 'builder'
 module CcbConnectClient
 
   class RefundRequest < BaseRequest 
-    attr_accessor :money, :order, :refund_code
+    attr_accessor :money, :order, :refund_code, :sign_info
 
     def initialize
       super
@@ -23,9 +23,9 @@ module CcbConnectClient
         xml.TX_INFO{
           xml.MONEY "#{@money}"
           xml.ORDER "#{@order}"
-          #xml.REFUND_CODE "#{@refund_code}"
+          xml.REFUND_CODE "#{@refund_code}"
         }
-        #xml.SIGN_INFO "#{}"
+        xml.SIGN_INFO "#{@sign_info}"
       }
       target = xml.target!
       if CcbConnectClient.debug_mode
@@ -33,7 +33,5 @@ module CcbConnectClient
       end
       target
     end
-
   end
-
 end

data/lib/ccb_connect_client/models/refund_response.rb

@@ -10,12 +10,12 @@ module CcbConnectClient
       super
     end
 
-    def self.from_xml xml
+    def from_xml xml
       response = RefundResponse.new
       doc = Document.new(xml)
 
       if CcbConnectClient.debug_mode
-        puts "RefundResponse response : #{doc}"
+        puts "RefundResponse response xml: #{doc}"
       end
 
       response.request_sn = doc.elements["TX/REQUEST_SN"].text
@@ -30,7 +30,7 @@ module CcbConnectClient
       response.amount = doc.elements["TX/TX_INFO/AMOUNT"].text
 
       if CcbConnectClient.debug_mode
-        puts "RefundResponse response : #{response.inspect}"
+        puts "RefundResponse response object: #{response.inspect}"
       end
       response
     end

data/lib/ccb_connect_client/service.rb

@@ -4,51 +4,46 @@ require 'uri'
 module CcbConnectClient
 
   module Service
-    def self.refund refund_request
-      res = http_post_form CcbConnectClient.server, refund_request.to_xml
-      doc = Document.new(res.body)
-
-      if doc.elements["TX/RETURN_CODE"].text != "000000"
-        response = BaseResponse.from_xml res.body
-        response.successful = false
-        response
-      else
-        response = RefundResponse.from_xml res.body
-        response.successful = true
-
-        if CcbConnectClient.debug_mode
-          puts "RefundResponse response : #{response.inspect}"
-        end
-
-        response
-      end
 
+    def self.refund refund_request
+      refund_response = RefundResponse.new
+      Handler.new.response_handler refund_request, refund_response
     end
 
     def self.payment_details_query payment_details_query_request
-      res = http_post_form CcbConnectClient.server, payment_details_query_request.to_xml
-      doc = Document.new(res.body)
-
-      if doc.elements["TX/RETURN_CODE"].text != "000000"
-        response = BaseResponse.from_xml res.body
-        response.successful = false
-        response
-      else
-        response = PaymentDetailsQueryResponse.from_xml res.body
-        response.successful = true
-
-        if CcbConnectClient.debug_mode
-          puts "PaymentDetailsQueryResponse response : #{response.inspect}"
-        end
+      payment_details_query_response = PaymentDetailsQueryResponse.new
+      Handler.new.response_handler payment_details_query_request, payment_details_query_response
+    end
+
+    class Handler
 
-        response
+      def response_handler(request, response)
+
+        http_post_form CcbConnectClient.server, request.to_xml do |res|
+          doc = Document.new(res.body)
+
+          if doc.elements["TX/RETURN_CODE"].text != "000000"
+            result = BaseResponse.from_xml res.body
+            result.successful = false
+          else
+            result = response.from_xml res.body
+            result.successful = true
+          end
+        end
       end
 
+      private
+      def http_post_form(url, xml)
+        uri = URI.parse(url)
+        req = Net::HTTP::Post.new(uri)
+        req["Content-Type"] = "application/x-www-form-urlencoded"
+        req["Accept-Encoding"] = "identity"
+        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+          req.set_form_data('requestXml' => xml)
+          res = http.request req
+          yield res
+        end
+      end
     end
-    
-    def self.http_post_form(url, xml)
-      response = Net::HTTP.post_form URI(url), requestXml: xml
-    end
-
   end
 end

data/lib/ccb_connect_client/version.rb

@@ -1,3 +1,3 @@
 module CcbConnectClient
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/lib/ccb_connect_client.rb

@@ -12,7 +12,8 @@ module CcbConnectClient
 
   class<< self
     attr_accessor :server, :debug_mode
-    attr_accessor :cust_id, :user_id, :password, :language   
+    attr_accessor :cust_id, :user_id, :password, :language
+    attr_accessor :logger
   end
 
 end

data/spec/ccb_connect_client_service_spec.rb

@@ -2,28 +2,46 @@ require 'spec_helper'
 
 describe CcbConnectClient::Service do
 
-  it 'should be successful' do
-    CcbConnectClient.server = "http://192.168.10.90:9000"
-    CcbConnectClient.cust_id = '105000148164407'
-    CcbConnectClient.user_id = '001'
-    CcbConnectClient.password = 'SbusTrade9'
-    CcbConnectClient.language = 'CN'
+  it 'RefundRequest should be successful' do
+    file_lines = File.open("./spec/fixtures/Adminfile.txt","r").readlines
+    CcbConnectClient.server = file_lines[0].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.cust_id = file_lines[1].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.user_id = file_lines[2].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.password = file_lines[3].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.language = file_lines[4].split(pattern='\'')[1]
     request = CcbConnectClient::RefundRequest.new
     request.money = 7.01
     request.order = 'L238201903071717YKIHNW'
     CcbConnectClient::Service.refund request
   end
 
-  it 'should be successful' do
-    CcbConnectClient.server = "http://192.168.10.90:9000"
-    CcbConnectClient.cust_id = '105000148164407'
-    CcbConnectClient.user_id = '001'
-    CcbConnectClient.password = 'SbusTrade9'
-    CcbConnectClient.language = 'CN'
+  it 'PaymentDetailsQueryRequest should be successful' do
+    file_lines = File.open("./spec/fixtures/Adminfile.txt","r").readlines
+    CcbConnectClient.server = file_lines[0].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.cust_id = file_lines[1].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.user_id = file_lines[2].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.password = file_lines[3].gsub("\n", '').split(pattern='\'')[1]
+    CcbConnectClient.language = file_lines[4].split(pattern='\'')[1]
     request = CcbConnectClient::PaymentDetailsQueryRequest.new
     # request.money = 7.01
-    request.order = 'L238201903071717YKIHNW'
+    # :start_day, :start_hour, :start_min, :end_day, :end_hour, :end_min, :kind,
+    # :account, :dexcel, :money, :norderby, :page, :pos_code, :status, :mrch_no
+    # request.order = 'L238201903071717YKIHNW'
+    request.start_day = '20190306'
+    request.start_hour = '00'
+    request.start_min = '00'
+    request.end_day = '20190312'
+    request.end_hour = '14'
+    request.end_min = '20'
+    request.kind = '1'
+    # request.account = '20190306'
+    request.dexcel = '1'
+    # request.money = '20190306'
+    request.norderby = '1'
+    request.page = '1'
+    # request.pos_code = '20190306'
+    request.status = '3'
+    # request.mrch_no = '20190306'
     CcbConnectClient::Service.payment_details_query request
   end
-
-end 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccb_connect_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - LCola