订单控制

app-ghs/controllers/OrderController.php

@@ -132,7 +132,6 @@ class OrderController extends BaseController
             }
         }
 
-        //员工不能开已收款订单
         $debt = $post['debt'] ?? OrderClass::DEBT_YES;
 
         //PC端开单
@@ -148,22 +147,14 @@ class OrderController extends BaseController
             }
         }
 
-        //商家开非自取订单，默认订单是待收款的，debt字段为非欠款
-        if (isset($post['sendType']) && $post['sendType'] != OrderClass::SEND_TYPE_NO) {
-            $post['debt'] = OrderClass::DEBT_NO;
-        }
-
-
+        //员工不能开已收款订单
         if ($debt == OrderClass::DEBT_NO) {
-            if (isset($post['sendType']) && $post['sendType'] == OrderClass::SEND_TYPE_NO) {
-                $shopAdmin = $this->shopAdmin;
-                if (isset($shopAdmin->super) == false || $shopAdmin->super != 1) {
-                    util::fail('只能开欠款单');
-                }
+            $shopAdmin = $this->shopAdmin;
+            if (isset($shopAdmin->super) == false || $shopAdmin->super != 1) {
+                util::fail('只能开欠款单');
             }
         }
 
-
         $productJson = $post['product'] ?? '';
         if (empty($productJson)) {
             util::fail('请选择花材');

biz-ghs/order/classes/OrderClass.php

@@ -315,8 +315,8 @@ class OrderClass extends BaseClass
 
         $print = ['type' => 'print', 'show' => 1, 'disable' => 0, 'name' => '打印'];
         $modifyProduct = ['type' => 'modifyProduct', 'show' => 1, 'disable' => 0, 'name' => '修改花材'];
-        $confirm = ['type' => 'confirm', 'show' => 1, 'disable' => 1, 'name' => '确认'];
-        $cancel = ['type' => 'cancel', 'show' => 1, 'disable' => 0, 'name' => '取消'];
+        $confirm = ['type' => 'confirm', 'show' => 0, 'disable' => 1, 'name' => '确认'];
+        $cancel = ['type' => 'cancel', 'show' => 0, 'disable' => 0, 'name' => '取消'];
 
         if ($isList) {
             //订单列表页显示的按钮