Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -1063,8 +1063,8 @@ class OrderController extends BaseController
 
         //解决开单提交订单时，别人修改价格，造成提交价格不是真实卖价问题！！
         $dealPrice = $post['dealPrice'] ?? 0;
-        //解决重复提交问题
-        util::checkRepeatCommit($this->adminId . '_' . $dealPrice, 3);
+        //解决重复提交：同店铺 + 同操作人 + 同客户 + 同成交价，短时间内只允许一次（防连点 / 双请求）
+        util::checkRepeatCommit($shopId . '_' . $this->adminId . '_' . $customId . '_' . $dealPrice, 3);
 
         CustomClass::valid($custom, $this->shopId);
         if (!empty($custom['mainId']) && $custom['mainId'] == $custom['ownMainId']) {

common/components/util.php

@@ -324,7 +324,7 @@ class util
 
     public static function notLogin($msg = '您还没有登陆哦')
     {
-        self::encode(['code' => -1, 'msg' => $msg, 'data' => []]);
+        self::encode(['code' => -10, 'msg' => $msg, 'data' => []]);
     }
 
     /**