From d5c6fac9ee862f8beb26b41df6b67252b49b3a56 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Thu, 5 May 2022 16:34:31 +0800
Subject: [PATCH] edit-admin-cancel_item

---
 admin/controllers/biz/Settle.php              | 4 ++--
 admin/controllers/receiver/orderv2/Orders.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/controllers/biz/Settle.php b/admin/controllers/biz/Settle.php
index dc03fe88..ccb0c29b 100644
--- a/admin/controllers/biz/Settle.php
+++ b/admin/controllers/biz/Settle.php
@@ -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');
diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index d2c2b4c3..68666b64 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -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, '保存失败');