From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/api/model/plus/business/Order.php | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/admin/app/api/model/plus/business/Order.php b/admin/app/api/model/plus/business/Order.php
index 820e396..5e975b6 100644
--- a/admin/app/api/model/plus/business/Order.php
+++ b/admin/app/api/model/plus/business/Order.php
@@ -7,6 +7,7 @@
use app\common\model\plus\business\Order as BaseOrder;
use app\common\enum\order\OrderPayStatusEnum;
use app\common\enum\order\OrderPayTypeEnum;
+use app\common\model\plus\business\Business as BusinessModel;
/**
* 名片订单模型
@@ -44,15 +45,21 @@
{
return (new static())->where(['order_no' => $orderNo])->find();
}
- public function orderPayment($user, $order, $payType,$params)
+
+ public function orderPayment($user, $order, $payType, $params)
{
$payment = [];
- if ($params['use_balance']==1) {
+ if ($params['use_balance'] == 1) {
$payment = $this->onPaymentByBalance($user, $order);
+ }elseif ($payType == OrderPayTypeEnum::POINTS) {
+ $payment = $this->onPaymentByPoints($user, $order);
} elseif ($payType == OrderPayTypeEnum::WECHAT) {
- $this->onPaymentByWechat($user, $order);
+ $payment = $this->onPaymentByWechat($user, $order);
} else {
- return $this->renderError('支付方式错误');
+ return false;
+ }
+ if (!$payment) {
+ return false;
}
$result['order_id'] = $order['order_id'];
$result['payType'] = $payType;
@@ -82,6 +89,25 @@
// 获取订单详情
$PaySuccess = new BusinessCardPaySuccessService($order['order_no']);
// 发起余额支付
- return $PaySuccess->onPaySuccess(OrderPayTypeEnum::BALANCE);
+ $result = $PaySuccess->onPaySuccess(OrderPayTypeEnum::BALANCE);
+ if (!$result) {
+ $this->error = $PaySuccess->getError() ?: '余额支付失败';
+ }
+ return $result;
}
-}
+ /**
+ * 构建联盟币支付请求
+ */
+ public function onPaymentByPoints($user, $order)
+ {
+ // 获取订单详情
+ $PaySuccess = new BusinessCardPaySuccessService($order['order_no']);
+ // 发起联盟币支付
+ $result = $PaySuccess->onPaySuccess(OrderPayTypeEnum::POINTS);
+ if (!$result) {
+ $this->error = $PaySuccess->getError() ?: '联盟币支付失败';
+ }
+ return $result;
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.2