1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="39916099-6c76-4a34-b5a2-40f5b4c0c928" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/CloudWallet.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/CloudWallet.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -221,7 +221,7 @@
       <workItem from="1665794611802" duration="1412000" />
       <workItem from="1665967743750" duration="10802000" />
       <workItem from="1666054299511" duration="1287000" />
-      <workItem from="1666140530691" duration="2614000" />
+      <workItem from="1666140530691" duration="3265000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1663731279977</created>
@@ -261,10 +261,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1242" y="398" key="CommitChangelistDialog2/0.0.2560.1400@0.0.2560.1400" timestamp="1663731298581" />
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1665986269684">
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog" timestamp="1666165636203">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665986269684" />
+    <state x="113" y="131" width="2188" height="1150" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1666165636203" />
     <state x="1125" y="483" key="FileChooserDialogImpl" timestamp="1665476140468">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Order.php

@@ -42,7 +42,7 @@ class Order extends Base
      */
     public function createOrder()
     {
-        //$this->error('维护中......');
+        if(!checkAuth($this->uid)) $this->error('暂未开放');
         if (redisSetNx('createOrder'.$this->uid,3)) {
             $id = input('id');
             $num = input('num',1);
@@ -67,8 +67,8 @@ class Order extends Base
                 if(!in_array($this->uid,$luck_draw)) $this->error('没有中签');
             }
 
-         /*   $check_rank =  getRanking($id,0);
-            if($check_rank + $num > $coll_info['inventory']) $this->error('库存不足');*/
+            /*   $check_rank =  getRanking($id,0);
+               if($check_rank + $num > $coll_info['inventory']) $this->error('库存不足');*/
 
             $inventory = getCollectionInventory($id);
             if ($inventory<1) $this->error('已售罄');
@@ -167,7 +167,7 @@ class Order extends Base
      * @return  name:pay_price type:string default:-- desc:订单金额
      * @return  name:status type:int default:-- desc:类型0：待支付1：已支付
      * @return  name:cancel_time type:string default:-- desc:待支付自动取消时间
-     * @return  name:pay_type type:string default:-- desc:支付方式wx:微信zfb:支付宝
+     * @return  name:pay_type type:string default:-- desc:支付方式wx:微信zfb:支付宝,ll:连连
      * @return  name:create_at type:string default:-- desc:创建时间
      * @return name:pro_info@name type:string default:-- desc:藏品名称
      * @return name:pro_info@cover type:string default:-- desc:藏品图片
@@ -303,9 +303,9 @@ class Order extends Base
         if ($inventory < 0) $this->error('已售罄');
         //if ($inventory < $order['num']) $this->error('库存不足');
 
-      /*  $coll_info = getCollectionInfoHash($order['c_id']);
-        $check_rank =  getRanking($order['c_id'],0);
-        if( $check_rank + $order['num'] > $coll_info['inventory']) $this->error('库存不足');*/
+        /*  $coll_info = getCollectionInfoHash($order['c_id']);
+          $check_rank =  getRanking($order['c_id'],0);
+          if( $check_rank + $order['num'] > $coll_info['inventory']) $this->error('库存不足');*/
 
         if ($order['status']!=0) $this->error('订单已支付或已取消');
         $CancelTime = getCancelTime();
@@ -316,7 +316,6 @@ class Order extends Base
         $body = '象链数藏购买藏品';
         $com = true;
         $retrun_data = [];
-       // if($pay_type != 'wallet') $this->error('请选择余额方式支付');
         if(!in_array($pay_type,['wallet','ll']) ) $this->error('请选择余额或连连方式支付');
         switch ($pay_type){
             case 'wx':
@@ -412,7 +411,7 @@ class Order extends Base
             case 'll':
                 $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Pay/primaryMarketNotify';
                 $return_url ='https://'.$_SERVER['HTTP_HOST']."/h5/pages/mine/mine?id={$order['c_id']}&orderNo={$order_no}";//回调地址
-                $risk_item= risk_item($user,'余额支付',$source == 1 ? 16 : 10);
+                $risk_item= risk_item($user,'订单支付',$source == 1 ? 16 : 10);
                 $res= LianLianPay::cashierPay($order_no,$total_fee,$this->uid,$notify_url,$return_url,'藏品支付',[[
                     'payee_id'=>OID_PARTNER,
                     'payee_type' => 'MERCHANT',