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); } } /**