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

更新

Browse Source
This commit is contained in:
mkm 2023-11-16 17:17:13 +08:00
parent 785b5bd562
commit 039e5bce9a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2348,7 +2348,7 @@ class ProductRepository extends BaseRepository
//有商品无规格或者无商品无规格，导入商品和规格
$product = $this->getWhere(['source_product_id' => $params['order_product_id'], 'mer_id' => $merId]);
if (!empty($product)) {
$attrValue = ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->find();
$attrValue = ProductAttrValue::where('mer_id', $merId)->where('product_id', $product['product_id'])->where('unique', $params['unique'])->find();
if (!empty($params['order_id'])) {
//采购、委托订单导入
$orderMerId = StoreOrder::where('order_id', $params['order_id'])->value('mer_id');

5
app/controller/api/server/StoreProduct.php
View File

@ -239,11 +239,14 @@ class StoreProduct extends BaseController
public function stockIn()
{
$params = $this->request->param();
if($params['unique']==''){
return app('json')->fail('多规格编号不能为空');
}
$res=$this->repository->stockIn($this->merId, $params);
if($res){
return app('json')->success('入库成功');
}else{
return app('json')->success('入库失败');
return app('json')->fail('入库失败');
}
}