wechat_payment 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61c4ab32413e5389896bde1f772149d3df02e74c4cdcd76973ed942c6e25009
-  data.tar.gz: b5d53616d2f40fa7c112ca57319f5d4c29606053ae291fb09aee8a8280674ea5
+  metadata.gz: 4c408e5bd232b6b23b55c5bff7f77dfe85d914cd5944df0939b43eb2491a1864
+  data.tar.gz: 55c60366e4261ea7f89cd6d23c1008226e1042c6531ea1dcdabc6c00b66e95b3
 SHA512:
-  metadata.gz: 9265a884ffd5b9a544644400bac0e2c89c75b87803fb95d9542e8e0cbfce76c8688928b9aad3aeaf54c67b261a0c7cb99d0f2021a749a7207cd4a35a40380c0c
-  data.tar.gz: 95e24b9a3941112ad5698a3cbbdf313c38f4755d0a2ecc0dcaca0c2ce4ddf62b4045bddac81b7fcdf24b394a4ede23d512b5db232436975f0165c60c08490df8
+  metadata.gz: 79cac1d0f255db96a6b794410801753025f32911808bcc03df2297f943f626282ff40eb1a7bd164c4feb3166ebd0519dc9c18660517b0fe91f6e6cb4545ee6e5
+  data.tar.gz: a22ceb04e1a5207698c7acbe02252a667c9b2b7c6a85af9cbdc25c3ff1a61cf100e33a364c2a6fe36c5f1c700aa5f54ac40c7750bff304f32efa6978c4468293

data/app/models/wechat_payment/payment_order.rb

@@ -14,10 +14,10 @@ module WechatPayment
 
     enum state: {
       paid: "paid",
-      pending: "pending",
+      pending_pay: "pending_pay",
       refunded: "refunded",
       failed: "failed"
-    }, _default: "pending"
+    }, _default: "pending_pay"
 
     # 将部分用户信息保存至订单
     def set_customer_info
@@ -72,10 +72,17 @@ module WechatPayment
     #   "paySign": "1F5CBC345B86E5DD055F235A22961422",
     #   "orderId": 17
     # }
-    def pay
+    def pay(repay: false)
+      if payment_params.present? && !repay
+        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
@@ -86,7 +93,7 @@ module WechatPayment
     def repay
       gen_out_trade_no
       save
-      pay
+      pay(repay: true)
     end
 
     # 发起退款
@@ -102,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
 
     # 实际已退的金额
@@ -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/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/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.6'
 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.6
 platform: ruby
 authors:
 - ian