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/shop/model/plus/shareholder/Bonus.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/admin/app/shop/model/plus/shareholder/Bonus.php b/admin/app/shop/model/plus/shareholder/Bonus.php
index 3ae0c8b..017f7ff 100644
--- a/admin/app/shop/model/plus/shareholder/Bonus.php
+++ b/admin/app/shop/model/plus/shareholder/Bonus.php
@@ -40,8 +40,9 @@
//是否有可分红订单，1有，0无
$is_bonus = 1;
$first_data = Order::orderFirst();
- if (empty($first_data)) {
+ if (empty($first_data)||!isset($first_data)) {
$is_bonus = 0;
+ $first_data['create_time']=date('Y-m-d');
}
//可结算时间需要加上分红结算天数
$create_time = strtotime($first_data['create_time']) + intval(Setting::getItem('settlement')['settle_days']) * 86400;
@@ -126,10 +127,10 @@
$this->error = '没有可用的分红';
return false;
}
- // 获取股东数据
- $userList = User::getListAll();
+ // 获取满足分红条件的股东数据
+ $userList = User::getEligibleListAll($bonusData);
if ($userList->isEmpty()) {
- $this->error = '没有找到股东，不分红';
+ $this->error = '没有找到满足分红条件的股东，不分红';
return false;
}
$this->startTrans();
--
Gitblit v1.9.2