wechat_payment 2.0.9 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3acba715b3e59f36af2ae3bbec80a199773f262e07fc95fff8a3a8da7fd339c8
-  data.tar.gz: 84fb7b364df1ac7cae171a4fafa64a1f4396336471f2637a176154de110edb99
+  metadata.gz: 6f80eae6a4f7482e85fb59eb39fabf6a4d48b44c75020030f3df92e714af92dd
+  data.tar.gz: f93e93c6aa13ad0bc7f175a21e0ae0042466f85e1add3ecfdc66d6f4d4945857
 SHA512:
-  metadata.gz: cfd511f056ecf1b79e87eaa2a1b8d0c8eda5f73449cb95b57dbaf12cca7ad9600cad2b9d6553782c665b6781de9ec50abe8f330d3983dfb39b0e1b1c77328d71
-  data.tar.gz: e78ecd5f76ad88e07696a6eb14ec8d558ee91306331a0de687d8fb18392407258ceddbc5d441ec4b336fe227302cb271a868edba42d07e7146645454b4bee2f0
+  metadata.gz: d6a462950e6339c60ffe909b9e18e344e21fc26e0235510651269f8dbb099ddcef604bc0611023d0c36ab9e82e9a8d2dc4f5bb75dd2999a4ed3096308ff08cec
+  data.tar.gz: f9a7f2d102f2bd681a3b408ffb4111a8e68c7ebca95472e8ed0487f299ccf4f1d432fdd5333a0a940553a13b4d35bcaf8ba9cacae3dcd237dbab0326fe2131e7

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/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/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/concern/goods.rb

@@ -59,6 +59,7 @@ module WechatPayment
           return WechatPayment::ServiceResult.new(success: false, error: user_goods.errors, message: "支付订单创建失败")
         end
 
+        WechatPayment::ServiceResult.new(success: true, data: payment_order, message: "支付订单创建成功")
       end
 
       # 重新支付，应用场景是： 用户取消了支付后，使用最后一张订单进行支付

data/lib/wechat_payment/service_result.rb

@@ -12,7 +12,7 @@ module WechatPayment
                    message: nil,
                    message_type: nil,
                    data: nil,
-                   error_type)
+                   error_type: nil)
       self.success = success
 
       self.data = data.presence || {}

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.9'
+  VERSION = '2.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.13
 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