xucong/jianbing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.提交缺失的东西

Browse Source
This commit is contained in:
xucong
2025-05-28 10:33:41 +08:00
parent 5f597e478a
commit ae8d8565dc
2 changed files with 377 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
app/adminapi/controller/GoodsController.php
View File

@ -20,6 +20,7 @@ use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\GoodsLists; use app\adminapi\lists\GoodsLists;
use app\adminapi\logic\GoodsLogic; use app\adminapi\logic\GoodsLogic;
use app\adminapi\validate\GoodsValidate; use app\adminapi\validate\GoodsValidate;
use think\facade\Db;
/** /**
@ -132,12 +133,84 @@ class GoodsController extends BaseAdminController
*/ */
public function edit() public function edit()
{ {
$params = (new GoodsValidate())->post()->goCheck('edit'); if ($this->request->isAjax() && $this->request->isPost()) {
$result = GoodsLogic::edit($params);
if (true === $result) { $post = $this->request->post();
return $this->success('编辑成功', [], 1, 1);
$post['del'] = 0;
$post['id'] = $post['goods_id'];
//主表验证
$result = $this->validate($post, 'app\adminapi\validate\GoodsValidate');
if ($result !== true) {
return $this->fail($result);
}
//单规格验证
if ($post['spec_type'] == 1) {
$result = $this->validate($post, 'app\adminapi\validate\GoodsOneSpecValidate');
if ($result !== true) {
return $this->fail($result);
}
}
//多规格验证
$spec_lists = [];
if ($post['spec_type'] == 2) {
$spec_lists = $post;
unset($spec_lists['goods_image']);
unset($spec_lists['spec_name']);
unset($spec_lists['spec_values']);
unset($spec_lists['spec_id']);
unset($spec_lists['spec_value_ids']);
$spec_lists = form_to_linear($spec_lists);
//规格验证
if (empty($spec_lists)) {
return $this->fail('至少添加一个规格');
}
$result = $this->validate($post, 'app\adminapi\validate\GoodsMoreSpecValidate');
if ($result !== true) {
return $this->fail($result);
}
//规格商品列表验证
foreach ($spec_lists as $v) {
$result = $this->validate($v, 'app\adminapi\validate\GoodsMoreSpecListsValidate');
if ($result !== true) {
return $this->fail($result);
}
}
// 校验规格
$total_stock = array_sum(array_column($spec_lists, 'stock'));
if ($total_stock <= 0) {
$this->fail('至少有一个规格的库存大于0');
}
}
if ($post['status'] == 0) {
$status = Db::name('goods')
->where(['id' => $post['goods_id']])
->value('status');
if ($status == 1) {
$res = Db::name('team_activity')
->where(['status' => 1, 'goods_id'=> $post['goods_id']])
->find();
if ($res) {
return $this->fail('该商品正在参与拼团，请先关闭后才允许下架');
}
}
}
//添加商品
$result = GoodsLogic::edit($post, $spec_lists);
if ($result !== true) {
return $this->fail('添加失败:' . $result);
}
return $this->success('修改成功');
} }
return $this->fail(GoodsLogic::getError());
} }

356
app/adminapi/logic/GoodsLogic.php
View File

@ -15,11 +15,14 @@
namespace app\adminapi\logic; namespace app\adminapi\logic;
use app\common\model\distribution\DistributionGoods;
use app\common\model\Goods; use app\common\model\Goods;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\GoodsItem;
use app\common\service\UrlServer; use app\common\service\UrlServer;
use think\Exception; use think\Exception;
use think\facade\Db; use think\facade\Db;
use think\facade\Hook;
/** /**
@ -217,71 +220,310 @@ class GoodsLogic extends BaseLogic
/** /**
* @notes 编辑 * 编辑商品
* @param array $params * @param $post
* @param $spec_lists
* @return bool * @return bool
* @author likeadmin
* @date 2025/05/08 15:34
*/ */
public static function edit(array $params): bool public static function edit($post, $spec_lists)
{ {
Db::startTrans();
try { try {
Goods::where('id', $params['id'])->update([ Db::startTrans();
'name' => $params['name'],
'code' => $params['code'], $oldItemIds = GoodsItem::where('goods_id', $post['id'])->column('id');
'first_category_id' => $params['first_category_id'],
'second_category_id' => $params['second_category_id'], $time = time();
'third_category_id' => $params['third_category_id'],
'brand_id' => $params['brand_id'], //算出最大最小价格
'supplier_id' => $params['supplier_id'], if ($post['spec_type'] == 1) {
'status' => $params['status'], $max_price = $post['one_price'];
'image' => $params['image'], $min_price = $post['one_price'];
'video' => $params['video'], $market_price = $post['one_market_price'];
'poster' => $params['poster'], $total_stock = $post['one_stock'];
'remark' => $params['remark'], } else {
'content' => $params['content'],
'sort' => $params['sort'], $max_price = max($post['price']);
'sales_sum' => $params['sales_sum'], $min_price = min($post['price']);
'virtual_sales_sum' => $params['virtual_sales_sum'], $min_price_key = array_search($min_price,$post['price']);
'click_count' => $params['click_count'], $market_price = $post['market_price'][$min_price_key];
'virtual_click' => $params['virtual_click'], $total_stock = array_sum($post['stock']);
'spec_type' => $params['spec_type'], }
'max_price' => $params['max_price'],
'min_price' => $params['min_price'], $free_shipping = $post['free_shipping_type'] == 2 ? $post['free_shipping']: '';
'market_price' => $params['market_price'], $free_shipping_template_id = $post['free_shipping_type'] == 3 ? $post['free_shipping_template_id']: '';
'stock' => $params['stock'],
'stock_warn' => $params['stock_warn'], $old_spec_type = Db::name('goods')
'is_show_stock' => $params['is_show_stock'], ->where('id', $post['goods_id'])
'free_shipping_type' => $params['free_shipping_type'], ->value('spec_type');
'free_shipping' => $params['free_shipping'],
'free_shipping_template_id' => $params['free_shipping_template_id'], // 替换内容中图片地址
'is_commission' => $params['is_commission'], $domain = UrlServer::getFileUrl('/');
'first_ratio' => $params['first_ratio'], $post['content'] = str_replace($domain, '/', $post['content']);
'second_ratio' => $params['second_ratio'],
'three_ratio' => $params['three_ratio'], //赠送积分
'is_share_bouns' => $params['is_share_bouns'], $give_integral_type = $post['give_integral_type'] ?? 0;
'region_ratio' => $params['region_ratio'], switch ($give_integral_type){
'shareholder_ratio' => $params['shareholder_ratio'], case 1:
'is_new' => $params['is_new'], $give_integral = empty($post['give_integral_num']) ? 0 : $post['give_integral_num'];
'is_best' => $params['is_best'], break;
'is_like' => $params['is_like'], case 2:
'is_team' => $params['is_team'], $give_integral = empty($post['give_integral_ratio']) ? 0 : $post['give_integral_ratio'];
'is_integral' => $params['is_integral'], break;
'is_member' => $params['is_member'], default:
'give_integral_type' => $params['give_integral_type'], $give_integral = 0;
'give_integral' => $params['give_integral'], }
'del' => $params['del'],
'is_express' => $params['is_express'], $video = isset($post['video']) ? UrlServer::setFileUrl($post['video']) : '';
'is_selffetch' => $params['is_selffetch']
]); //写入主表
$data = [
'name' => $post['name'],
'code' => $post['code'],
'first_category_id' => $post['first_category_id'],
'second_category_id' => $post['second_category_id'],
'third_category_id' => $post['third_category_id'],
'brand_id' => $post['brand_id'],
'supplier_id' => $post['supplier_id'],
'image' => $post['image'],
'video' => $video,
'poster' => $post['poster'] ?? '',
'remark' => $post['remark'],
'content' => $post['content'],
'max_price' => $max_price,
'min_price' => $min_price,
'market_price' => $market_price,
'stock' => $total_stock,
'status' => $post['status'],
'virtual_sales_sum' => $post['virtual_sales_sum'],
'virtual_click' => $post['virtual_click'] ?? 0,
'stock_warn' => $post['stock_warn'],
'is_show_stock' => $post['is_show_stock'],
'free_shipping_type' => $post['free_shipping_type'],
'free_shipping' => $free_shipping,
'free_shipping_template_id' => $free_shipping_template_id,
'is_new' => isset($post['is_new']) && $post['is_new'] == 'on' ? 1 : 0,
'is_best' => isset($post['is_best']) && $post['is_best'] == 'on' ? 1 : 0,
'is_like' => isset($post['is_like']) && $post['is_like'] == 'on' ? 1 : 0,
'is_integral' => $post['is_integral'],
'is_member' => $post['is_member'],
'give_integral_type' => $give_integral_type,
'give_integral' => $give_integral,
'spec_type' => $post['spec_type'],
'update_time' => $time,
'is_express' => isset($post['is_express']) && $post['is_express'] == 'on' ? 1 : 0,
'is_selffetch' => isset($post['is_selffetch']) && $post['is_selffetch'] == 'on' ? 1 : 0,
];
Db::name('goods')
->where(['id' => $post['goods_id']])
->update($data);
// 下架或删除商品，更新商品收藏
if ($data['status'] != 1) {
Hook::listen('update_collect', ['goods_id' => $post['goods_id']]);
}
//重新更新图片表
Db::name('goods_image')
->where(['goods_id' => $post['goods_id']])
->delete();
$data = [];
foreach ($post['goods_image'] as $k => $v) {
$data[] = [
'goods_id' => $post['goods_id'],
'uri' => $v,
];
}
Db::name('goods_image')->insertAll($data);
//写入规格表
if ($post['spec_type'] == 1) {
//单规格写入
if ($old_spec_type == 1) {
//原来是单规格
$data = [
'image' => $post['one_spec_image'],
'price' => $post['one_price'],
'market_price' => $post['one_market_price'],
'cost_price' => $post['one_cost_price'],
'stock' => $post['one_stock'],
'volume' => $post['one_volume'],
'weight' => $post['one_weight'],
'bar_code' => $post['one_bar_code'],
];
Db::name('goods_item')
->where(['goods_id' => $post['goods_id']])
->update($data);
} else {
//原来非单规格
//删除多规格
Db::name('goods_spec')
->where('goods_id', $post['goods_id'])
->delete();
Db::name('goods_spec_value')
->where('goods_id', $post['goods_id'])
->delete();
Db::name('goods_item')
->where('goods_id', $post['goods_id'])
->delete();
$goods_spec_id = Db::name('goods_spec')
->insertGetId(['goods_id' => $post['goods_id'], 'name' => '默认']);
$goods_spec_value_id = Db::name('goods_spec_value')
->insertGetId(['spec_id' => $goods_spec_id, 'goods_id' => $post['goods_id'], 'value' => '默认']);
$data = [
'image' => $post['one_spec_image'],
'goods_id' => $post['goods_id'],
'spec_value_ids' => $goods_spec_value_id,
'spec_value_str' => '默认',
'market_price' => $post['one_market_price'],
'cost_price' => $post['one_cost_price'],
'price' => $post['one_price'],
'stock' => $post['one_stock'],
'volume' => $post['one_volume'],
'weight' => $post['one_weight'],
'bar_code' => $post['one_bar_code'],
];
Db::name('goods_item')
->insert($data);
}
} else {
$goods_specs = [];
foreach ($post['spec_name'] as $k => $v) {
$temp = ['goods_id' => $post['goods_id'], 'name' => $v, 'spec_id' => $post['spec_id'][$k]];
$goods_specs[] = $temp;
}
$new_spec_name_ids = [];
foreach ($goods_specs as $k => $v) {
if ($v['spec_id']) {
//更新规格名
Db::name('goods_spec')
->where(['goods_id' => $post['goods_id'], 'id' => $v['spec_id']])
->update(['name' => $v['name']]);
$new_spec_name_ids[] = $v['spec_id'];
} else {
//添加规格名
$new_spec_name_ids[] = Db::name('goods_spec')
->insertGetId(['goods_id' => $post['goods_id'], 'name' => $v['name']]);
}
}
//删除规格名
$all_spec_ids = Db::name('goods_spec')
->where('goods_id', $post['goods_id'])
->column('id');
$del_spec_name_ids = array_diff($all_spec_ids, $new_spec_name_ids);
if (!empty($del_spec_name_ids)) {
Db::name('goods_spec')
->where('goods_id', $post['goods_id'])
->where('id', 'in', $del_spec_name_ids)
->delete();
}
$new_spec_value_ids = [];
$goods_spec_name_key_id = Db::name('goods_spec')
->where(['goods_id' => $post['goods_id']])
->where('name', 'in', $post['spec_name'])
->column('id', 'name');
$check_values = [];//检查规格值是否存在相同
foreach ($post['spec_values'] as $k => $v) {
$value_id_row = explode(',', $post['spec_value_ids'][$k]);
$value_row = explode(',', $v);
foreach ($value_row as $k2 => $v2) {
if (in_array($v2, $check_values)) {
throw new Exception('请勿添加相同规格值');
}
$temp = [
'goods_id' => $post['goods_id'],
'spec_id' => $goods_spec_name_key_id[$post['spec_name'][$k]],
'value' => $v2,
];
$check_values[] = $v2;
if ($value_id_row[$k2]) {
//更新规格值
Db::name('goods_spec_value')
->where(['id' => $value_id_row[$k2]])
->update($temp);
$new_spec_value_ids[] = $value_id_row[$k2];
} else {
//添加规格值
$new_spec_value_ids[] = Db::name('goods_spec_value')
->insertGetId($temp);
}
}
}
$all_spec_value_ids = Db::name('goods_spec_value')
->where('goods_id', $post['goods_id'])
->column('id');
$del_spec_value_ids = array_diff($all_spec_value_ids, $new_spec_value_ids);
if (!empty($del_spec_value_ids)) {
//删除规格值
Db::name('goods_spec_value')
->where('goods_id', $post['goods_id'])
->where('id', 'in', $del_spec_value_ids)
->delete();
}
$new_item_id = [];
$goods_spec_name_value_id = Db::name('goods_spec_value')
->where(['goods_id' => $post['goods_id']])
->column('id', 'value');
foreach ($spec_lists as $k => $v) {
$spec_lists[$k]['spec_value_ids'] = '';
$temp = explode(',', $v['spec_value_str']);
foreach ($temp as $k2 => $v2) {
$spec_lists[$k]['spec_value_ids'] .= $goods_spec_name_value_id[$v2] . ',';
}
$spec_lists[$k]['spec_value_ids'] = trim($spec_lists[$k]['spec_value_ids'], ',');
$spec_lists[$k]['image'] = str_replace(UrlServer::getFileUrl('/'), '', $spec_lists[$k]['spec_image']);
unset($spec_lists[$k]['spec_image']);
$spec_lists[$k]['goods_id'] = $post['goods_id'];
unset($spec_lists[$k]['spec_id']);
$item_id = $spec_lists[$k]['item_id'];
unset($spec_lists[$k]['item_id']);
if ($item_id) {
Db::name('goods_item')
->where(['id' => $item_id])
->update($spec_lists[$k]);
$new_item_id[] = $item_id;
} else {
$new_item_id[] = Db::name('goods_item')
->insertGetId($spec_lists[$k]);
}
}
$all_item_id = Db::name('goods_item')
->where('goods_id', $post['goods_id'])
->column('id');
$del_item_ids = array_diff($all_item_id, $new_item_id);
if (!empty($del_item_ids)) {
//删除规格值
Db::name('goods_item')
->where('goods_id', $post['goods_id'])
->where('id', 'in', $del_item_ids)
->delete();
}
}
$newItemIds = GoodsItem::where('goods_id', $post['id'])->column('id');
$destroyIds = DistributionGoods::where('goods_id', $post['goods_id'])->column('id');
// 删除原来的分销设置
if ($oldItemIds != $newItemIds && $destroyIds) {
DistributionGoods::destroy($destroyIds);
self::$error = '商品信息修改成功,该商品属于分销商品，请重新设置分销信息';
}
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); return $e->getMessage();
return false;
} }
} }