From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/api/model/branch/Activity.php | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/admin/app/api/model/branch/Activity.php b/admin/app/api/model/branch/Activity.php
index 3d85737..d2d5afc 100644
--- a/admin/app/api/model/branch/Activity.php
+++ b/admin/app/api/model/branch/Activity.php
@@ -113,11 +113,11 @@
$data['app_id'] = self::$app_id;
$data['branch_id'] = $branch_id;
//活动时间
- $data['activity_start_time'] = strtotime($data['start_time']);
- $data['activity_end_time'] = strtotime($data['end_time']);
+ $data['activity_start_time'] = strtotime($data['activity_start_time']);
+ $data['activity_end_time'] = strtotime($data['activity_end_time']);
//报名时间
- $data['register_start_time'] = time(); // 发布的时间即为报名开始时间（小程序端逻辑）
- $data['register_end_time'] = $data['activity_end_time']; // 活动结束时间即为报名结束时间（小程序端逻辑）
+ $data['register_start_time'] = strtotime($data['register_start_time']);
+ $data['register_end_time'] = strtotime($data['register_end_time']);
return $this->save($data);
}
@@ -127,11 +127,11 @@
public function edit($data)
{
//活动时间
- $data['activity_start_time'] = strtotime($data['start_time']);
- $data['activity_end_time'] = strtotime($data['end_time']);
+ $data['activity_start_time'] = strtotime($data['activity_start_time']);
+ $data['activity_end_time'] = strtotime($data['activity_end_time']);
//报名时间
- $data['register_start_time'] = time(); // 发布的时间即为报名开始时间（小程序端逻辑）
- $data['register_end_time'] = $data['activity_end_time']; // 活动结束时间即为报名结束时间（小程序端逻辑）
+ $data['register_start_time'] = strtotime($data['register_start_time']);
+ $data['register_end_time'] = strtotime($data['register_end_time']);
return $this->save($data);
}
@@ -143,4 +143,14 @@
return $this->save(['is_delete' => 1]);
}
+ /**
+ * 检查用户是否能参与促销活动
+ */
+ public function checkUserShopping($user_id) {
+ if (!$this['is_verify']) {
+ $this->error = '您还没签到，无法参与购物';
+ }
+ return true;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.2