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/api/controller/branch/Activity.php | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/admin/app/api/controller/branch/Activity.php b/admin/app/api/controller/branch/Activity.php
index 721688d..2359b77 100644
--- a/admin/app/api/controller/branch/Activity.php
+++ b/admin/app/api/controller/branch/Activity.php
@@ -8,6 +8,7 @@
use app\api\model\branch\ActivityUser as ActivityUserModel; // 报名会员
use app\api\model\branch\Member as MemberModel; // 会员
use app\api\model\branch\ActivityFile as ActivityFileModel; // 活动文件
+use app\api\model\branch\ActivityCart as ActivityCartModel; // 活动购物车
// use app\api\model\user\BalanceOrder as BalanceOrderModel;
// use app\common\enum\order\OrderPayTypeEnum;
use app\common\enum\order\OrderTypeEnum;
@@ -38,7 +39,8 @@
{
$model = new ActivityModel;
$list = $model->getList($category_id, $this->postData(), $this->getUser());
- return $this->renderSuccess('', compact('list'));
+ $words = BranchSettingModel::getItem('words');
+ return $this->renderSuccess('', compact('list', 'words'));
}
/**
@@ -162,4 +164,29 @@
$user->setIncPoints(-$points, $describe);
return $this->renderSuccess('', '扣除成功');
}
+
+ /**
+ * 活动商品列表
+ **/
+ public function productLists($activity_id)
+ {
+ $model = new ActivityModel();
+ $activityDetail = $model->detail(['activity_id'=>$activity_id],[]);
+
+ if (!$activityDetail) {
+ return $this->renderError('活动不存在');
+ }
+ if ($activityDetail['status_text']['status'] != 1) {
+ return $this->renderError('活动未开始');
+ }
+ $data = $this->postData();
+ $user = $this->getUser();
+ $check_result = $model->checkUserCanSome($activityDetail,$user,$data);
+ if(!$check_result){
+ return $this->renderError($model->getError());
+ }
+ $list = $model->getGoodsList($activity_id);
+ $cart_total_num = ( new ActivityCartModel())->where(['activity_id'=>$activity_id,'user_id'=>$user['user_id']])->count();
+ return $this->renderSuccess('', compact('list','cart_total_num', 'activityDetail'));
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2