|
|
@@ -602,9 +602,9 @@ class ProductClass extends BaseClass
|
|
|
|
|
|
|
|
|
//分类ID
|
|
|
- if(isset($data["classId"])){
|
|
|
+ if (isset($data["classId"])) {
|
|
|
$classId = $data['classId'];
|
|
|
- ItemClassClass::valid($classId,$model['merchantId']);
|
|
|
+ ItemClassClass::valid($classId, $model['merchantId']);
|
|
|
$upData['classId'] = $classId;
|
|
|
}
|
|
|
|
|
|
@@ -688,17 +688,17 @@ class ProductClass extends BaseClass
|
|
|
|
|
|
//供货商的productId => 零售端的productId ,不存在的补productId(放在默认分类)
|
|
|
//productList [{"productId":"113","bigNum":1,"smallNum":0,"classId":"-2","itemId":1}]
|
|
|
- public static function toggleProductList($productList,$hdShopId,$hdSjId)
|
|
|
+ public static function toggleProductList($productList, $hdShopId, $hdSjId)
|
|
|
{
|
|
|
- $itemIds = array_column($productList,"itemId");
|
|
|
- $hdProductData = self::getProductInfoByItemIds($itemIds,$hdShopId);
|
|
|
- $hdProductData = array_column($hdProductData,null,"itemId");
|
|
|
+ $itemIds = array_column($productList, "itemId");
|
|
|
+ $hdProductData = self::getProductInfoByItemIds($itemIds, $hdShopId);
|
|
|
+ $hdProductData = array_column($hdProductData, null, "itemId");
|
|
|
//获取默认分类ID
|
|
|
$defaultClassId = ItemClassClass::getDefaultClassId($hdSjId);
|
|
|
|
|
|
- foreach ($productList as $k=>$v){
|
|
|
+ foreach ($productList as $k => $v) {
|
|
|
$itemId = $v['itemId'];
|
|
|
- if(!isset($hdProductData[$itemId])){
|
|
|
+ if (!isset($hdProductData[$itemId])) {
|
|
|
//不存在,则新增
|
|
|
//获取ptItem信息,写入product
|
|
|
$ptItem = \biz\item\classes\PtItemClass::getById($itemId);
|
|
|
@@ -712,10 +712,12 @@ class ProductClass extends BaseClass
|
|
|
unset($productData['id']);
|
|
|
$productData['rank'] = 'A';
|
|
|
//计算价格
|
|
|
- $productData['price'] = bcadd($v['cost'],$v['addPrice'],2);
|
|
|
+ $cost = $v['cost'] ?? 0;
|
|
|
+ $addPrice = $v['addPrice'] ?? 0;
|
|
|
+ $productData['price'] = bcadd($cost, $addPrice, 2);
|
|
|
$addProduct = ProductClass::add($productData);
|
|
|
$hdProductId = $addProduct['id'];
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$hdProductId = $hdProductData[$itemId]['id'];
|
|
|
}
|
|
|
$productList[$k]['hdProductId'] = $hdProductId;
|