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/supplier/Supplier.php | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/admin/app/shop/model/supplier/Supplier.php b/admin/app/shop/model/supplier/Supplier.php
index 26c1d3a..b3878f8 100644
--- a/admin/app/shop/model/supplier/Supplier.php
+++ b/admin/app/shop/model/supplier/Supplier.php
@@ -26,6 +26,9 @@
if (isset($params['search']) && $params['search']) {
$model = $model->where('name', 'like', '%' . $params['search'] . '%');
}
+ if(!empty($params['supplier_type'])){
+ $model = $model->where('supplier_type', '=', $params['supplier_type']);
+ }
if(isset($params['shop_supplier_ids'])&&$params['shop_supplier_ids']){
$model = $model->where('shop_supplier_id', 'in', $params['shop_supplier_ids']);
}
@@ -151,19 +154,25 @@
// 用户是否已绑定
$user = null;
$userChange = false;
- if($this['superUser'] && $supplier['user_id'] > 0 && $supplier['user_id'] != $this['superUser']['user_id']){
- $user = UserModel::detail($supplier['user_id']);
- if ($user['user_type'] != 1) {
- $this->error = '该用户已绑定';
- return false;
+ if (!empty($supplier['user_id'])){
+ if($this['superUser'] && $supplier['user_id'] > 0 && $supplier['user_id'] != $this['superUser']['user_id']){
+ $user = UserModel::detail($supplier['user_id']);
+ if ($user['user_type'] != 1) {
+ $this->error = '该用户已绑定';
+ return false;
+ }
+ $isApply = $this->isApply($supplier['user_id']);
+ if ($isApply) {
+ $this->error = '已经申请开店';
+ return false;
+ }
+ $userChange = true;
}
- $isApply = $this->isApply($supplier['user_id']);
- if ($isApply) {
- $this->error = '已经申请开店';
- return false;
- }
- $userChange = true;
+ $user=UserModel::detail($supplier['user_id']);
+ $supplier['referee_id'] = $user['referee_id'];
}
+
+ $supplier = $this->createData($supplier);
// 修改供应商
$this->save($supplier);
// 修改登录用户
@@ -235,7 +244,7 @@
{
$model = new static();
// 查询列表数据
- return $model->field(['shop_supplier_id,name'])->where('is_delete', '=', '0')
+ return $model->field(['shop_supplier_id,name,supplier_type'])->where('is_delete', '=', '0')
->order(['create_time' => 'desc'])
->select();
}
--
Gitblit v1.9.2