From 255f99ea60a7635ea7d7ff58300a2791fe652636 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Wed, 26 Jun 2024 19:41:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php
index 0abd1e1c3..d37b29bf5 100644
--- a/app/common/logic/PayNotifyLogic.php
+++ b/app/common/logic/PayNotifyLogic.php
@@ -279,8 +279,7 @@ class PayNotifyLogic extends BaseLogic
         $user = User::where('id', $order['uid'])->findOrEmpty();
         $capitalFlowDao = new CapitalFlowLogic($user);
         $deal_money = bcdiv($extra['amount']['refund'], 100, 2);
-        if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) {
-            if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额
+
         if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) {
             if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额
                 $user->now_money = bcadd($user->now_money, $deal_money, 2);
@@ -308,6 +307,7 @@ class PayNotifyLogic extends BaseLogic
         return true;
         //        self::afterPay($order,$extra['transaction_id']);
     }
+    }
 
 
     /**

From 55c72dcd4d5c63cc64e20a34029351b440f8b27b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 26 Jun 2024 19:41:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E5=92=8C=20Shipping=20=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/store/StoreController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/api/controller/store/StoreController.php b/app/api/controller/store/StoreController.php
index bab205a87..2d91c792b 100644
--- a/app/api/controller/store/StoreController.php
+++ b/app/api/controller/store/StoreController.php
@@ -83,6 +83,8 @@ class StoreController extends BaseApiController
             $find=UserUserLogic::StoreAdd($params);
         }else{
             $find['real_name']=$params['real_name'];
+            $find['user_ship']=$params['user_ship']??0;
+            $find['label_id']=$params['label_id']??0;
             $find->save();
         }
         if($find === false){