From a0b49a20fd509ba31f89f561508012618c18a21d Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Mon, 6 Mar 2023 18:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E5=B8=82=E5=9C=BA=E7=94=A8=E6=88=B7=E6=9C=AA=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/fenxiao/api/controller/Fenxiao.php         | 10 ++++++++++
 addon/futures/api/controller/User.php            | 12 +++++++++++-
 addon/futures/model/order/FuturesOrderCreate.php | 13 +++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/addon/fenxiao/api/controller/Fenxiao.php b/addon/fenxiao/api/controller/Fenxiao.php
index a2da1304..16ceb39c 100644
--- a/addon/fenxiao/api/controller/Fenxiao.php
+++ b/addon/fenxiao/api/controller/Fenxiao.php
@@ -100,6 +100,16 @@ class Fenxiao extends BaseApi
 
 
         }
+
+        $futures_user_info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]);
+
+        if(empty($futures_user_info)){
+            $data['member_id'] = $this->member_id;
+            $data['site_id'] = $this->site_id;
+            $data['created_time'] = time();
+            model('futures_user')->add($data);
+            $futures_user_info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]);
+        }
         return $this->response($info);
     }
 
diff --git a/addon/futures/api/controller/User.php b/addon/futures/api/controller/User.php
index f9ad7467..2ab3003e 100644
--- a/addon/futures/api/controller/User.php
+++ b/addon/futures/api/controller/User.php
@@ -8,6 +8,16 @@ class User extends BaseApi{
         $token = $this->checkToken();
         if ($token['code'] < 0) return $this->response($token);
 
-        return $this->response($this->success(model('futures_user')->getInfo([['member_id', '=', $this->member_id]])));
+        $info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]);
+
+        if(empty($info)){
+            $data['member_id'] = $this->member_id;
+            $data['site_id'] = $this->site_id;
+            $data['created_time'] = time();
+            model('futures_user')->add($data);
+            $info = model('futures_user')->getInfo([['member_id', '=', $this->member_id]]);
+        }
+
+        return $this->response($this->success($info));
     }
 }
\ No newline at end of file
diff --git a/addon/futures/model/order/FuturesOrderCreate.php b/addon/futures/model/order/FuturesOrderCreate.php
index 64fcc1e8..81b55ec9 100644
--- a/addon/futures/model/order/FuturesOrderCreate.php
+++ b/addon/futures/model/order/FuturesOrderCreate.php
@@ -287,27 +287,28 @@ class FuturesOrderCreate extends OrderCreate
         $data['times'] = $data['times']['data'];
         $data['fenxiao_info'] = model('fenxiao')->getInfo([['member_id','=',$data['member_id']]]);
         $basics = $futuresModel->getBasicsConfig($site_id)['data']['value'];
-        $futuresUser = model('futures_user')->getInfo([['member_id', '=', $data['member_id']]]);
+        $data['futures_user_info'] = model('futures_user')->getInfo([['member_id','=',$data['member_id']]]);
 
         //检查钻石数量
-        if($data['times']['is_early'] && $futuresUser['is_special'] == 0){
+        if($data['times']['is_early'] && $data['futures_user_info']['is_special'] == 0){
             if($data['fenxiao_info']['diamond'] <= 0){
                 return error(-1,'钻石不足，不可提前秒杀');
             }
         }
+
         // 判断用户是否有足够多的购买机会
-        if($futuresUser['business_num'] >= $basics['order_restrictions_num'] && $futuresUser['is_special'] == 0){
+        if($data['futures_user_info']['business_num'] >= $basics['order_restrictions_num'] && $data['futures_user_info']['is_special'] == 0){
             return error(-1,'下单次数达到限制，需提货恢复下单');
         }
 
         // 判断是否本人购买
-        if($data['member_id'] == $futures_info['seller_uid'] && $futuresUser['is_special'] == 0){
+        if($data['member_id'] == $futures_info['seller_uid'] && $data['futures_user_info']['is_special'] == 0){
             return error(-1,'本人订单不可本人购买');
         }
 
         // 判断惩罚时间
-        if($futuresUser['punish_time'] <= time()  && $futuresUser['is_special'] == 0){
-            return error(-1,'有违规订单，在惩罚时间内，惩罚时间到 '.date("Y-m-d H:i:s", $futuresUser['punish_time']));
+        if($data['futures_user_info']['punish_time'] >= time()  && $data['futures_user_info']['is_special'] == 0){
+            return error(-1,'有违规订单，在惩罚时间内，惩罚时间到 '.date("Y-m-d H:i:s", $data['futures_user_info']['punish_time']));
         }
 
         $futures_id = $futures_info['id'];