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/shop/controller/branch/Activity.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/admin/app/shop/controller/branch/Activity.php b/admin/app/shop/controller/branch/Activity.php
index 47e3f0c..2ddeee3 100644
--- a/admin/app/shop/controller/branch/Activity.php
+++ b/admin/app/shop/controller/branch/Activity.php
@@ -7,6 +7,7 @@
use app\shop\model\branch\Category as CategoryModel;
use app\shop\model\user\User as UserModel;
use app\common\service\qrcode\BranchActivityService;
+use app\common\model\branch\ActivityProductPrice as ActivityProductPriceModel;
/**
* 活动控制器
@@ -80,12 +81,8 @@
$tem_act_date[1] = date("Y-m-d H:i:s",$model['activity_end_time']);
$model['act_date'] = $tem_act_date;
$model['coordinate'] = $model['latitude'] . ',' . $model['longitude'];
- // 获取核销人员数据
- $model['verify_user'] = [];
- if ($model['verify_user_ids']) {
- $model['verify_user'] = UserModel::getUserByIds($model['verify_user_ids'], ['avatarUrl', 'nickName']);
- }
-
+ $model['product_list'] = (new ActivityProductPriceModel())->getProductPricelist($activity_id);
+
return $this->renderSuccess('', compact('catgory', 'model'));
}
// 活动详情
--
Gitblit v1.9.2