From 6e0b38b0ea6669d532e9d2279a81ca3963e0f3ad Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 13 Nov 2025 00:14:05 +0800
Subject: [PATCH] 1、小程序端列出所有报名人员名单(含姓名); 2、优化活动促销商品; 3、优化小程序端活动详情页; 4、优化后台连盟活动修改页面,并展示促销商品; 5、参与活动人员积分设置改到职务里添加。
---
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