From 93de8124ec59246ac2a5e976b1df0bee179d136b Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 18:07:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=87=91decimal=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index c4db81bc5..9bc09a05e 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -110,6 +110,7 @@ class UserLogic extends BaseLogic
             $data['return_money'] = Db::name('vip_flow')->
                     where(['user_id'=>$uid,'status'=>0])
                     ->sum('number');
+            $data['return_money'] = bcadd($data['return_money'],0,2);
             //小程序 未核销的订单
             $data['no_writeoff'] = StoreOrder::where([
                 'is_writeoff'=>0,'uid'=>$uid

From bc7cdeed63f9ad095def6ca19cedc341944fda05 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 18:32:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=AC=BE=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/PayNotifyLogic.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 7b568c8a2..7d626adc1 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -425,6 +425,13 @@ class PayNotifyLogic extends BaseLogic
             $orderRe->refund_time = time();
             $orderRe->remarks = '';
             $orderRe->save();
+            $purchase_funds = User::where('id',$orderRe['uid'])->value('purchase_funds');
+            if($purchase_funds >= $orderRe['price']){
+                User::where('id',$orderRe['uid'])->dec('purchase_funds',$orderRe['price'])->update();
+            }else{
+                User::where('id',$orderRe['uid'])->dec('purchase_funds',$purchase_funds)->update();
+            }
+
             self::descUserSing($orderRe);
             return true;
         }