wechat_payment 2.0.10 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8712e877d54c4964bc93daf8e3fa4df1bc57cbc794811cbfbf096661297d68ec
-  data.tar.gz: '0878c15e6c7a6b13a8aff61753bf87c31328d0d3686d5b3900ac0e5c199a2589'
+  metadata.gz: 383f51dd9ca42a1ef6dd1231871e604fc7d985fba7990b5750759e698c5b9e8b
+  data.tar.gz: 4adbdbfbc709dc96cf6df6a038f721589fa7f11b7dfb8d744685b01bc16060b1
 SHA512:
-  metadata.gz: 4cafd39213ccee668a34e2650699663444d1df8d627e070f87e30e8a24433a695f0c2b638d135867e6bfb40dcf4e626c0110017662d429d9943ef54933683cf8
-  data.tar.gz: ade54ef7701156d7fa899df557d1b5b3333693790ff03d117462eea1d94b524bee9841d3ade7d51b70d10a03a00df27a129032bd519219ff7d892054d4658228
+  metadata.gz: 90b55232826903f31a1aca89a4d67e620ff3a9ba73f62c7d53916f2da30b12fe3612827c5883974f8cec8a1c7bd6efad715988f3c732baa333f8c690985b32cd
+  data.tar.gz: aa71fc09c2d6fe3e8b0db85758c3a9aa4a42a0f1d38fa01691357171590b8608db3635b6240a224110f95830f512cd58a9307e71f9f0f8a49ff2820ef7151152

data/app/controllers/wechat_payment/callback_controller.rb

@@ -10,7 +10,7 @@ module WechatPayment
       if process_result.success?
         render xml: { return_code: "SUCCESS" }.to_xml(root: 'xml', dasherize: false)
       else
-        render xml: { return_code: "FAIL", return_msg: process_result.errors.first }.to_xml(root: 'xml', dasherize: false)
+        render xml: { return_code: "FAIL", return_msg: process_result.error.first }.to_xml(root: 'xml', dasherize: false)
       end
     end
 
@@ -21,7 +21,7 @@ module WechatPayment
       if refund_result.success?
         render xml: {return_code: "SUCCESS"}.to_xml(root: 'xml', dasherize: false)
       else
-        render xml: {return_code: "FAIL", return_msg: refund_result.errors.first}.to_xml(root: 'xml', dasherize: false)
+        render xml: {return_code: "FAIL", return_msg: refund_result.error.first}.to_xml(root: 'xml', dasherize: false)
       end
 
     end

data/app/controllers/wechat_payment/payment_orders_controller.rb

@@ -1,5 +1,5 @@
 
-class PaymentOrdersController < ApplicationController
+class WechatPayment::PaymentOrdersController < ApplicationController
   def index
     @payment_orders = WechatPayment::PaymentOrder.by_state(params[:state])
 

data/app/models/wechat_payment/payment_order.rb

@@ -28,7 +28,7 @@ module WechatPayment
     # 生成交易编号
     def gen_out_trade_no
       loop do
-        out_trade_no = "#{Time.current.to_i}#{SecureRandom.random_number(999_999_999)}"
+        out_trade_no = "#{WechatPayment.order_no_prefix}#{Time.current.to_i}#{SecureRandom.random_number(999_999_999)}"
         records_count = WechatPayment::PaymentOrder.where(out_trade_no: out_trade_no).count
         if records_count == 0
           self.out_trade_no = out_trade_no

data/app/services/wechat_payment/service.rb

@@ -15,7 +15,7 @@ module WechatPayment
       if order_result.success?
         payment_order.payment_apply_success(order_result.data)
       else
-        payment_order.payment_apply_failure(order_result.errors)
+        payment_order.payment_apply_failure(order_result.error)
       end
 
       order_result
@@ -33,7 +33,7 @@ module WechatPayment
       if refund_result.success?
         refund_order.refund_apply_success(refund_result.data)
       else
-        refund_order.refund_apply_failure(refund_result.errors)
+        refund_order.refund_apply_failure(refund_result.error)
       end
 
       refund_result
@@ -49,7 +49,7 @@ module WechatPayment
           payment_order.payment_exec_success(result.data)
         end
       else
-        payment_order.payment_exec_failure(result.errors)
+        payment_order.payment_exec_failure(result.error)
       end
 
       result
@@ -65,7 +65,7 @@ module WechatPayment
           refund_order.refund_exec_success(result.data)
         end
       else
-        refund_order.refund_exec_failure(result.errors)
+        refund_order.refund_exec_failure(result.error)
       end
 
       result

data/lib/generators/wechat_payment/install/templates/initializer.rb

@@ -16,4 +16,7 @@ WechatPayment.setup do |config|
   config.sub_appid = "wx8f9f912623456789"
   config.sub_mch_id = "1234911291"
   config.sub_app_secret = "88888231e2f3a21152d163f61b99999"
+
+  # 生成的订单编号前缀
+  # config.order_no_prefix = "wx_"
 end

data/lib/wechat_payment/client.rb

@@ -65,7 +65,7 @@ module WechatPayment
         WechatPayment::ServiceResult.new(success: true, data: refund_result)
       else
         refund_logger.error "{params: #{refund_params}, result: #{refund_result}"
-        WechatPayment::ServiceResult.new(success: false, errors: refund_result)
+        WechatPayment::ServiceResult.new(success: false, error: refund_result)
       end
     end
 
@@ -77,7 +77,7 @@ module WechatPayment
     # 处理支付回调
     def self.handle_payment_notify(notify_data)
       if !WechatPayment::Sign.verify?(notify_data)
-        payment_logger.error("{msg: 签名验证失败, errors: #{notify_data}}")
+        payment_logger.error("{msg: 签名验证失败, error: #{notify_data}}")
         WechatPayment::ServiceResult.new(success: false, error: notify_data, message: "回调签名验证失败")
       end
 

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.10'
+  VERSION = '2.0.14'
 end

data/lib/wechat_payment.rb

@@ -5,7 +5,7 @@ module WechatPayment
 
   class << self
     attr_reader :apiclient_cert, :apiclient_key
-    attr_accessor :appid, :app_secret, :mch_id, :sub_appid, :sub_app_secret, :sub_mch_id, :key, :cert_path, :host
+    attr_accessor :appid, :app_secret, :mch_id, :sub_appid, :sub_app_secret, :sub_mch_id, :key, :cert_path, :host, :order_no_prefix
   end
 
   def self.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.14
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails