|
|
@@ -960,10 +960,14 @@ class WholeController extends Curd
|
|
|
// }
|
|
|
// }
|
|
|
// 打小票
|
|
|
+ dump('开始打小票');
|
|
|
if (!empty($premises)){
|
|
|
+ dump('餐厅');
|
|
|
$restaurant = SysDept::where('dept_super_id',$premises->dept_id)->where('dept_category','餐厅')->first();
|
|
|
if (!empty($restaurant->dept_extend_json)){
|
|
|
$deptExtendJson = json_decode($restaurant->dept_extend_json,true);
|
|
|
+
|
|
|
+ dump('餐厅deptExtendJson',$deptExtendJson);
|
|
|
if (isset($deptExtendJson['printer'])){
|
|
|
foreach($deptExtendJson['printer'] as $item){
|
|
|
if (strpos($item,'结账') !== false && $params['order_status_payment'] == 'SUCCESS'){
|
|
|
@@ -1388,7 +1392,7 @@ class WholeController extends Curd
|
|
|
}
|
|
|
|
|
|
// 配送方式
|
|
|
- if ($params['delivery'] == 'PICKUP') { // 自提
|
|
|
+ if ($params['delivery'] == 'PICKUP' || $params['delivery'] == 'ARRIVAL') { // 自提/ 到店
|
|
|
$orderConfigJson['premises'] = $params['dept_premises_id'];
|
|
|
} else if ($params['delivery'] == 'LOGISTICS') {
|
|
|
// $params['order_express_json'] = json_encode([
|
gorden