From 2ebd361d6e61777c41fe0e2f8801854caab369f0 Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Wed, 4 Jun 2025 19:03:49 +0800
Subject: [PATCH] 3333

---
 app/admin/controller/VerificationCode.php |  9 +++++++--
 app/api/controller/FuLiWu.php             | 20 ++++++++++++++------
 app/api/controller/Goods.php              | 13 ++++++++++---
 app/api/controller/Mall.php               |  8 ++++++++
 app/common/service/PaymentCalculator.php  |  4 ++++
 5 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/app/admin/controller/VerificationCode.php b/app/admin/controller/VerificationCode.php
index 7533305..7456c05 100644
--- a/app/admin/controller/VerificationCode.php
+++ b/app/admin/controller/VerificationCode.php
@@ -19,11 +19,16 @@ class VerificationCode extends Base
         }
         $list = UserVerificationCode::where($where)
             ->order('id', 'desc')
-            ->paginate([ 'query' => request()->param() ]);
+            ->paginate(['query' => request()->param()]);
+        foreach ($list as &$item) {
+            $item['created_at'] = date('Y-m-d H:i:s', strtotime($item['created_at']) + 8 * 3600);
+            $item['expired_at'] = date('Y-m-d H:i:s', strtotime($item['expired_at']) + 8 * 3600);
+        }
+        unset($item);
         View::assign([
             'list' => $list,
             'account' => $account,
         ]);
         return View::fetch('VerificationCode/index');
     }
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/api/controller/FuLiWu.php b/app/api/controller/FuLiWu.php
index 45ed978..7c6fb9d 100755
--- a/app/api/controller/FuLiWu.php
+++ b/app/api/controller/FuLiWu.php
@@ -46,13 +46,17 @@ class FuLiWu extends Base
             //充值金额
             $whe[] = ['unlock_amount', '=', 0];
         } else {
-            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('use_money');
+            if($order_money>0){
+                $order_price = $order_price + $order_money;
+            }
             $userInfo = User::where('id', '=', $user_id)->field('istest')->find();
             if ($userInfo && $userInfo['istest'] > 0) {
                 //推广账号，门槛计算是全部的
-                $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
+                $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
             }
-            $whe[] = ['unlock_amount', '<=', $order_money];
+            $whe[] = ['unlock_amount', '<=', $order_price];
         }
         #盒子
         $goods = GoodsModel::where($whe)
@@ -120,14 +124,18 @@ class FuLiWu extends Base
         $user_id = $this->getUserId();
         // 检查用户是否可以查看该福利屋（解锁金额限制）
         if ($user_id > 0) {
-            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('use_money');
+            if($order_money>0){
+                $order_price = $order_price + $order_money;
+            }
             $userInfo = User::where('id', '=', $user_id)->field('istest')->find();
             if ($userInfo && $userInfo['istest'] > 0) {
                 // 推广账号，门槛计算是全部的
-                $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
+                $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
             }
 
-            if ($goods['unlock_amount'] > $order_money) {
+            if ($goods['unlock_amount'] > $order_price) {
                 return $this->renderError("您需要消费满" . $goods['unlock_amount'] . "元才能查看此福利屋");
             }
         } else if ($goods['unlock_amount'] > 0) {
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index 5c6e99b..76fdec6 100755
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -134,14 +134,21 @@ class Goods extends Base
             // } else {
             //     $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
             // }
-            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
+            $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('use_money');
+            if($order_money>0){
+                $order_price = $order_price + $order_money;
+            }
+            // $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
+            // $user_use_money = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('use_money');
+
             // $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('price');
             $userInfo = User::where('id', '=', $user_id)->field('istest')->find();
             if ($userInfo && $userInfo['istest'] > 0) {
                 //推广账号，门槛计算是全部的
-                $order_money = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
+                $order_price = Order::where('status', '=', 1)->where('user_id', '=', $user_id)->sum('order_zhe_total');
             }
-            $whe[] = ['unlock_amount', '<=', $order_money];
+            $whe[] = ['unlock_amount', '<=', $order_price];
         }
         //将goods_type表中的所有数据查询出来，查询字段，value,corner_text,将数组转换为map
         $goods_types_arr = GoodsType::field('value,corner_text')->select()->toArray();
diff --git a/app/api/controller/Mall.php b/app/api/controller/Mall.php
index b36802d..2735db4 100755
--- a/app/api/controller/Mall.php
+++ b/app/api/controller/Mall.php
@@ -87,6 +87,10 @@ class Mall extends Base
         if ($choujiang_xianzhi && $choujiang_xianzhi > 0) {
             // SELECT sum(price)  FROM xinglanmh_shequt_test.`order` where user_id=4445 and  status=1
             $user_price = order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
+            $user_use_money = order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('use_money');
+            if($user_use_money>0){
+                $user_price = $user_price + $user_use_money;
+            }
             if ($user_price < $choujiang_xianzhi) {
                 return $this->renderError("消费满" . $choujiang_xianzhi . "元可参与 已消费" . round($user_price, 2) . "元");
             }
@@ -266,6 +270,10 @@ class Mall extends Base
         if ($choujiang_xianzhi && $choujiang_xianzhi > 0) {
             // SELECT sum(price)  FROM xinglanmh_shequt_test.`order` where user_id=4445 and  status=1
             $user_price = order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
+            $user_use_money = order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('use_money');
+            if($user_use_money>0){
+                $user_price = $user_price + $user_use_money;
+            }
             if ($user_price < $choujiang_xianzhi) {
                 return $this->renderError("消费满" . $choujiang_xianzhi . "元可参与 已消费" . round($user_price, 2) . "元");
             }
diff --git a/app/common/service/PaymentCalculator.php b/app/common/service/PaymentCalculator.php
index 35d9159..f4cd87e 100644
--- a/app/common/service/PaymentCalculator.php
+++ b/app/common/service/PaymentCalculator.php
@@ -291,6 +291,10 @@ class PaymentCalculator
                 //     $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
                 // }
                 $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('price');
+                $user_use_money = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('use_money');
+                if($user_use_money>0){
+                    $user_price = $user_price + $user_use_money;
+                }
                 if ($user_price < $choujiang_xianzhi) {
                     if ($user['istest'] > 0) {
                         $user_price = Order::where('user_id', '=', $user_id)->where('status', '=', 1)->sum('order_zhe_total');