|
@@ -71,7 +71,7 @@ class WholeController extends Curd
|
|
|
$field = $field ?? 'order_addtimes';
|
|
|
if (!empty($where['order_status_system']) && in_array($where['order_status_system'], ['PENDING', 'WAITING', 'SENDING', 'RECVING', 'SIGNED', 'CONFIRM'])) {
|
|
|
$where['order_is_complete'] = 'N';
|
|
|
- $where['order_category'] = isset($where['order_category']) ? $where['order_category'] : ['in','SYSTEM,NORMAL'];
|
|
|
+ $where['order_category'] = isset($where['order_category']) ? $where['order_category'] : ['in','SYSTEM,NORMAL,DISHES'];
|
|
|
}
|
|
|
|
|
|
if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {
|
|
@@ -611,10 +611,10 @@ class WholeController extends Curd
|
|
|
}
|
|
|
// 去支付
|
|
|
$result = OrderService::qrcodePay($params);
|
|
|
- $result = [
|
|
|
- 'return_code'=>'SUCCESS',
|
|
|
- 'result_code' => 'SUCCESS'
|
|
|
- ];
|
|
|
+ // $result = [
|
|
|
+ // 'return_code'=>'SUCCESS',
|
|
|
+ // 'result_code' => 'SUCCESS'
|
|
|
+ // ];
|
|
|
$result = json_encode($result);
|
|
|
$params['pay_json_response'] = $result;
|
|
|
$result = json_decode($result,true);
|
|
@@ -756,14 +756,33 @@ class WholeController extends Curd
|
|
|
// }
|
|
|
// }
|
|
|
|
|
|
- // 打小票
|
|
|
- $voteData = [
|
|
|
- ''
|
|
|
- ];
|
|
|
- http_post(getenv('VOTE_MENU_URL'),'');
|
|
|
|
|
|
Db::commit();
|
|
|
|
|
|
+ // 打小票
|
|
|
+ $sheet = OrderSheet::where('join_sheet_order_id',$params['order_id'])->first();
|
|
|
+ if (!empty($sheet->order_sheet_extend_json)){
|
|
|
+ $sheetExtendJson = json_decode($sheet->order_sheet_extend_json,true);
|
|
|
+ if (isset($sheetExtendJson['premises'])){
|
|
|
+ $voteData = [
|
|
|
+ 'func'=>'procActionToPrinter',
|
|
|
+ 'sign'=>'',
|
|
|
+ 'data'=>[
|
|
|
+ 'printer_premises'=>$sheetExtendJson['premises'],
|
|
|
+ 'printer_device'=>[
|
|
|
+ "东泉度假村餐厅前台"
|
|
|
+ ],
|
|
|
+ 'printer_action'=>'ExecPrintOrder',
|
|
|
+ 'printer_data'=>[
|
|
|
+ 'order_id'=>$params['order_id']
|
|
|
+ ]
|
|
|
+ ]
|
|
|
+ ];
|
|
|
+ http_post_json(getenv('VOTE_MENU_URL'),$voteData);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
return json_success('支付成功');
|
|
|
}catch(\Exception $e){
|
|
|
dump($e->getMessage());
|
|
@@ -999,11 +1018,11 @@ class WholeController extends Curd
|
|
|
}
|
|
|
// 不组合或者组合后需要付款码的金额>0
|
|
|
if($params['pay_constitute'] == 'N' || ($params['pay_constitute'] == 'Y' && $qrcodePayAmount > 0)){
|
|
|
- // $result = OrderService::qrcodePay($params);
|
|
|
- $result = [
|
|
|
- 'return_code'=>'SUCCESS',
|
|
|
- 'result_code' => 'SUCCESS'
|
|
|
- ];
|
|
|
+ $result = OrderService::qrcodePay($params);
|
|
|
+ // $result = [
|
|
|
+ // 'return_code'=>'SUCCESS',
|
|
|
+ // 'result_code' => 'SUCCESS'
|
|
|
+ // ];
|
|
|
$result = json_encode($result);
|
|
|
$params['pay_json_response'] = $result;
|
|
|
$result = json_decode($result,true);
|
|
@@ -1594,6 +1613,9 @@ class WholeController extends Curd
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 核销餐饮
|
|
|
+ */
|
|
|
public function writeOffDishes(Request $request)
|
|
|
{
|
|
|
$orderId = $request->post('order_id', '');
|
|
@@ -1605,6 +1627,15 @@ class WholeController extends Curd
|
|
|
return json_fail('参数异常');
|
|
|
}
|
|
|
|
|
|
+ $member = Member::find($memberId);
|
|
|
+ $mobile = $member->member_mobile;
|
|
|
+ $key = "SMS:CODE:DISHES:" . $mobile;
|
|
|
+ $redisCode = Redis::get($key);
|
|
|
+ if ($code == '' || $redisCode != $code) {
|
|
|
+ return json_fail("验证码错误,请重新输入");
|
|
|
+ }
|
|
|
+ Redis::del($key);
|
|
|
+
|
|
|
if (!$times) {
|
|
|
$times = date('Y-m-d H:i:s');
|
|
|
} else {
|