|
|
@@ -1510,8 +1510,8 @@ class OrderClass extends BaseClass
|
|
|
if ($showPrice == 1) {
|
|
|
if (floatval($unitPrice) == 0.01) {
|
|
|
$content .= $productNum . ' = ' . $productPrice . '元 赠送价<BR>';
|
|
|
- }else{
|
|
|
- $content .= $productNum . ' = ' . $productPrice . '元 ' . ($ratioType==0 ? $ratio.'支装' : ($ratioType==1 ? '若干支装' : '')) . '<BR>';
|
|
|
+ } else {
|
|
|
+ $content .= $productNum . ' = ' . $productPrice . '元 ' . ($ratioType == 0 ? $ratio . '支装' : ($ratioType == 1 ? '若干支装' : '')) . '<BR>';
|
|
|
}
|
|
|
}
|
|
|
$content .= '--------------------------------<BR>';
|
|
|
@@ -1891,7 +1891,7 @@ class OrderClass extends BaseClass
|
|
|
/**************************如果是好多花的云仓还要再打一下标签纸,多处要同步修改,关键词 hdh_yc *****************************/
|
|
|
$orderMainId = $orderInfo['mainId'] ?? 0;
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
- $map = [65726, 58];
|
|
|
+ $map = [65726, 58, 25119];
|
|
|
} else {
|
|
|
$map = [828];
|
|
|
}
|
|
|
@@ -2127,7 +2127,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($bigNum) . $xhUnitName . ' * ' . floatval($bigUnitPrice) . '元',
|
|
|
'count' => floatval($bigNum) . $xhUnitName,
|
|
|
'price' => floatval($bigTotalPrice),
|
|
|
- 'unitPrice'=>floatval($bigUnitPrice),
|
|
|
+ 'unitPrice' => floatval($bigUnitPrice),
|
|
|
'refundNum' => $refundNum,
|
|
|
'unitName' => $xhUnitName,
|
|
|
'itemNum' => $bigNum,
|
|
|
@@ -2143,7 +2143,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($smallNum) . '支 * ' . floatval($smallUnitPrice) . '元',
|
|
|
'count' => floatval($smallNum) . '支',
|
|
|
'price' => floatval($smallTotalPrice),
|
|
|
- 'unitPrice'=>floatval($smallUnitPrice),
|
|
|
+ 'unitPrice' => floatval($smallUnitPrice),
|
|
|
'refundNum' => $refundNum,
|
|
|
'unitName' => '支',
|
|
|
'itemNum' => $smallNum,
|
|
|
@@ -2156,7 +2156,7 @@ class OrderClass extends BaseClass
|
|
|
'num' => floatval($giveNum) . $xhUnitName . ' * 0元',
|
|
|
'count' => floatval($giveNum) . $xhUnitName,
|
|
|
'price' => 0,
|
|
|
- 'unitPrice'=>0,
|
|
|
+ 'unitPrice' => 0,
|
|
|
'unitName' => $xhUnitName,
|
|
|
'itemNum' => $giveNum,
|
|
|
'remark' => $remark,
|
|
|
@@ -2944,7 +2944,7 @@ XL;
|
|
|
/**************************如果是好多花的云仓还要再打一下标签纸,多处要同步修改,关键词 hdh_yc *****************************/
|
|
|
$orderMainId = $order->mainId;
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
- $map = [65726, 58];
|
|
|
+ $map = [65726, 58, 25119];
|
|
|
} else {
|
|
|
$map = [828];
|
|
|
}
|