wechat_payment 1.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf5c9c5546859b4b7429bede75ad056c5042121091257514caf1b66aa91f4b05
-  data.tar.gz: 2d259a01e005dd91ce315a89ae9138c26dcab767151d39af0167c876d1cabae3
+  metadata.gz: 3ccc823e0ae167b60ffa78ba54e98c559c95c0019167a3c2e5033db6718f741b
+  data.tar.gz: 68e1de8aa02ac29ebc7d6012173dfdaa0162c493dbcb08f36e55db7909ef38b3
 SHA512:
-  metadata.gz: 15742a17bffe3310201b9c20320ac96e7f19573c84a69002ed8b5852c0f5e6b423fc39610a26a048edee75f1cd6ad9fa5506719c84020bc89d85103029f2b47a
-  data.tar.gz: f9decf10bd53c243d2e1e11b8bc0430599b288ba9db8c3fd6a7e35a5a93898014de23043a0d769947cd558c901680499492d95e3c0bb0b1a3f7a25023484e164
+  metadata.gz: 6dc4007ff8cbdd1cc8d347ed4d9193e43cddcf683192dae186ecf2b1f4511ce288acf40cffa6f10c66268382fb140f65d984ed9539a27388d6c258022f9c8b3b
+  data.tar.gz: 7655b449f9e31b5e481b174648ee6019753607addceb45ee0e4e848ce0d3aec11da6ddf1007694c80a51a005c817a3c927f910b3c95310830209ed1e05201d52

data/README.md

@@ -3,7 +3,7 @@
 
 
 ## Convention
-在使用该 Engine 之前，需要先建立`用户模型`，`商品模型`，`用户商品关联模型`，用户表需要有 open_id 字段,
+在使用该 Engine 之前，需要先建立`用户模型`，`商品模型`，`用户商品关联模型`，用户表需要有 openid 字段,
 商品表需要有 price 和 name 字段。假设`商品模型`为`Product`，则用户和商品之间的关联模型为`UserProduct`，
 关联模型属于`user`和`product`。
 
@@ -17,8 +17,8 @@
 
 3. 初始化
    ```bash
-   # rails g wechat_payment:install [GoodsModel] [UserModel]
-   $ rails g wechat_payment:install Product User
+   # rails g wechat_payment:install [GoodsModel] [UserGoodRelationModel] [UserModel]
+   $ rails g wechat_payment:install Product UserProduct User
    $ rails db:migrate
    ```
 
@@ -227,4 +227,4 @@ TODO 待补充
 Contribution directions go here.
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/controllers/wechat_payment/payment_orders_controller.rb

@@ -0,0 +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

@@ -8,6 +8,10 @@ module WechatPayment
     before_create :gen_out_trade_no
     belongs_to :goods, polymorphic: true
 
+    scope :by_state, ->(state)do
+      where(state: state) if state.present?
+    end
+
     enum state: {
       paid: "paid",
       pending: "pending",
@@ -17,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
 
@@ -50,7 +54,7 @@ module WechatPayment
         spbill_create_ip: spbill_create_ip,
         total_fee: total_fee,
         body: body,
-        openid: open_id
+        openid: openid
       }
     end
 
@@ -69,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
@@ -199,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.0'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - app/assets/stylesheets/wechat_payment/application.css
 - app/controllers/wechat_payment/application_controller.rb
 - app/controllers/wechat_payment/callback_controller.rb
+- app/controllers/wechat_payment/payment_orders_controller.rb
 - app/helpers/wechat_payment/application_helper.rb
 - app/jobs/wechat_payment/application_job.rb
 - app/mailers/wechat_payment/application_mailer.rb