wechat_payment 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c976e72ae7aec4d893bb8682f324f69759ee2c42a62efa19d7363931798c21bb
-  data.tar.gz: 1069c1c332dc0253a3e57b9c3301ff293e6accbdb279791892623d09db23d361
+  metadata.gz: d7869db809862db9e0d242d723f3ab309ce374b2f4e802e356f0191691b68ca8
+  data.tar.gz: f25452d31d64ce7f95c6351da70a58ebf8dd80a200ad3695a28e90ec1782613c
 SHA512:
-  metadata.gz: '09eb12bc79a0dbd83e6dba6c3f2d67becd956b28665013e77ca30bfddd3ec51be79b6473b287096b7c1fe055014e532b8fb3133af146575c06190f56dbacfdcd'
-  data.tar.gz: 12228e2ea147aca00e1ee29e25c6d30956e4519fd98645cbec05f1de6e3057ae0d8a77ccac6eac6cae9ebb50f14bd88334f50a1e2ae43e2be6f4da3865d09612
+  metadata.gz: 934dadb407e4d8befa5dbf6912d05f17e00f67fc22d9351df69848ff9b354e310dbea9a6577ad1091e92ab45428ee84f296248adf2bf7fa3f986f9673fa6aae6
+  data.tar.gz: 2f599903670717b7f8d35c6974087c6b3130a6417d44d28a045a617a611fc15a28f7d4357ce8f9512bffafcf9aeddb9a49090ccc6ed150cf19da65538256c676

data/lib/wechat_payment/client.rb

@@ -21,11 +21,13 @@ module WechatPayment
 
       if order_result.success?
         message = "发起支付成功"
-        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        log_content = { message:, params: order_params, result: order_result }.to_json
+        WechatPayment::PaymentLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: order_result, message:, message_kind: :payment_apply_success)
       else
         message = "发起支付失败"
-        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        log_content = { message: , params: order_params, result: order_result }.to_json
+        WechatPayment::PaymentLogger.error { log_content }
         WechatPayment::FailureResult.new(error: order_result, message:, message_kind: :payment_apply_failed)
       end
     end
@@ -46,11 +48,13 @@ module WechatPayment
 
       if refund_result.success?
         message = '发起退款成功'
-        WechatPayment::RefundLogger.info { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        log_content = { message:, params: refund_params, result: refund_result}.to_json
+        WechatPayment::RefundLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: refund_result, message:, message_kind: :refund_apply_success)
       else
         message = "发起退款失败"
-        WechatPayment::RefundLogger.error { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        log_content = { message:, params: refund_params, result: refund_result }.to_json
+        WechatPayment::RefundLogger.error { log_content }
         WechatPayment::FailureResult.new(error: refund_result, message:, message_kind: :refund_apply_failed)
       end
     end
@@ -64,18 +68,20 @@ module WechatPayment
     def self.handle_payment_notify(notify_data)
       if !WechatPayment::Sign.verify?(notify_data)
         message = "回调签名验证失败"
-        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', error: #{notify_data} }" }
+        WechatPayment::PaymentLogger.error { { message: , error: notify_data }.to_json }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :validate_sign_failed)
       end
 
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
         message = "支付执行成功"
-        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::PaymentLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :payment_exec_success)
       else
         message = "支付执行失败"
-        WechatPayment::PaymentLogger.error{ "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::PaymentLogger.error { log_content }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :payment_exec_failed)
       end
     end
@@ -87,11 +93,13 @@ module WechatPayment
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
         message = "退款执行成功"
-        WechatPayment::RefundLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::RefundLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :refund_exec_success)
       else
         message = "退款执行失败"
-        WechatPayment::RefundLogger.error { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data}.to_json
+        WechatPayment::RefundLogger.error { log_content }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :refund_exec_failed)
       end
     end

data/lib/wechat_payment/concern/goods.rb

@@ -42,6 +42,12 @@ module WechatPayment
         )
 
         unless user_goods.save
+          log_content = {
+            message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
+            error: user_goods.errors.full_messages
+          }.to_json
+
+          WechatPayment::Logger.info { log_content }
           return WechatPayment::FailureResult.new(error: user_goods.error,
                                                   message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
                                                   message_kind: :create_user_goods_failed)
@@ -59,6 +65,8 @@ module WechatPayment
           WechatPayment::SuccessResult.new(data: payment_order, message:, message_kind: :create_payment_order_success)
         else
           message = "支付订单创建失败"
+          log_content = { message:, error: payment_order.errors.full_messages }.to_json
+          WechatPayment::Logger.error { log_content }
           WechatPayment::FailureResult.new(error: user_goods.error, message:, message_kind: :create_payment_order_failed)
         end
       end

data/lib/wechat_payment/logger.rb

@@ -1,5 +1,9 @@
 
 class WechatPayment::Logger
+  def self.tags
+    ["WechatPayment"]
+  end
+
   %w{ info error warn fatal }.each do |level|
     define_singleton_method level do |content = "", &block|
       Rails.logger.tagged *self.tags do

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - ian