wechat_payment 2.0.6 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c408e5bd232b6b23b55c5bff7f77dfe85d914cd5944df0939b43eb2491a1864
-  data.tar.gz: 55c60366e4261ea7f89cd6d23c1008226e1042c6531ea1dcdabc6c00b66e95b3
+  metadata.gz: 8712e877d54c4964bc93daf8e3fa4df1bc57cbc794811cbfbf096661297d68ec
+  data.tar.gz: '0878c15e6c7a6b13a8aff61753bf87c31328d0d3686d5b3900ac0e5c199a2589'
 SHA512:
-  metadata.gz: 79cac1d0f255db96a6b794410801753025f32911808bcc03df2297f943f626282ff40eb1a7bd164c4feb3166ebd0519dc9c18660517b0fe91f6e6cb4545ee6e5
-  data.tar.gz: a22ceb04e1a5207698c7acbe02252a667c9b2b7c6a85af9cbdc25c3ff1a61cf100e33a364c2a6fe36c5f1c700aa5f54ac40c7750bff304f32efa6978c4468293
+  metadata.gz: 4cafd39213ccee668a34e2650699663444d1df8d627e070f87e30e8a24433a695f0c2b638d135867e6bfb40dcf4e626c0110017662d429d9943ef54933683cf8
+  data.tar.gz: ade54ef7701156d7fa899df557d1b5b3333693790ff03d117462eea1d94b524bee9841d3ade7d51b70d10a03a00df27a129032bd519219ff7d892054d4658228

data/app/services/wechat_payment/service.rb

@@ -44,7 +44,7 @@ module WechatPayment
       result = WechatPayment::Client.handle_payment_notify(notify_data)
       payment_order = WechatPayment::PaymentOrder.find_by(out_trade_no: notify_data["out_trade_no"])
 
-      if result.success? && payment_order.pending?
+      if result.success? && payment_order.pending_pay?
         payment_order.with_lock do
           payment_order.payment_exec_success(result.data)
         end
@@ -60,7 +60,7 @@ module WechatPayment
       result = WechatPayment::Client.handle_refund_notify(notify_data)
       refund_order = WechatPayment::RefundOrder.find_by(out_refund_no: result.data["out_refund_no"])
 
-      if result.success? && refund_order.pending?
+      if result.success? && refund_order.pending_refund?
         refund_order.with_lock do
           refund_order.refund_exec_success(result.data)
         end

data/lib/wechat_payment/client.rb

@@ -39,11 +39,10 @@ module WechatPayment
       if order_result.success?
 
         payment_logger.info("{params: #{order_params}, result: #{order_result}}")
-        # WechatPayment::ServiceResult.new(success: true, data: { order_result: order_result.with_indifferent_access, js_payload: mini_program_request_params.with_indifferent_access })
         WechatPayment::ServiceResult.new(success: true, data: order_result.with_indifferent_access)
       else
         payment_logger.error("{params: #{order_params}, result: #{order_result}}")
-        WechatPayment::ServiceResult.new(success: false, errors: order_result.with_indifferent_access)
+        WechatPayment::ServiceResult.new(success: false, error: order_result.with_indifferent_access)
       end
     end
 
@@ -79,17 +78,17 @@ module WechatPayment
     def self.handle_payment_notify(notify_data)
       if !WechatPayment::Sign.verify?(notify_data)
         payment_logger.error("{msg: 签名验证失败, errors: #{notify_data}}")
-        WechatPayment::ServiceResult.new(errors: notify_data, message: "回调签名验证失败")
+        WechatPayment::ServiceResult.new(success: false, error: notify_data, message: "回调签名验证失败")
       end
 
       result = WechatPayment::InvokeResult.new(notify_data)
 
       if result.success?
         payment_logger.info("{callback: #{notify_data}}")
-        WechatPayment::ServiceResult.new(success: true, data: notify_data)
+        WechatPayment::ServiceResult.new(success: true, data: notify_data, message: "支付执行成功", )
       else
         payment_logger.error("{callback: #{notify_data}}")
-        WechatPayment::ServiceResult.new(errors: notify_data)
+        WechatPayment::ServiceResult.new(success: false, error: notify_data, message: "支付执行失败", error_type: :payment_exec_failed)
       end
     end
 
@@ -99,11 +98,11 @@ module WechatPayment
 
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
-        refund_logger.info "{callback: #{notify_data}}"
+        refund_logger.info "退款执行成功{callback: #{notify_data}}"
         WechatPayment::ServiceResult.new(success: true, data: notify_data)
       else
-        refund_logger.error "{callback: #{notify_data}}"
-        WechatPayment::ServiceResult.new(errors: notify_data)
+        refund_logger.error "退款执行失败: {callback: #{notify_data}}"
+        WechatPayment::ServiceResult.new(success:false, error: notify_data, message: "退款回调失败")
       end
     end
 

data/lib/wechat_payment/concern/goods.rb

@@ -32,38 +32,53 @@ module WechatPayment
           end
         end
 
-        user_goods = self.class.user_goods_model.constantize.create(
+        user_goods_model = self.class.user_goods_model.constantize
+
+        user_goods = user_goods_model.new(
           self.class.goods_ref_field => self,
           self.class.user_ref_field => user,
           **with_info,
           **persist_goods_data,
         )
 
-        user_goods.payment_orders.create(
+        unless user_goods.save
+          return WechatPayment::ServiceResult.new(success: false,
+                                                  error: user_goods.errors,
+                                                  message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
+                                                  error_type: :create_user_goods_failed)
+        end
+
+        payment_order = user_goods.payment_orders.new(
           body: name,
           total_fee: price,
           trade_type: :JSAPI,
           customer: user
         )
-      end
 
-      # 重新支付，应用场景是： 用户取消了支付后，使用最后一张订单进行支付
-      # @return [WechatPayment::ServiceResult]
-      def repay
-        # 如果不是待支付状态
-        unless pending?
-          WechatPayment::ServiceResult.new(message: "当前状态不可支付")
+        unless payment_order.save
+          return WechatPayment::ServiceResult.new(success: false, error: user_goods.errors, message: "支付订单创建失败")
         end
 
-        result = payment_orders.last.repay
-
-        if result.success?
-          WechatPayment::ServiceResult.new(success: true, data: result.data[:js_payload])
-        else
-          WechatPayment::ServiceResult.new(message: result.errors.first[:err_code_des])
-        end
+        WechatPayment::ServiceResult.new(success: true, data: payment_order, message: "支付订单创建成功")
       end
 
+      # 重新支付，应用场景是： 用户取消了支付后，使用最后一张订单进行支付
+      # @return [WechatPayment::ServiceResult]
+      # def repay
+      #   # 如果不是待支付状态
+      #   unless pending?
+      #     WechatPayment::ServiceResult.new(message: "当前状态不可支付")
+      #   end
+
+        # result = payment_orders.last.repay
+
+      #   if result.success?
+      #     WechatPayment::ServiceResult.new(success: true, data: result.data[:js_payload])
+      #   else
+      #     WechatPayment::ServiceResult.new(message: result.errors.first[:err_code_des])
+      #   end
+      # end
+
 
       # 退款
       # @param [Integer] refund_fee

data/lib/wechat_payment/service_result.rb

@@ -1,19 +1,28 @@
 module WechatPayment
   class ServiceResult
     attr_accessor :success,
-                  :errors,
+                  :error,
                   :data,
                   :message,
-                  :message_type
+                  :message_type,
+                  :error_type
 
     def initialize(success: false,
-                   errors: nil,
+                   error: nil,
                    message: nil,
                    message_type: nil,
-                   data: nil)
+                   data: nil,
+                   error_type: nil)
       self.success = success
-      self.data = data
-      self.errors = errors.is_a?(Enumerable) ? errors : [errors]
+
+      self.data = data.presence || {}
+
+      if self.data.is_a? Hash
+        self.data = self.data.with_indifferent_access
+      end
+
+      self.error = error
+
       self.message = message
       self.message_type = message_type
     end
@@ -36,14 +45,22 @@ module WechatPayment
       if message_type.present?
         message_type.to_sym
       elsif success?
-        :notice
+        :info
       else
         :error
       end
     end
 
     def as_json(options = {})
-      data.as_json(options)
+      # data.as_json(options)
+      {
+        success: success,
+        data: data,
+        message: message,
+        message_type: get_message_type,
+        error: error,
+        error_type: error_type
+      }
     end
   end
 end

data/lib/wechat_payment/version.rb

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

metadata

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