wechat_payment 2.0.7 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ac17c0ea1a99ad55e63958da4dfbefc0282f9962ce038a738b4322d09a501c
-  data.tar.gz: e61cc08c219cb5c90cb74be1836ada62f120ccb64481e5d2e2be6aa7ed4f7fcb
+  metadata.gz: 4edf41cf427155d4e2307562ee8a080fc99d2973ed9bbdd7b16431c293a133a1
+  data.tar.gz: 6766d6104766fc5b76c1096ec19e35aadecc9c2cb989ccd76d66c7e1249b6009
 SHA512:
-  metadata.gz: 6310f34d9941e697640cb0902415cc7dd9ecfdd743c2b02fa0b05d1202f57d81afd262a81d45999046f0b4f2e90dfc42f66c745ed1278339dc08207adb621297
-  data.tar.gz: dabde1251f1337d373be190c1dfd23b022d6b5e32ca4b50ceaa6b1a1aeccb54fd1c55cb354b47fdb43846948d3a6847b06f28dc4b926ca4be50b405d20bfc03e
+  metadata.gz: d9319c9dd8961de6f55b4a187af79dfcb2310d28f5780b1b70ba12c2f1e219ed97d4dc254ecfcd706eaa5f1d53875f74518ad70df82beb6fbcb85cf4a11b303f
+  data.tar.gz: 7aa4f7e2a8d13e448a1f9e970b1cbd2395784d23c626e4a4f41639edc6ee4fb01cf0310554cb5c5f4a2ac6289ec90290606e3244ca1a2414e24f498b16e26877

data/app/services/wechat_payment/service.rb

@@ -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_pay?
+      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
 
@@ -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
 
@@ -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,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.7'
+  VERSION = '2.0.11'
 end

metadata

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