liaoyk
/
yzms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: liaoyk:c8faea4d3c867cb95d3da651c5c8c33c380e229f
Branches Tags
liaoyk:main
...
compare: liaoyk:0203d52a5e487afb1bca09dec2af24b76983c9c9
Branches Tags
liaoyk:main

3 Commits
c8faea4d3c ... 0203d52a5e

Author SHA1 Message Date
ui_none 0203d52a5e Merge branch 'master' of https://code.srdcloud.cn/a/fsdxszhpt/yzms into home 
Change-Id: I615fb63145c56470f70cfe2568f1ebaa6fd58654
 2024-08-05 17:23:42 +08:00
vguanyiwgd a1eb3eca23 update 
Change-Id: Ie319e265a76f739b037557583411d55d932a1757
 2024-08-02 14:50:10 +08:00
vguanyiwgd 8bc9b56c1c update 
Change-Id: Iad71859961f09675dbc1dd71368c2ae2e6ccd7a9
 2024-08-02 11:09:29 +08:00
2 changed files with 3 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
backstage/application/api/controllers/api/Order.php
View File

@ -1716,7 +1716,7 @@ where
// 韶关小岛 判断订单转让 // 韶关小岛 判断订单转让
$ol->show_transfer = 0; // 转让按钮 $ol->show_transfer = 0; // 转让按钮
$ol->order_transfer_name = null; $ol->order_transfer_name = null;
if($this->user->company_id == 58 || $this->user->company_id == 17){ if($this->user->company_id == 58 || $this->user->company_id == 17 || $this->user->company_id == 55 ){
// 获取该订单是否已被转让 // 获取该订单是否已被转让
$order_transfer_info = $this->db->query("select * from tb_meal_transfer where oid='{$ol->id}' and status>='0'")->row_array(); $order_transfer_info = $this->db->query("select * from tb_meal_transfer where oid='{$ol->id}' and status>='0'")->row_array();
$order_rule = $this->Mealtransfer_model->get_order_rule_info($ol->date_id); $order_rule = $this->Mealtransfer_model->get_order_rule_info($ol->date_id);

2
backstage/application/backstage/controllers/Meal.php
View File

@ -289,6 +289,8 @@ class Meal extends CI_Controller{
$s = array(); $s = array();
$s['text'] = $info['notes']; $s['text'] = $info['notes'];
$field['notes'] = json_encode($s); $field['notes'] = json_encode($s);
}else{
$field['notes'] = '';
} }
if($info['end_time_type'] == 2){ if($info['end_time_type'] == 2){
$arr = explode(':',$info['end_time']); $arr = explode(':',$info['end_time']);