wechat_payment 2.0.3 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccc823e0ae167b60ffa78ba54e98c559c95c0019167a3c2e5033db6718f741b
-  data.tar.gz: 68e1de8aa02ac29ebc7d6012173dfdaa0162c493dbcb08f36e55db7909ef38b3
+  metadata.gz: 47ac17c0ea1a99ad55e63958da4dfbefc0282f9962ce038a738b4322d09a501c
+  data.tar.gz: e61cc08c219cb5c90cb74be1836ada62f120ccb64481e5d2e2be6aa7ed4f7fcb
 SHA512:
-  metadata.gz: 6dc4007ff8cbdd1cc8d347ed4d9193e43cddcf683192dae186ecf2b1f4511ce288acf40cffa6f10c66268382fb140f65d984ed9539a27388d6c258022f9c8b3b
-  data.tar.gz: 7655b449f9e31b5e481b174648ee6019753607addceb45ee0e4e848ce0d3aec11da6ddf1007694c80a51a005c817a3c927f910b3c95310830209ed1e05201d52
+  metadata.gz: 6310f34d9941e697640cb0902415cc7dd9ecfdd743c2b02fa0b05d1202f57d81afd262a81d45999046f0b4f2e90dfc42f66c745ed1278339dc08207adb621297
+  data.tar.gz: dabde1251f1337d373be190c1dfd23b022d6b5e32ca4b50ceaa6b1a1aeccb54fd1c55cb354b47fdb43846948d3a6847b06f28dc4b926ca4be50b405d20bfc03e

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
@@ -72,8 +72,8 @@ module WechatPayment
     #   "paySign": "1F5CBC345B86E5DD055F235A22961422",
     #   "orderId": 17
     # }
-    def pay
-      if payment_params.present?
+    def pay(repay: false)
+      if payment_params.present? && !repay
         return ServiceResult.new(success: true, data: payment_params, message: "获取支付参数成功")
       end
 
@@ -93,7 +93,7 @@ module WechatPayment
     def repay
       gen_out_trade_no
       save
-      pay
+      pay(repay: true)
     end
 
     # 发起退款
@@ -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_pay?
         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.3'
+  VERSION = '2.0.7'
 end

metadata

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