|
@@ -102,17 +102,7 @@ class OrderService extends BaseService
|
|
|
|
|
|
|
|
self::payAfter($return, $payWay);
|
|
self::payAfter($return, $payWay);
|
|
|
|
|
|
|
|
- $orderInfo = $return->attributes;
|
|
|
|
|
-
|
|
|
|
|
- //组合打印数据
|
|
|
|
|
- $showItem = OrderClass::getShowItem(true, $orderInfo);
|
|
|
|
|
- $customId = $orderInfo['customId'] ?? 0;
|
|
|
|
|
- $custom = CustomClass::getById($customId);
|
|
|
|
|
- $debtAmount = $custom['debtAmount'] ?? 0.00;
|
|
|
|
|
- $printData = OrderClass::getPrintData($orderInfo, $debtAmount, $showItem);
|
|
|
|
|
- $orderInfo['printData'] = $printData;
|
|
|
|
|
-
|
|
|
|
|
- return $orderInfo;
|
|
|
|
|
|
|
+ return $return->attributes;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//自取免配送流程处理 ssh 2021.1.24
|
|
//自取免配送流程处理 ssh 2021.1.24
|