wechat_payment 2.0.4 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e310951e27fb21bc10f6f7c014d311dbef25b86229fb13c7f509e2670173185d
-  data.tar.gz: f8385506631a6d621ad60a81cf3a7eca42bdfb27f811765e3b2c850fb97cde0a
+  metadata.gz: 87f4044d658d3093db1078f065765d207441d6556419de26fd6e7f88169a8467
+  data.tar.gz: 3bc5fbf36af300ca50c15e1ae37523df59da4aa6169f7cac57b696a59a8bfdb1
 SHA512:
-  metadata.gz: 2e7ad1adc3f4e8cc1b720cc8cc78986320e76638ae66518657c0bf844dd21facc1e3bd83c65a1421b491780e2ccc2a33d19935a1279623da64bbce69c70f21cf
-  data.tar.gz: b97d318c5628de5eeeb183f9a1dbb4dc37ba0a210534f302ba1c9e1c2e7950ed7208c1e2db9b91d12cbb4f12d60e6ffe4f573fc123a8fcb8469bd06bb69fa64a
+  metadata.gz: d87869b6dab7c779d1ec4a5f5de801989b5058f9e7f34e7eff4455fc641e2196e2ebc0d2894df5486ec8d1d829fca8e39cf65c91deac5f9c8d16096e774c86cb
+  data.tar.gz: 9cb4c3a15a3422ecfeb1a26d7eaafd20b7274de371b1241c42723b52bec8c7398a8ef56633986b977ebdc5172cdb0f63a73f8f961b11c95fcae7c6c860c7c304

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
@@ -109,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
 
     # 实际已退的金额

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/app/services/wechat_payment/service.rb

@@ -44,7 +44,7 @@ module WechatPayment
       result = WechatPayment::Client.handle_payment_notify(notify_data)
       payment_order = WechatPayment::PaymentOrder.find_by(out_trade_no: notify_data["out_trade_no"])
 
-      if result.success? && payment_order.pending?
+      if result.success? && payment_order.pending_pay?
         payment_order.with_lock do
           payment_order.payment_exec_success(result.data)
         end
@@ -60,7 +60,7 @@ module WechatPayment
       result = WechatPayment::Client.handle_refund_notify(notify_data)
       refund_order = WechatPayment::RefundOrder.find_by(out_refund_no: result.data["out_refund_no"])
 
-      if result.success? && refund_order.pending?
+      if result.success? && refund_order.pending_refund?
         refund_order.with_lock do
           refund_order.refund_exec_success(result.data)
         end

data/lib/wechat_payment/concern/goods.rb

@@ -49,20 +49,20 @@ module WechatPayment
 
       # 重新支付，应用场景是： 用户取消了支付后，使用最后一张订单进行支付
       # @return [WechatPayment::ServiceResult]
-      def repay
-        # 如果不是待支付状态
-        unless pending?
-          WechatPayment::ServiceResult.new(message: "当前状态不可支付")
-        end
-
-        result = payment_orders.last.repay
-
-        if result.success?
-          WechatPayment::ServiceResult.new(success: true, data: result.data[:js_payload])
-        else
-          WechatPayment::ServiceResult.new(message: result.errors.first[:err_code_des])
-        end
-      end
+      # def repay
+      #   # 如果不是待支付状态
+      #   unless pending?
+      #     WechatPayment::ServiceResult.new(message: "当前状态不可支付")
+      #   end
+
+        # result = payment_orders.last.repay
+
+      #   if result.success?
+      #     WechatPayment::ServiceResult.new(success: true, data: result.data[:js_payload])
+      #   else
+      #     WechatPayment::ServiceResult.new(message: result.errors.first[:err_code_des])
+      #   end
+      # end
 
 
       # 退款

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.0.4'
+  VERSION = '2.0.8'
 end

metadata

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