wechat_payment 2.0.1 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b44bb7536575ad7bc8160b621db67776152c256c0bfe9ef3ea3b5b538097385f
-  data.tar.gz: 6c5b38ea0075671aaabe84294ed3bacbfe2d7dbfeff5eb7f7dc05a53b8f8814a
+  metadata.gz: 6a2f9d7deaaaed1d3b98076b2f01e2c8f3717ec1523e036324c5a479c5cc5385
+  data.tar.gz: 38e2e94679a07a1128aa1b88111b54c43dea2614aa8ead79808c8beb882421ab
 SHA512:
-  metadata.gz: 56c0da01b6bc6d44076616ea80cad48deb6bd68372743aff0b5defccb0394edc4f0990f814d21c698e4d763fe2a0a4a14260da153685526e326a38e5bbc89786
-  data.tar.gz: cae818ffdb7fa29099a1d1565b2c8e29a76f1d019ad8bf097d75ee3992c8b01e54a9d80e66a45e8af9d04511eeb17fc1202279a18a56d5fe68df9d34e6964e27
+  metadata.gz: ec536f1580a1ce147f0892a0c90c3f696929dc5ad1f6cfbef1ddd8b25df65c3e9ecf31fef578054e952d385995734d59bc59fbdbe17f195f7c4bd6d04286fc59
+  data.tar.gz: 73988c1100320edfab0babc54a144e96067b9a13212c1ef3253e7186c3c54cfab6dd860d33d6f0ddbc490d2a29c0d8280071f994672ca8c8537c70741af53ba1

data/app/controllers/wechat_payment/payment_orders_controller.rb

@@ -1,7 +1,9 @@
 
 class PaymentOrdersController < ApplicationController
   def index
+    @payment_orders = WechatPayment::PaymentOrder.by_state(params[:state])
 
+    render json: @payment_orders
   end
 
 end

data/app/models/wechat_payment/payment_order.rb

@@ -14,7 +14,7 @@ module WechatPayment
 
     enum state: {
       paid: "paid",
-      pending: "pending",
+      pending_pay: "pending_pay",
       refunded: "refunded",
       failed: "failed"
     }, _default: "pending"
@@ -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
 
     # 发起退款
@@ -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/concern/goods.rb

@@ -25,8 +25,7 @@ module WechatPayment
       # 售出
       # @param [User] user
       # @return [WechatPaymentOrder]
-      def sell_to(user)
-
+      def sell_to(user, with_info = {})
         persist_goods_data = {}.tap do |h|
           self.class.persist_goods_attrs.each do |attr|
             h[attr] = send(attr)
@@ -36,7 +35,8 @@ module WechatPayment
         user_goods = self.class.user_goods_model.constantize.create(
           self.class.goods_ref_field => self,
           self.class.user_ref_field => user,
-          **persist_goods_data
+          **with_info,
+          **persist_goods_data,
         )
 
         user_goods.payment_orders.create(

data/lib/wechat_payment/concern/user.rb

@@ -14,8 +14,8 @@ module WechatPayment
         end
       end
 
-      def buy(goods)
-        goods.sell_to(me)
+      def buy(goods, with_info = {})
+        goods.sell_to(me, with_info)
       end
     end
   end

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.1'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.5
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails