wechat_payment 1.0.1 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2100fe24861a1d75ca04e949abd877f1103264cb81d14d95a4f19b53063d34fc
-  data.tar.gz: 2350aab94044a8ad51625c078dc462a9bfa8905c1f2365b6b3c330ab003035ff
+  metadata.gz: e310951e27fb21bc10f6f7c014d311dbef25b86229fb13c7f509e2670173185d
+  data.tar.gz: f8385506631a6d621ad60a81cf3a7eca42bdfb27f811765e3b2c850fb97cde0a
 SHA512:
-  metadata.gz: ee743747eada08f87dd41e74e36b3032dc1230dedbb9c8cd0fb0a02369ff5afb596e5ec362f39f991602d34bb1e7920abb30277889c6c0687ab80c4388475b07
-  data.tar.gz: '094f7231dc3225b4d3c66b7f5bc596d3cf1a8c005230701afdee104a6c952e5e20341987ad483663d4405abf3271c934d9456b7a3ac2dd2528652b56149bbc5b'
+  metadata.gz: 2e7ad1adc3f4e8cc1b720cc8cc78986320e76638ae66518657c0bf844dd21facc1e3bd83c65a1421b491780e2ccc2a33d19935a1279623da64bbce69c70f21cf
+  data.tar.gz: b97d318c5628de5eeeb183f9a1dbb4dc37ba0a210534f302ba1c9e1c2e7950ed7208c1e2db9b91d12cbb4f12d60e6ffe4f573fc123a8fcb8469bd06bb69fa64a

data/README.md

@@ -3,7 +3,7 @@
 
 
 ## Convention
-在使用该 Engine 之前，需要先建立`用户模型`，`商品模型`，`用户商品关联模型`，用户表需要有 open_id 字段,
+在使用该 Engine 之前，需要先建立`用户模型`，`商品模型`，`用户商品关联模型`，用户表需要有 openid 字段,
 商品表需要有 price 和 name 字段。假设`商品模型`为`Product`，则用户和商品之间的关联模型为`UserProduct`，
 关联模型属于`user`和`product`。
 

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

@@ -21,7 +21,7 @@ module WechatPayment
 
     # 将部分用户信息保存至订单
     def set_customer_info
-      self.open_id = customer.open_id if open_id.blank?
+      self.openid = customer.openid if openid.blank?
       self.spbill_create_ip = customer.spbill_create_ip
     end
 
@@ -54,7 +54,7 @@ module WechatPayment
         spbill_create_ip: spbill_create_ip,
         total_fee: total_fee,
         body: body,
-        openid: open_id
+        openid: openid
       }
     end
 
@@ -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

@@ -1,7 +1,7 @@
 class CreateWechatPaymentPaymentOrders < ActiveRecord::Migration[6.1]
   def change
     create_table :wechat_payment_payment_orders do |t|
-      t.string :open_id
+      t.string :openid
       t.string :out_trade_no
       t.references :goods, polymorphic: true, null: false
       t.references :customer, polymorphic: true, null: false
@@ -14,9 +14,10 @@ class CreateWechatPaymentPaymentOrders < ActiveRecord::Migration[6.1]
       t.string :state
       t.datetime :paid_at
       t.datetime :refunded_at
+      t.jsonb :payment_params
 
       t.timestamps
     end
-    add_index :wechat_payment_payment_orders, :open_id
+    add_index :wechat_payment_payment_orders, :openid
   end
 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 = '1.0.1'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.4
 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