wechat_payment 0.2.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2e445d0e1ce0d2cc83eef761a18bbd90ade6264e2798e2ce0a1bc1756b9139
-  data.tar.gz: bcfbaf1b877b6a7656cb378a894293c593e96862b018c9415eac13ed00063961
+  metadata.gz: c61c4ab32413e5389896bde1f772149d3df02e74c4cdcd76973ed942c6e25009
+  data.tar.gz: b5d53616d2f40fa7c112ca57319f5d4c29606053ae291fb09aee8a8280674ea5
 SHA512:
-  metadata.gz: e3157ecac086e7f9d491d1359f4ce3de8208068f277a041c9a57d9b20abd6406d1648fce5d11c25f6cbc9d8f6aea64b24e2477383c73a775212b2ac11d42bf2c
-  data.tar.gz: 3e41d27212801e96e9c359cb60a6a51f6c7e63cd4dbcbcd3deaba2c0ee72c13a55423e538422b1ff952602ef05717cb5df3c6d0a75dda131c6f3befff9aa6dcd
+  metadata.gz: 9265a884ffd5b9a544644400bac0e2c89c75b87803fb95d9542e8e0cbfce76c8688928b9aad3aeaf54c67b261a0c7cb99d0f2021a749a7207cd4a35a40380c0c
+  data.tar.gz: 95e24b9a3941112ad5698a3cbbdf313c38f4755d0a2ecc0dcaca0c2ce4ddf62b4045bddac81b7fcdf24b394a4ede23d512b5db232436975f0165c60c08490df8

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
 

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
@@ -17,6 +17,6 @@ class CreateWechatPaymentPaymentOrders < ActiveRecord::Migration[6.1]
 
       t.timestamps
     end
-    add_index :wechat_payment_payment_orders, :open_id
+    add_index :wechat_payment_payment_orders, :openid
   end
 end

data/lib/generators/wechat_payment/install/install_generator.rb

@@ -2,6 +2,7 @@ class WechatPayment::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('templates', __dir__)
 
   argument :goods, type: :string
+  argument :relation_model, type: :string
   argument :user, type: :string, default: :User
 
 
@@ -59,7 +60,11 @@ class WechatPayment::InstallGenerator < Rails::Generators::Base
   end
 
   def user_goods_model_file
-    "app/models/#{user.to_s.underscore}_#{goods.to_s.underscore}.rb"
+    if relation_model
+      "app/models/#{relation_model.underscore}.rb"
+    else
+      "app/models/#{user.to_s.underscore}_#{goods.to_s.underscore}.rb"
+    end
   end
 
   def goods_model_name
@@ -71,7 +76,7 @@ class WechatPayment::InstallGenerator < Rails::Generators::Base
   end
 
   def user_goods_model_name
-    user_model_name + goods_model_name
+    (relation_model&.camelize) || (user_model_name + goods_model_name)
   end
 
   def def_custom_user_model

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 = '0.2.0'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 2.0.2
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: wx_pay
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -97,13 +98,13 @@ files:
 - lib/wechat_payment/service_result.rb
 - lib/wechat_payment/sign.rb
 - lib/wechat_payment/version.rb
-homepage: https://github.com/bkyz/wechat_payment
+homepage: http://dev.com
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/bkyz/wechat_payment
-  source_code_uri: https://github.com/bkyz/wechat_payment
-  changelog_uri: https://github.com/bkyz/wechat_payment/CHANGELOG.md
+  homepage_uri: http://dev.com
+  source_code_uri: http://dev.com
+  changelog_uri: http://dev.com/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Summary of WechatPayment.