admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-admin-cancel_item

Browse Source
This commit is contained in:
lccsw
2022-05-05 16:34:31 +08:00
parent 35a903ec71
commit d5c6fac9ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/biz/Settle.php
+2 -2
View File
@@ -331,7 +331,7 @@ class Settle extends HD_Controller
if($params['month']){
$where['month'] = $params['month'];
}elseif(!isset($params['month'])){
$where['month'] = $params['month'] = intval(date('m'));
$where['month'] = $params['month'] = intval(date('m',strtotime("-1 month")));
}
if($params['id']){
$where['biz_id'] = $params['id'];
@@ -410,7 +410,7 @@ class Settle extends HD_Controller
'manager_wage' => $biz_info['manager_wage'],
'commission' => $biz_info['commission']*$car_total,
];
$employee_wage = $biz_info['num'] ? ceil($car_total/$biz['num']) : 0;
$employee_wage = $biz_info['num'] ? ceil($car_total/$biz_info['num']) : 0;
$update['employee_wage'] = $employee_wage;
$settle_rows = $this->biz_settle_model->select(['stic_id'=>$row['id']],'id asc',0,0,'id,o_id');
admin/controllers/receiver/orderv2/Orders.php
+3 -3
View File
@@ -491,9 +491,9 @@ class Orders extends HD_Controller
}
if (!$item_id) return $this->show_json(SYS_CODE_FAIL, '请选择车辆!');
if ($this->receiver_order_status_model->get(['o_id'=>$id,'pid_status'=>3,'status'=>1])) {
return $this->show_json(SYS_CODE_FAIL, '已开票，不能修改!');
}
// if ($this->receiver_order_status_model->get(['o_id'=>$id,'pid_status'=>3,'status'=>1])) {
// return $this->show_json(SYS_CODE_FAIL, '已开票，不能修改!');
// }
$res = $this->receiver_orders_v2_model->update(['item_id' => $item_id], ['id' => $id]);
if (!$res) {
return $this->show_json(SYS_CODE_FAIL, '保存失败');