|
|
@@ -475,10 +475,11 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
//小菊
|
|
|
if (isset($val['variety']) && $val['variety'] == 1) {
|
|
|
- unset($list[$key]);
|
|
|
$currentItemId = $val['id'] ?? 0;
|
|
|
$xjList = OrderXjClass::getAllByCondition(['itemId' => $currentItemId], null, '*');
|
|
|
if (!empty($xjList)) {
|
|
|
+ //选了有颜色的小菊才把原小菊删除不显示出来
|
|
|
+ unset($list[$key]);
|
|
|
foreach ($xjList as $xjKey => $xj) {
|
|
|
$xjBase = $val;
|
|
|
$num = $xj['num'] ?? 0;
|
|
|
@@ -541,13 +542,13 @@ class OrderClass extends BaseClass
|
|
|
$getOriginalItem = Yii::$app->request->get('getOriginalItem', 0);
|
|
|
$getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
|
|
|
if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
|
|
|
- $showItem = self::getOriginalShowItem($showItem, $val);
|
|
|
+ $showItemData = self::getOriginalShowItem($showItem, $val);
|
|
|
} else {
|
|
|
- $showItem = self::getShowItem($showItem, $val);
|
|
|
+ $showItemData = self::getShowItem($showItem, $val);
|
|
|
}
|
|
|
|
|
|
- $list[$key]['product'] = $showItem['list'];
|
|
|
- $list[$key]['productStat'] = $showItem['itemStat'];
|
|
|
+ $list[$key]['product'] = $showItemData['list'];
|
|
|
+ $list[$key]['productStat'] = $showItemData['itemStat'];
|
|
|
|
|
|
$showResetItem = 0;
|
|
|
//待付款订单显示改花材按钮
|
|
|
@@ -574,7 +575,7 @@ class OrderClass extends BaseClass
|
|
|
$debtAmount = $customInfoList[$customId]['debtAmount'] ?? 0.00;
|
|
|
|
|
|
//打印数据组合
|
|
|
- $printData = self::getPrintData($val, $debtAmount, $showItem);
|
|
|
+ $printData = self::getPrintData($val, $debtAmount, $showItemData);
|
|
|
$list[$key]['printData'] = json_encode($printData);
|
|
|
|
|
|
$list[$key]['debtAmount'] = $debtAmount;
|
shish