|
|
@@ -38,6 +38,15 @@ class OrderController extends BaseController
|
|
|
//二维码收款使用
|
|
|
public $guestAccess = ['order-relate', 'fast-pay'];
|
|
|
|
|
|
+ public function actionInform()
|
|
|
+ {
|
|
|
+ $get = Yii::$app->request->get();
|
|
|
+ $hdId = $get['hdId'] ?? 0;
|
|
|
+ $account = $get['account'] ?? 0;
|
|
|
+ $userId = $this->userId;
|
|
|
+ noticeUtil::push("零售客户下单报错 hdId:{$hdId} account:{$account} userId:{$userId}", '15280215347');
|
|
|
+ }
|
|
|
+
|
|
|
//记账单列表 ssh 20250627
|
|
|
public function actionDebtList()
|
|
|
{
|
|
|
@@ -493,8 +502,8 @@ class OrderController extends BaseController
|
|
|
util::fail("不满足最低消费金额{$hb->minConsume}元");
|
|
|
}
|
|
|
if ($this->shop->rechargeWeal == 3) {
|
|
|
- if(bccomp($custom->balance, $modifyPrice) == -1) {
|
|
|
- //不要限制提交
|
|
|
+ if (bccomp($custom->balance, $modifyPrice) == -1) {
|
|
|
+ //不要限制提交
|
|
|
//util::fail('此红包非余额支付不可用(您的余额不足)');
|
|
|
}
|
|
|
}
|
|
|
@@ -826,7 +835,7 @@ class OrderController extends BaseController
|
|
|
util::fail("不满足最低消费金额{$hb->minConsume}元");
|
|
|
}
|
|
|
if ($this->shop->rechargeWeal == 3) {
|
|
|
- if($custom->balance < $modifyPrice) {
|
|
|
+ if ($custom->balance < $modifyPrice) {
|
|
|
util::fail('此红包非余额支付不可用(您的余额不足)');
|
|
|
}
|
|
|
}
|
|
|
@@ -867,7 +876,7 @@ class OrderController extends BaseController
|
|
|
$hb->orderId = $return->id;
|
|
|
$hb->save();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$orderId = $return->id;
|
|
|
$orderSn = $return->orderSn;
|
|
|
$actPrice = $return->actPrice ?? 0;
|
|
|
@@ -921,7 +930,7 @@ class OrderController extends BaseController
|
|
|
}
|
|
|
//支付前验证订单有效性
|
|
|
OrderService::checkBeforePay($order);
|
|
|
-
|
|
|
+
|
|
|
$payWay = dict::getDict('payWay', 'balancePay');
|
|
|
\bizHd\order\classes\OrderClass::payAfter($order, $payWay);
|
|
|
$transaction->commit();
|