wechat_payment 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61c4ab32413e5389896bde1f772149d3df02e74c4cdcd76973ed942c6e25009
-  data.tar.gz: b5d53616d2f40fa7c112ca57319f5d4c29606053ae291fb09aee8a8280674ea5
+  metadata.gz: 3ccc823e0ae167b60ffa78ba54e98c559c95c0019167a3c2e5033db6718f741b
+  data.tar.gz: 68e1de8aa02ac29ebc7d6012173dfdaa0162c493dbcb08f36e55db7909ef38b3
 SHA512:
-  metadata.gz: 9265a884ffd5b9a544644400bac0e2c89c75b87803fb95d9542e8e0cbfce76c8688928b9aad3aeaf54c67b261a0c7cb99d0f2021a749a7207cd4a35a40380c0c
-  data.tar.gz: 95e24b9a3941112ad5698a3cbbdf313c38f4755d0a2ecc0dcaca0c2ce4ddf62b4045bddac81b7fcdf24b394a4ede23d512b5db232436975f0165c60c08490df8
+  metadata.gz: 6dc4007ff8cbdd1cc8d347ed4d9193e43cddcf683192dae186ecf2b1f4511ce288acf40cffa6f10c66268382fb140f65d984ed9539a27388d6c258022f9c8b3b
+  data.tar.gz: 7655b449f9e31b5e481b174648ee6019753607addceb45ee0e4e848ce0d3aec11da6ddf1007694c80a51a005c817a3c927f910b3c95310830209ed1e05201d52

data/app/models/wechat_payment/payment_order.rb

@@ -73,9 +73,16 @@ module WechatPayment
     #   "orderId": 17
     # }
     def pay
+      if payment_params.present?
+        return ServiceResult.new(success: true, data: payment_params, message: "获取支付参数成功")
+      end
+
       order_result = WechatPayment::Service.new(self).order
       if order_result.success?
         payload = WechatPayment::Client.gen_js_pay_payload(order_result.data).merge(orderId: id).with_indifferent_access
+
+        update(payment_params: payload)
+
         WechatPayment::ServiceResult.new(success: true, data: payload)
       else
         order_result
@@ -203,7 +210,8 @@ module WechatPayment
       update(
         state: :paid,
         transaction_id: result["transaction_id"],
-        paid_at: Time.current
+        paid_at: Time.current,
+        payment_params: nil
       )
 
       if goods.respond_to? :payment_exec_success

data/db/migrate/20210706075217_create_wechat_payment_payment_orders.rb

@@ -14,6 +14,7 @@ class CreateWechatPaymentPaymentOrders < ActiveRecord::Migration[6.1]
       t.string :state
       t.datetime :paid_at
       t.datetime :refunded_at
+      t.jsonb :payment_params
 
       t.timestamps
     end

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

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