调整支付校验

This commit is contained in:
luofei 2024-03-22 11:02:08 +08:00
parent 454eca8c1d
commit 339cade7cc

View File

@ -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');