|
@@ -47,7 +47,7 @@ class ProductController extends BaseController
|
|
|
|
|
|
|
|
$p->times = $num;
|
|
$p->times = $num;
|
|
|
$content = '<TEXT x="360" y="30" font="12" w="2" h="2" r="90">' . $name . '</TEXT>';
|
|
$content = '<TEXT x="360" y="30" font="12" w="2" h="2" r="90">' . $name . '</TEXT>';
|
|
|
- $content .= '<BC128 x="260" y="30" h="80" s="1" r="90" n="5" w="12">'.$ptItemId.'</BC128>';
|
|
|
|
|
|
|
+ $content .= '<BC128 x="260" y="30" h="80" s="1" r="90" n="5" w="12">' . $ptItemId . '</BC128>';
|
|
|
$p->printLabelMsg($content);
|
|
$p->printLabelMsg($content);
|
|
|
util::complete();
|
|
util::complete();
|
|
|
}
|
|
}
|
|
@@ -261,7 +261,8 @@ class ProductController extends BaseController
|
|
|
if (isset($product['id']) == false) {
|
|
if (isset($product['id']) == false) {
|
|
|
util::fail('没有花材');
|
|
util::fail('没有花材');
|
|
|
}
|
|
}
|
|
|
- $price = $product['price'];
|
|
|
|
|
|
|
+ $price = $product['price'] ?? 0;
|
|
|
|
|
+ $skPrice = $product['skPrice'] ?? 0;
|
|
|
$productId = $product['id'];
|
|
$productId = $product['id'];
|
|
|
|
|
|
|
|
$product = $productList[$productId] ?? [];
|
|
$product = $productList[$productId] ?? [];
|
|
@@ -275,14 +276,14 @@ class ProductController extends BaseController
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
$ptItemId = $product->itemId;
|
|
$ptItemId = $product->itemId;
|
|
|
- ProductClass::changeSinglePrice($shop, $ptItemId, $price);
|
|
|
|
|
|
|
+ ProductClass::changeSinglePrice($shop, $ptItemId, $price, $skPrice);
|
|
|
//在首店修改需要同步到所有直营店
|
|
//在首店修改需要同步到所有直营店
|
|
|
if ($default == 1) {
|
|
if ($default == 1) {
|
|
|
foreach ($chainShopList as $chain) {
|
|
foreach ($chainShopList as $chain) {
|
|
|
if ($chain->id == $shop->id) {
|
|
if ($chain->id == $shop->id) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- ProductClass::changeSinglePrice($chain, $ptItemId, $price);
|
|
|
|
|
|
|
+ ProductClass::changeSinglePrice($chain, $ptItemId, $price, $skPrice);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|