From e9c25fd1dea82e92deea0a47b7354b40ab2fb328 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 2 Jul 2024 14:51:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E9=80=BB=E8=BE=91=E4=BB=A5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A6=96=E5=85=85=E5=92=8C=E7=A4=BC=E5=93=81=E5=88=B8=E7=9A=84?=
 =?UTF-8?q?=E5=86=BB=E7=BB=93=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/UserSignLogic.php | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index dfaf79ea2..52b705856 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -24,12 +24,12 @@ class UserSignLogic extends BaseLogic
         $count = UserSign::where('uid', $order->uid)->count();
         if ($count == 0 && in_array($user_ship, [1, 2, 3, 5, 6, 7, 8])) {
             //首充
-            $write = self::write($order, $total_vip, 0, 1,9);
-            self::write_log($write, $total_vip, 0,9);
+            $write = self::write($order, $total_vip, 0, 1, 9);
+            self::write_log($write, $total_vip, 0, 9);
             User::where('id', $order->uid)->inc('integral', $total_vip)->update();
         } else {
-            $write = self::write($order, $total_vip, 0, 0,7);
-            self::write_log($write, $total_vip, 0,7);
+            $write = self::write($order, $total_vip, 0, 0, 7);
+            self::write_log($write, $total_vip, 0, 7);
         }
         return true;
     }
@@ -42,12 +42,17 @@ class UserSignLogic extends BaseLogic
         $total_vip = bcmul($order['pay_price'], 0.1, 2);
 
         if ($order['source'] == 0) {
-            //非收银台订单冻结礼品卷
-            self::write($order, $total_vip, 1, 0,1);
+            //冻结礼品券
+            if ($order['pay_price'] >= 500) {
+                self::write_log($order, $total_vip, 1, 0, 1);
+            }
         } else {
-            $write = self::write($order, $total_vip, 1, 1,4);
-            self::write_log($write, $total_vip, 1,4);
-            User::where('id', $order->uid)->inc('integral', $total_vip)->update();
+            //不冻结礼品券
+            if ($order['pay_price'] >= 500) {
+                $write = self::write($order, $total_vip, 1, 1, 4);
+                self::write_log($write, $total_vip, 1, 4);
+                User::where('id', $order->uid)->inc('integral', $total_vip)->update();
+            }
         }
     }
 
@@ -61,7 +66,8 @@ class UserSignLogic extends BaseLogic
             $find->status = 1;
             $find->save();
             User::where('id', $order->uid)->inc('integral', $find['number'])->update();
-            self::write_log($find, $find['number'], 1,4);
+            self::write_log($find, $find['number'], 1, 2);
+            self::write_log($find, $find['number'], 1, 4);
         }
     }
     /**