wechat_payment 2.0.12 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d873ce178368297c4807c2931b92f2589d1bcf21f0ded448750e32c98bc523e
-  data.tar.gz: 07cd0af3317c3454674a0a8951c5c826c5411ed242aa152d6a4a90850c52ce90
+  metadata.gz: c976e72ae7aec4d893bb8682f324f69759ee2c42a62efa19d7363931798c21bb
+  data.tar.gz: 1069c1c332dc0253a3e57b9c3301ff293e6accbdb279791892623d09db23d361
 SHA512:
-  metadata.gz: bd673814ef12f40cfb7d77fae2b032c146896f9509615067a1f5d029a43c89c37302eb6f4e869e5d7138c96477001a577f357a9383f60e36e2b4f80d80acaa29
-  data.tar.gz: 24d4427cdd1abcc358d04c771dbd9cf6875214b2a11887b6519e20371c8fdaecdda8987c7b82787be006feace175b6ed8114999d3ef63590de67c08ba4415e53
+  metadata.gz: '09eb12bc79a0dbd83e6dba6c3f2d67becd956b28665013e77ca30bfddd3ec51be79b6473b287096b7c1fe055014e532b8fb3133af146575c06190f56dbacfdcd'
+  data.tar.gz: 12228e2ea147aca00e1ee29e25c6d30956e4519fd98645cbec05f1de6e3057ae0d8a77ccac6eac6cae9ebb50f14bd88334f50a1e2ae43e2be6f4da3865d09612

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/config/locales/zh-CN.yml

@@ -0,0 +1,15 @@
+
+"zh-CN":
+  wechat_payment_service_result:
+    message:
+      invoke_unifiedorder_success: 统一支付预支付成功
+      invoke_unifiedorder_failed: 统一支付预支付失败
+      payment_apply_success: 支付发起成功
+      payment_apply_failed: 支付发起失败
+      payment_exec_success: 支付执行成功
+      payment_exec_failed: 支付执行失败
+      refund_apply_success: 退款发起成功
+      refund_apply_failed: 退款发起失败
+      refund_exec_success: 退款执行成功
+      refund_exec_failed: 退款执行失败
+      validate_sign_failed: 支付回调签名验证失败

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

@@ -3,23 +3,6 @@ module WechatPayment
   class Client
     GATEWAY_URL = 'https://api.mch.weixin.qq.com'.freeze
 
-    def initialize # (merchant = WechatPayment)
-      # required_attrs = [:appid, :mch_id, :key, :app_secret, :cert_path]
-      # missing_attrs = required_attrs.reject { |attr| merchant.respond_to?(attr) }
-      # if missing_attrs.present?
-      #   raise Exceptions::MerchantMissingAttr.new("Missing attributes: #{missing_attrs}, merchant target must respond to: appid, mch_id, key, appsecret, cert_path")
-      # end
-      #
-      # @merchant = merchant
-      # cert_path = Rails.root.join(merchant.cert_path)
-      #
-      # WechatPayment.appid = merchant.appid
-      # WechatPayment.key = merchant.key
-      # WechatPayment.mch_id = merchant.mch_id
-      # WechatPayment.appsecret = merchant.app_secret
-      # WechatPayment.set_apiclient_by_pkcs12(File.binread(cert_path), merchant.mch_id)
-    end
-
     ORDER_REQUIRED_FIELD = [:out_trade_no, :spbill_create_ip, :body, :total_fee, :openid]
     # 下单
     def order(order_params)
@@ -37,12 +20,13 @@ module WechatPayment
       order_result = invoke_unifiedorder(order_params)
 
       if order_result.success?
-
-        payment_logger.info("{params: #{order_params}, result: #{order_result}}")
-        WechatPayment::ServiceResult.new(success: true, data: order_result.with_indifferent_access)
+        message = "发起支付成功"
+        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        WechatPayment::SuccessResult.new(data: order_result, message:, message_kind: :payment_apply_success)
       else
-        payment_logger.error("{params: #{order_params}, result: #{order_result}}")
-        WechatPayment::ServiceResult.new(success: false, error: order_result.with_indifferent_access)
+        message = "发起支付失败"
+        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        WechatPayment::FailureResult.new(error: order_result, message:, message_kind: :payment_apply_failed)
       end
     end
 
@@ -61,11 +45,13 @@ module WechatPayment
       refund_result = invoke_refund(refund_params.to_options)
 
       if refund_result.success?
-        refund_logger.info "{params: #{refund_params}, result: #{refund_result}"
-        WechatPayment::ServiceResult.new(success: true, data: refund_result)
+        message = '发起退款成功'
+        WechatPayment::RefundLogger.info { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        WechatPayment::SuccessResult.new(data: refund_result, message:, message_kind: :refund_apply_success)
       else
-        refund_logger.error "{params: #{refund_params}, result: #{refund_result}"
-        WechatPayment::ServiceResult.new(success: false, error: refund_result)
+        message = "发起退款失败"
+        WechatPayment::RefundLogger.error { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        WechatPayment::FailureResult.new(error: refund_result, message:, message_kind: :refund_apply_failed)
       end
     end
 
@@ -77,18 +63,20 @@ module WechatPayment
     # 处理支付回调
     def self.handle_payment_notify(notify_data)
       if !WechatPayment::Sign.verify?(notify_data)
-        payment_logger.error("{msg: 签名验证失败, error: #{notify_data}}")
-        WechatPayment::ServiceResult.new(success: false, error: notify_data, message: "回调签名验证失败")
+        message = "回调签名验证失败"
+        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', error: #{notify_data} }" }
+        WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :validate_sign_failed)
       end
 
       result = WechatPayment::InvokeResult.new(notify_data)
-
       if result.success?
-        payment_logger.info("{callback: #{notify_data}}")
-        WechatPayment::ServiceResult.new(success: true, data: notify_data, message: "支付执行成功", )
+        message = "支付执行成功"
+        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :payment_exec_success)
       else
-        payment_logger.error("{callback: #{notify_data}}")
-        WechatPayment::ServiceResult.new(success: false, error: notify_data, message: "支付执行失败", error_type: :payment_exec_failed)
+        message = "支付执行失败"
+        WechatPayment::PaymentLogger.error{ "{ msg: '#{message}', callback: #{notify_data} }" }
+        WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :payment_exec_failed)
       end
     end
 
@@ -98,11 +86,13 @@ module WechatPayment
 
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
-        refund_logger.info "退款执行成功{callback: #{notify_data}}"
-        WechatPayment::ServiceResult.new(success: true, data: notify_data)
+        message = "退款执行成功"
+        WechatPayment::RefundLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :refund_exec_success)
       else
-        refund_logger.error "退款执行失败: {callback: #{notify_data}}"
-        WechatPayment::ServiceResult.new(success:false, error: notify_data, message: "退款回调失败")
+        message = "退款执行失败"
+        WechatPayment::RefundLogger.error { "{ msg: '#{message}', callback: #{notify_data} }" }
+        WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :refund_exec_failed)
       end
     end
 
@@ -139,7 +129,6 @@ module WechatPayment
       params
     end
 
-
     INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = [:body, :out_trade_no, :total_fee, :spbill_create_ip, :notify_url, :trade_type]
     def invoke_unifiedorder(params, options = {})
       params = {
@@ -176,7 +165,10 @@ module WechatPayment
       params[:op_user_id] ||= params[:mch_id]
 
       check_required_options(params, INVOKE_REFUND_REQUIRED_FIELDS)
-      warn("WechatPayment Warn: missing required option: out_trade_no or transaction_id must have one") if ([:out_trade_no, :transaction_id] & params.keys) == []
+
+      if ([:out_trade_no, :transaction_id] & params.keys) == []
+        warn("WechatPayment Warn: missing required option: out_trade_no or transaction_id must have one")
+      end
 
       options = {
         cert: options.delete(:apiclient_cert) || WechatPayment.apiclient_cert,
@@ -191,7 +183,6 @@ module WechatPayment
       )
 
       yield result if block_given?
-
       result
     end
 
@@ -237,7 +228,6 @@ module WechatPayment
       res.body
     end
 
-
     private
 
     # 判断 hash 是否缺少 key
@@ -248,24 +238,5 @@ module WechatPayment
         raise WechatPayment::MissingKeyError.new("Parameter missing keys: #{lack_of_keys}")
       end
     end
-
-    # 支付日志
-    def payment_logger
-      WechatPayment::Client.payment_logger
-    end
-
-    # 退款日志
-    def refund_logger
-      WechatPayment::Client.refund_logger
-    end
-
-    def self.payment_logger
-      @payment_logger ||= WechatPayment::RLogger.make("wx_payment")
-    end
-
-    def self.refund_logger
-      @refund_logger ||= WechatPayment::RLogger.make("wx_refund")
-    end
-
   end
-end
+end

data/lib/wechat_payment/concern/goods.rb

@@ -42,10 +42,9 @@ module WechatPayment
         )
 
         unless user_goods.save
-          return WechatPayment::ServiceResult.new(success: false,
-                                                  error: user_goods.errors,
+          return WechatPayment::FailureResult.new(error: user_goods.error,
                                                   message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
-                                                  error_type: :create_user_goods_failed)
+                                                  message_kind: :create_user_goods_failed)
         end
 
         payment_order = user_goods.payment_orders.new(
@@ -55,11 +54,13 @@ module WechatPayment
           customer: user
         )
 
-        unless payment_order.save
-          return WechatPayment::ServiceResult.new(success: false, error: user_goods.errors, message: "支付订单创建失败")
+        if payment_order.save
+          message = "支付订单创建成功"
+          WechatPayment::SuccessResult.new(data: payment_order, message:, message_kind: :create_payment_order_success)
+        else
+          message = "支付订单创建失败"
+          WechatPayment::FailureResult.new(error: user_goods.error, message:, message_kind: :create_payment_order_failed)
         end
-
-        WechatPayment::ServiceResult.new(success: true, data: payment_order, message: "支付订单创建成功")
       end
 
       # 重新支付，应用场景是： 用户取消了支付后，使用最后一张订单进行支付
@@ -92,4 +93,4 @@ module WechatPayment
       end
     end
   end
-end
+end

data/lib/wechat_payment/engine.rb

@@ -3,5 +3,6 @@ module WechatPayment
     isolate_namespace WechatPayment
 
     config.autoload_paths << "#{config.root}/lib"
+    config.i18n.default_locale = "zh-CN"
   end
 end

data/lib/wechat_payment/failure_result.rb

@@ -0,0 +1,7 @@
+
+class WechatPayment::FailureResult < WechatPayment::ServiceResult
+  def initialize(data: {}, error: nil, message: nil, message_kind: nil, message_type: nil)
+    super(success: false, data: data, error: error, message: message, message_kind: message_kind, message_type: message_type)
+  end
+
+end

data/lib/wechat_payment/logger.rb

@@ -0,0 +1,14 @@
+
+class WechatPayment::Logger
+  %w{ info error warn fatal }.each do |level|
+    define_singleton_method level do |content = "", &block|
+      Rails.logger.tagged *self.tags do
+        if block.present?
+          Rails.logger.send(level, &block)
+        else
+          Rails.logger.send(level, content)
+        end
+      end
+    end
+  end
+end

data/lib/wechat_payment/payment_logger.rb

@@ -0,0 +1,7 @@
+class WechatPayment::PaymentLogger < WechatPayment::Logger
+
+  def self.tags
+    ["WechatPayment", "Pay"]
+  end
+
+end

data/lib/wechat_payment/refund_logger.rb

@@ -0,0 +1,6 @@
+
+class WechatPayment::RefundLogger < WechatPayment::Logger
+  def self.tags
+    ["WechatPayment", "Refund"]
+  end
+end

data/lib/wechat_payment/service_result.rb

@@ -4,27 +4,22 @@ module WechatPayment
                   :error,
                   :data,
                   :message,
-                  :message_type,
-                  :error_type
+                  :message_kind,
+                  :message_type
 
     def initialize(success: false,
+                   data: {},
                    error: nil,
                    message: nil,
-                   message_type: nil,
-                   data: nil,
-                   error_type: nil)
-      self.success = success
-
-      self.data = data.presence || {}
-
-      if self.data.is_a? Hash
-        self.data = self.data.with_indifferent_access
-      end
+                   message_kind: nil,
+                   message_type: nil)
 
+      self.success = success
+      self.data = data
       self.error = error
-
       self.message = message
       self.message_type = message_type
+      self.message_kind = message_kind
     end
 
     alias success? :success
@@ -41,9 +36,9 @@ module WechatPayment
       yield(self) if failure?
     end
 
-    def get_message_type
-      if message_type.present?
-        message_type.to_sym
+    def message_type
+      if @message_type.present?
+        @message_type.to_sym
       elsif success?
         :info
       else
@@ -51,15 +46,22 @@ module WechatPayment
       end
     end
 
+    def message_kind_prefix
+      "wechat_payment_"
+    end
+
+    def message_kind
+      "#{message_kind_prefix}#{@message_kind}"
+    end
+
     def as_json(options = {})
-      # data.as_json(options)
       {
         success: success,
         data: data,
         message: message,
-        message_type: get_message_type,
         error: error,
-        error_type: error_type
+        message_kind: message_kind,
+        message_type: message_type
       }
     end
   end

data/lib/wechat_payment/success_result.rb

@@ -0,0 +1,6 @@
+
+class WechatPayment::SuccessResult < WechatPayment::ServiceResult
+  def initialize(data: {}, error: nil, message: nil, message_kind: nil, message_type: nil)
+    super(success: true, data: data, error: error, message: message, message_kind: message_kind, message_type: message_type)
+  end
+end

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.12'
+  VERSION = '2.1.0'
 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.12
+  version: 2.1.0
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +75,7 @@ files:
 - app/models/wechat_payment/refund_order.rb
 - app/services/wechat_payment/service.rb
 - app/views/layouts/wechat_payment/application.html.erb
+- config/locales/zh-CN.yml
 - config/routes.rb
 - db/migrate/20210706075217_create_wechat_payment_payment_orders.rb
 - db/migrate/20210706095205_create_wechat_payment_refund_orders.rb
@@ -92,11 +93,16 @@ files:
 - lib/wechat_payment/concern/user.rb
 - lib/wechat_payment/concern/user_goods.rb
 - lib/wechat_payment/engine.rb
+- lib/wechat_payment/failure_result.rb
 - lib/wechat_payment/invoke_result.rb
+- lib/wechat_payment/logger.rb
 - lib/wechat_payment/missing_key_error.rb
+- lib/wechat_payment/payment_logger.rb
 - lib/wechat_payment/r_logger.rb
+- lib/wechat_payment/refund_logger.rb
 - lib/wechat_payment/service_result.rb
 - lib/wechat_payment/sign.rb
+- lib/wechat_payment/success_result.rb
 - lib/wechat_payment/version.rb
 homepage: http://dev.com
 licenses:
@@ -120,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Summary of WechatPayment.