wechat_payment 2.0.8 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f4044d658d3093db1078f065765d207441d6556419de26fd6e7f88169a8467
-  data.tar.gz: 3bc5fbf36af300ca50c15e1ae37523df59da4aa6169f7cac57b696a59a8bfdb1
+  metadata.gz: 3d873ce178368297c4807c2931b92f2589d1bcf21f0ded448750e32c98bc523e
+  data.tar.gz: 07cd0af3317c3454674a0a8951c5c826c5411ed242aa152d6a4a90850c52ce90
 SHA512:
-  metadata.gz: d87869b6dab7c779d1ec4a5f5de801989b5058f9e7f34e7eff4455fc641e2196e2ebc0d2894df5486ec8d1d829fca8e39cf65c91deac5f9c8d16096e774c86cb
-  data.tar.gz: 9cb4c3a15a3422ecfeb1a26d7eaafd20b7274de371b1241c42723b52bec8c7398a8ef56633986b977ebdc5172cdb0f63a73f8f961b11c95fcae7c6c860c7c304
+  metadata.gz: bd673814ef12f40cfb7d77fae2b032c146896f9509615067a1f5d029a43c89c37302eb6f4e869e5d7138c96477001a577f357a9383f60e36e2b4f80d80acaa29
+  data.tar.gz: 24d4427cdd1abcc358d04c771dbd9cf6875214b2a11887b6519e20371c8fdaecdda8987c7b82787be006feace175b6ed8114999d3ef63590de67c08ba4415e53

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/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

@@ -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
 
@@ -66,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
 
@@ -78,18 +77,18 @@ 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: "回调签名验证失败")
+        payment_logger.error("{msg: 签名验证失败, error: #{notify_data}}")
+        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,19 +32,34 @@ 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
         )
+
+        unless payment_order.save
+          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

@@ -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.8'
+  VERSION = '2.0.12'
 end

metadata

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