|
|
@@ -415,6 +415,35 @@ class OrderClass extends BaseClass
|
|
|
return [$create, $unConfirm, $out];
|
|
|
}
|
|
|
|
|
|
+ //退款等需要使用原来的订单花材结构
|
|
|
+ public static function getOriginalShowItem($showItem, $order)
|
|
|
+ {
|
|
|
+ if ($showItem == false) {
|
|
|
+ return ['list' => [], 'itemStat' => []];
|
|
|
+ }
|
|
|
+ $orderSn = $order['orderSn'];
|
|
|
+ $list = OrderItemClass::getOrderItem($orderSn);
|
|
|
+ $totalPrice = 0;
|
|
|
+ $totalBigNum = 0;
|
|
|
+ $totalSmallNum = 0;
|
|
|
+ $kind = 0;
|
|
|
+ $itemStat = [];
|
|
|
+ if (!empty($list)) {
|
|
|
+ foreach ($list as $key => $val) {
|
|
|
+ $list[$key]['property'] = $val['rank'] . '级';
|
|
|
+ $price = $val['price'];
|
|
|
+ $totalPrice = stringUtil::calcAdd($totalPrice, $price);
|
|
|
+ $kind++;
|
|
|
+ $currentBigNum = $val['bigNum'];
|
|
|
+ $currentSmallNum = $val['smallNum'];
|
|
|
+ $totalBigNum = stringUtil::calcAdd($totalBigNum, $currentBigNum);
|
|
|
+ $totalSmallNum = stringUtil::calcAdd($totalSmallNum, $currentSmallNum);
|
|
|
+ }
|
|
|
+ $itemStat = ['kind' => $kind, 'bigNum' => $totalBigNum, 'smallNun' => $totalSmallNum, 'totalPrice' => $totalPrice];
|
|
|
+ }
|
|
|
+ return ['list' => $list, 'itemStat' => $itemStat];
|
|
|
+ }
|
|
|
+
|
|
|
public static function getShowItem($showItem, $order)
|
|
|
{
|
|
|
if ($showItem == false) {
|
|
|
@@ -504,8 +533,16 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
//为了列表页的打印按钮能用,列表也强制显示花材
|
|
|
$showItem = true;
|
|
|
- //显示产品
|
|
|
- $showItem = self::getShowItem($showItem, $val);
|
|
|
+
|
|
|
+ //退款需要显示原有的花材结构,不考虑小菊的显示问题
|
|
|
+ $getOriginalItem = Yii::$app->request->get('getOriginalItem',0);
|
|
|
+ $getOriginalItem2 = Yii::$app->request->post('getOriginalItem',0);
|
|
|
+ if($getOriginalItem == 1 || $getOriginalItem2 ==1){
|
|
|
+ $showItem = self::getOriginalShowItem($showItem, $val);
|
|
|
+ }else{
|
|
|
+ $showItem = self::getShowItem($showItem, $val);
|
|
|
+ }
|
|
|
+
|
|
|
$list[$key]['product'] = $showItem['list'];
|
|
|
$list[$key]['productStat'] = $showItem['itemStat'];
|
|
|
|