From 23bf1ecee8b509d94e54514486b320d3556955af Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 2 Jul 2024 16:10:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserSignLogic):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=95=86=E5=93=81=E8=8E=B7=E5=BE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/UserSignLogic.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/common/logic/UserSignLogic.php b/app/common/logic/UserSignLogic.php
index 7b22bcd0c..741d47700 100644
--- a/app/common/logic/UserSignLogic.php
+++ b/app/common/logic/UserSignLogic.php
@@ -26,7 +26,7 @@ class UserSignLogic extends BaseLogic
             //首充
             $write = self::write($order, $total_vip, 0, 1, 9);
             self::write_log($write, $total_vip, 0, 7);
-            self::write_log($write, $total_vip, 0, 9);
+            self::write_log($write, $total_vip, 0, 9,0);
             User::where('id', $order->uid)->inc('integral', $total_vip)->update();
         }
         return true;
@@ -50,7 +50,7 @@ class UserSignLogic extends BaseLogic
             if ($order['pay_price'] >= 500) {
                 $write = self::write($order, $total_vip, 1, 1, 4);
                 self::write_log($write, $total_vip, 1, 1);
-                self::write_log($write, $total_vip, 1, 4);
+                self::write_log($write, $total_vip, 1, 2,0);
                 User::where('id', $order->uid)->inc('integral', $total_vip)->update();
             }
         }
@@ -66,8 +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, 2);
-            self::write_log($find, $find['number'], 1, 4);
+            self::write_log($find, $find['number'], 1, 2,0);
+            // self::write_log($find, $find['number'], 1, 4);
         }
     }
     /**
@@ -90,12 +90,12 @@ class UserSignLogic extends BaseLogic
      * @param  type 1:购买商品冻结
      * @param  type 2:核销商品解冻
      * @param  type 3:退款扣除冻结
-     * @param  type 4:核销金额获得
+     * @param  type 4:核销商品获得
      * @param  type 5:兑换商品扣除
      * @param  type 6:退款扣除礼品
      * @param  type 7:充值冻结
      * @param  type 8:收银台支付增加
-     * @param  type 9:首充获得
+     * @param  type 9:充值解冻
      */
     public static function write($order, $total_vip, $order_type = 0, $status = 0, $type = 4, $pm = 1)
     {
@@ -118,12 +118,12 @@ class UserSignLogic extends BaseLogic
      * @param  type 1:购买商品冻结
      * @param  type 2:核销商品解冻
      * @param  type 3:退款扣除冻结
-     * @param  type 4:核销金额获得
+     * @param  type 4:核销商品获得
      * @param  type 5:兑换商品扣除
      * @param  type 6:退款扣除礼品
      * @param  type 7:充值冻结
      * @param  type 8:收银台支付增加
-     * @param  type 9:首充获得
+     * @param  type 9:充值解冻
      */
     public static function write_log($write, $total_vip, $order_type = 0, $type = 4, $pm = 1)
     {
@@ -159,7 +159,7 @@ class UserSignLogic extends BaseLogic
                 /**礼品券**/
                 //收入
             case 4:
-                return "核销金额{$amount}元获得{$number}元礼品券";
+                return "核销商品{$amount}元获得{$number}元礼品券";
                 //支出
             case 5:
                 return "兑换{$amount}元商品扣除{$number}元礼品券";