mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-12-25 18:03:11 +08:00
commit e4f3b3f432
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/repositories/store/product/ProductRepository.php
View File

@ -344,7 +344,15 @@ class ProductRepository extends BaseRepository
$ret = Spu::getInstance()->where('product_id', $id)->whereIn('product_type', [0, 98, 99])->find();
Db::transaction(function () use ($id, $data, $settleParams, $ret) {
$this->save($id, $settleParams, null, [], 0);
app()->make(SpuRepository::class)->update($ret->spu_id, ['price' => $data['price']]);
$value = $data['mer_labels'];
if (!empty($value)) {
if (!is_array($value)) {
$data['mer_labels'] = ',' . $value . ',';
} else {
$data['mer_labels'] = ',' . implode(',', $value) . ',';
}
}
app()->make(SpuRepository::class)->update($ret->spu_id, ['price' => $data['price'],'mer_labels'=>$data['mer_labels']]);
Queue(SendSmsJob::class, ['tempId' => 'PRODUCT_INCREASE', 'id' => $id]);
});
}
@ -726,7 +734,7 @@ class ProductRepository extends BaseRepository
if ($data['product_type'] == 3) $make = app()->make(ProductAssistSkuRepository::class);
if ($data['product_type'] == 4) $make = app()->make(ProductGroupSkuRepository::class);
$spu_where = ['activity_id' => $activeId, 'product_type' => $data['product_type'], 'product_id' => $id];
$spu_where = ['activity_id' => $activeId??0, 'product_type' => $data['product_type'], 'product_id' => $id];
$spu = $spu_make->getSearch($spu_where)->find();
$data['star'] = $spu['star'] ?? '';
$data['mer_labels'] = $spu['mer_labels'] ?? '';

3
app/controller/api/store/product/StoreProduct.php
View File

@ -211,7 +211,8 @@ class StoreProduct extends BaseController
"attr",
"attrValue",
'spec_type',
'is_stock'
'is_stock',
'mer_labels'
];
$data = $this->request->params($params);
// $count = app()->make(StoreCategoryRepository::class)->getWhereCount(['store_category_id' => $data['mer_cate_id'],'is_show' => 1,'mer_id' => $this->request->merId()]);