wechat_payment 2.0.5 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a2f9d7deaaaed1d3b98076b2f01e2c8f3717ec1523e036324c5a479c5cc5385
-  data.tar.gz: 38e2e94679a07a1128aa1b88111b54c43dea2614aa8ead79808c8beb882421ab
+  metadata.gz: 3acba715b3e59f36af2ae3bbec80a199773f262e07fc95fff8a3a8da7fd339c8
+  data.tar.gz: 84fb7b364df1ac7cae171a4fafa64a1f4396336471f2637a176154de110edb99
 SHA512:
-  metadata.gz: ec536f1580a1ce147f0892a0c90c3f696929dc5ad1f6cfbef1ddd8b25df65c3e9ecf31fef578054e952d385995734d59bc59fbdbe17f195f7c4bd6d04286fc59
-  data.tar.gz: 73988c1100320edfab0babc54a144e96067b9a13212c1ef3253e7186c3c54cfab6dd860d33d6f0ddbc490d2a29c0d8280071f994672ca8c8537c70741af53ba1
+  metadata.gz: cfd511f056ecf1b79e87eaa2a1b8d0c8eda5f73449cb95b57dbaf12cca7ad9600cad2b9d6553782c665b6781de9ec50abe8f330d3983dfb39b0e1b1c77328d71
+  data.tar.gz: e78ecd5f76ad88e07696a6eb14ec8d558ee91306331a0de687d8fb18392407258ceddbc5d441ec4b336fe227302cb271a868edba42d07e7146645454b4bee2f0

data/app/models/wechat_payment/payment_order.rb

@@ -17,7 +17,7 @@ module WechatPayment
       pending_pay: "pending_pay",
       refunded: "refunded",
       failed: "failed"
-    }, _default: "pending"
+    }, _default: "pending_pay"
 
     # 将部分用户信息保存至订单
     def set_customer_info
@@ -109,7 +109,7 @@ module WechatPayment
 
     # 已退款的金额(包括正在退款的金额)
     def refunded_fee
-      refund_orders.where(state: [:pending, :refunded]).sum(:refund_fee)
+      refund_orders.where(state: [:pending_refund, :refunded]).sum(:refund_fee)
     end
 
     # 实际已退的金额

data/app/models/wechat_payment/refund_order.rb

@@ -8,10 +8,10 @@ module WechatPayment
     belongs_to :customer, polymorphic: true
 
     enum state: {
-      pending: "pending",
+      pending_refund: "pending_refund",
       refunded: "refunded",
       failed: "failed"
-    }, _default: :pending
+    }, _default: "pending_refund"
 
     # 生成退款编号
     def gen_out_refund_no
@@ -62,7 +62,7 @@ module WechatPayment
 
       update(
         refund_id: result["refund_id"],
-        state: :pending
+        state: :pending_refund
       )
 
       result

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,52 @@ 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
       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)
       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.5'
+  VERSION = '2.0.9'
 end

metadata

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