|
@@ -524,14 +524,36 @@ class ProductClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//修改价格 linqh 2021.1.28
|
|
//修改价格 linqh 2021.1.28
|
|
|
- public static function changePrice($id, $shopId, $price, $priceLabel)
|
|
|
|
|
|
|
+ public static function changePrice($product, $price, $priceLabel)
|
|
|
{
|
|
{
|
|
|
|
|
+ $id = $product->id ?? 0;
|
|
|
|
|
+ $shopId = $product->shopId ?? 0;
|
|
|
//2021.7.6 linqh 首店改价,同步到各个分店
|
|
//2021.7.6 linqh 首店改价,同步到各个分店
|
|
|
- $res = ProductClass::updateByCondition(['id' => $id, 'shopId' => $shopId], ['price' => $price, 'priceLabel' => $priceLabel]);
|
|
|
|
|
|
|
+ $res = ProductClass::updateByCondition(['id' => $id], ['price' => $price, 'priceLabel' => $priceLabel]);
|
|
|
self::updateSyncProduct($id, $shopId, ['price' => $price, 'priceLabel' => $priceLabel]);
|
|
self::updateSyncProduct($id, $shopId, ['price' => $price, 'priceLabel' => $priceLabel]);
|
|
|
return $res;
|
|
return $res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //2021.7.6 修改花材同步其他分店
|
|
|
|
|
+ public static function updateSyncProduct($productId, $shopId, $upData)
|
|
|
|
|
+ {
|
|
|
|
|
+ $shopInfo = ShopClass::getById($shopId);
|
|
|
|
|
+ $productData = ProductClass::getById($productId);
|
|
|
|
|
+ $itemId = $productData['itemId'];
|
|
|
|
|
+ if ($shopInfo['default'] == 1) {
|
|
|
|
|
+ //首店
|
|
|
|
|
+ $sjId = $shopInfo['sjId'];
|
|
|
|
|
+ $shopAll = ShopClass::getAllShop($sjId);
|
|
|
|
|
+ if ($shopAll) {
|
|
|
|
|
+ foreach ($shopAll as $s) {
|
|
|
|
|
+ if ($s['id'] != $shopId) {
|
|
|
|
|
+ ProductClass::updateByCondition(['itemId' => $itemId, 'shopId' => $s['id']], $upData);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
//下单时计算商品的价格 linqh 2021.1.28
|
|
//下单时计算商品的价格 linqh 2021.1.28
|
|
|
//itemInfo : [{"classId":5,"productId":3,"bigNum":1,"smallNum":2},{"classId":5,"productId":4,"bigNum":1,"smallNum":5}]
|
|
//itemInfo : [{"classId":5,"productId":3,"bigNum":1,"smallNum":2},{"classId":5,"productId":4,"bigNum":1,"smallNum":5}]
|
|
|
//2021.7.26增加前端传的价格 (小程序有传,但pc端不穿)
|
|
//2021.7.26增加前端传的价格 (小程序有传,但pc端不穿)
|
|
@@ -654,17 +676,17 @@ class ProductClass extends BaseClass
|
|
|
if (isset($data['stock']) && is_numeric($data['stock'])) {
|
|
if (isset($data['stock']) && is_numeric($data['stock'])) {
|
|
|
$preStock = $product->stock ?? 0;
|
|
$preStock = $product->stock ?? 0;
|
|
|
if ($data['stock'] != $preStock) {
|
|
if ($data['stock'] != $preStock) {
|
|
|
- if($data['stock'] < 0){
|
|
|
|
|
|
|
+ if ($data['stock'] < 0) {
|
|
|
util::fail("库存不能小于0");
|
|
util::fail("库存不能小于0");
|
|
|
}
|
|
}
|
|
|
//增加盘点记录 2021.7.27
|
|
//增加盘点记录 2021.7.27
|
|
|
- $ratio = $upData['ratio']??$product->ratio;//取最新比例
|
|
|
|
|
- $formNum = ProductClass::formatStock($data['stock'],$ratio);
|
|
|
|
|
|
|
+ $ratio = $upData['ratio'] ?? $product->ratio;//取最新比例
|
|
|
|
|
+ $formNum = ProductClass::formatStock($data['stock'], $ratio);
|
|
|
$ghsItemInfo = [
|
|
$ghsItemInfo = [
|
|
|
[
|
|
[
|
|
|
- 'productId'=>$product->id,
|
|
|
|
|
- 'bigNum'=>$formNum['bigNum'],
|
|
|
|
|
- 'smallNum'=>$formNum['smallNum'],
|
|
|
|
|
|
|
+ 'productId' => $product->id,
|
|
|
|
|
+ 'bigNum' => $formNum['bigNum'],
|
|
|
|
|
+ 'smallNum' => $formNum['smallNum'],
|
|
|
]
|
|
]
|
|
|
];
|
|
];
|
|
|
$pdData = [];
|
|
$pdData = [];
|
|
@@ -672,7 +694,7 @@ class ProductClass extends BaseClass
|
|
|
$pdData['sjId'] = $product->sjId;
|
|
$pdData['sjId'] = $product->sjId;
|
|
|
$pdData['shopId'] = $product->shopId;
|
|
$pdData['shopId'] = $product->shopId;
|
|
|
$pdData['adminId'] = $data['adminId'];
|
|
$pdData['adminId'] = $data['adminId'];
|
|
|
- CheckOrderClass::opOrder($pdData,false,false);
|
|
|
|
|
|
|
+ CheckOrderClass::opOrder($pdData, false, false);
|
|
|
}
|
|
}
|
|
|
unset($data['stock']);
|
|
unset($data['stock']);
|
|
|
}
|
|
}
|
|
@@ -1035,26 +1057,6 @@ class ProductClass extends BaseClass
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //2021.7.6 修改花材同步其他分店
|
|
|
|
|
- public static function updateSyncProduct($productId, $shopId, $upData)
|
|
|
|
|
- {
|
|
|
|
|
- $shopInfo = ShopClass::getById($shopId);
|
|
|
|
|
- $productData = ProductClass::getById($productId);
|
|
|
|
|
- $itemId = $productData['itemId'];
|
|
|
|
|
- if ($shopInfo['default'] == 1) {
|
|
|
|
|
- //首店
|
|
|
|
|
- $sjId = $shopInfo['sjId'];
|
|
|
|
|
- $shopAll = ShopClass::getAllShop($sjId);
|
|
|
|
|
- if ($shopAll) {
|
|
|
|
|
- foreach ($shopAll as $s) {
|
|
|
|
|
- if ($s['id'] != $shopId) {
|
|
|
|
|
- ProductClass::updateByCondition(['itemId' => $itemId, 'shopId' => $s['id']], $upData);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
//花材上下架
|
|
//花材上下架
|
|
|
public static function changeDelStatus($productId, $delStatus)
|
|
public static function changeDelStatus($productId, $delStatus)
|
|
|
{
|
|
{
|