From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
admin/app/branch/controller/activity/Activity.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/admin/app/branch/controller/activity/Activity.php b/admin/app/branch/controller/activity/Activity.php
index c0aa703..7ebae95 100644
--- a/admin/app/branch/controller/activity/Activity.php
+++ b/admin/app/branch/controller/activity/Activity.php
@@ -7,7 +7,7 @@
use app\branch\model\category\Category as CategoryModel;
use app\shop\model\user\User as UserModel;
use app\common\service\qrcode\BranchActivityService;
-use app\branch\model\activityProduct\ActivityProduct as ActivityProductModel;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
/**
* 活动控制器
@@ -59,8 +59,9 @@
*/
public function detail($activity_id)
{
- $model = new ActivityModel;
- return $this->renderSuccess('', $model->detail($activity_id));
+ $model = (new ActivityModel)->detail($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+ return $this->renderSuccess('', $model);
}
/**
@@ -86,7 +87,7 @@
// if ($model['verify_user_ids']) {
// $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
// }
- $model['product_list'] = (new ActivityProductModel())->getProductPricelist($activity_id);
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
$product_ids = [];
if(!empty($model['product_list'])){
$product_ids = array_column($model['product_list'], 'product_id');
--
Gitblit v1.9.2