From 339cade7cce200a994a67a5868cd033fdad89511 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 22 Mar 2024 11:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 4a2fa33b..7b5be66d 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -123,7 +123,7 @@ class StoreOrderRepository extends BaseRepository
     {
         if (in_array($type, ['balance', 'merBalance'])) {
             if (empty($user['withdrawal_pwd'])) {
-                throw new ValidateException('请设置支付密码');
+//                throw new ValidateException('请设置支付密码');
             } elseif (empty($this->transPwd)) {
 //                throw new ValidateException('请输入支付密码');
             } elseif (!password_verify((string)$this->transPwd, $user['withdrawal_pwd'])) {
@@ -2681,11 +2681,12 @@ class StoreOrderRepository extends BaseRepository
             $deal = $this->dealArr($list);
             //平均2个左右 0 1 2  阶梯往上查寻找
             [$products, $minNum] = $this->getRange($deal, $range);
+            $result = [];
             if (!empty($products)) {
-                $list = $this->findNearestPriceProduct($products, $money, $minNum);
+                $result = $this->findNearestPriceProduct($products, $money, $minNum);
             }
-            $count = count($list);//计算数量的
-            return compact('count', 'list','merInfo');
+            $count = count($result);//计算数量的
+            return compact('count', 'result','merInfo');
 
         } else {
             return compact('count', 'list','merInfo');