Merge remote-tracking branch 'origin/master'

application/api/controller/Synthetic.php

@@ -50,6 +50,9 @@ class Synthetic extends Base
             ->select();
         foreach ($list as &$v) {
             $v['now_inventory'] = getCollectionInventory($v['id']);
+            if(strtotime($v['sell_time'])>time()){
+                $v['now_inventory'] = $v['inventory'];
+            }
         }
         $this->success('成功',$list);
     }
@@ -98,7 +101,11 @@ class Synthetic extends Base
             ->find();
         if (!$info) $this->error('藏品不存在');
         $info['describe'] = explode('|',$info['describe']);
+
         $info['now_inventory'] = getCollectionInventory($info['id']);
+        if(strtotime($info['sell_time'])>time()){
+            $info['now_inventory'] = $info['inventory'];
+        }
         $material = Db::name('store_collection_material')
             ->alias('a')
             ->join('store_collection b','a.c_id=b.id')
@@ -203,29 +210,35 @@ class Synthetic extends Base
             //获取排名
             $rank = getRanking($id)+1;
             $tag = getTag($id,$rank,$info['inventory']);
-            saveRanking($id);
-            $company = '北京七宿科技有限公司';
-            $collectors_hash = '';
-            $date = [
-                'order_id'=>0,
-                'order_no'=>get_order_sn(),
-                'tag'=>$tag,
-                'mid'=>$this->uid,
-                'c_id'=>$id,
-                'name'=>$info['name'],
-                'cover'=>$info['cover'],
-                'pro_info'=>json_encode($info,true),
-                'company'=>$company,
-                'type'=>$info['type'],
-                'tokenid'=>$is_nft['class_id'],
-                'nfttype'=>$is_nft['operationId'],
-                'collectors_hash'=>$collectors_hash,
-                'collectors_hash_time'=>'',
-                'status'=>5
-            ];
-            Db::name('store_order_info')->insert($date);
+            if(!$tag) {
+                $com=false;
+                Db::rollback();
+            }
+            else {
+                saveRanking($id);
+                $company = '北京七宿科技有限公司';
+                $collectors_hash = '';
+                $date = [
+                    'order_id' => 0,
+                    'order_no' => get_order_sn(),
+                    'tag' => $tag,
+                    'mid' => $this->uid,
+                    'c_id' => $id,
+                    'name' => $info['name'],
+                    'cover' => $info['cover'],
+                    'pro_info' => json_encode($info, true),
+                    'company' => $company,
+                    'type' => $info['type'],
+                    'tokenid' => $is_nft['class_id'],
+                    'nfttype' => $is_nft['operationId'],
+                    'collectors_hash' => $collectors_hash,
+                    'collectors_hash_time' => '',
+                    'status' => 5
+                ];
+                Db::name('store_order_info')->insert($date);
 
-            Db::commit();
+                Db::commit();
+            }
         }catch (\Exception $e){
             $com=false;
             Db::rollback();

application/api/controller/Timedtask.php

@@ -138,7 +138,6 @@ class Timedtask
         set_time_limit(0);
         $member = Db::name('store_member')
             ->where('is_pid','>',0)
-            ->where('spoofing', '=', 0)
             ->where('accountName', 'neq', 18888888888)
             //->whereNull('wallet_address')
             ->field('id,is_pid')
@@ -166,7 +165,7 @@ class Timedtask
                 ->limit(1000)
                 ->select();
             foreach ($member as &$v) {
-                Db::name('store_ceshi')->where('id', $v['id'])->update(['spoofing' => 666]);
+                Db::name('store_member')->where('id', $v['id'])->update(['spoofing' => 666]);
                 if (Db::name('store_order_info')->where('mid', $v['id'])->where('is_destruction', '=', 1)->count()) {
                     if ($v['is_pid'] > 0) {
                         Db::name('store_member')->where('id', $v['id'])
@@ -468,5 +467,41 @@ class Timedtask
             echo $e->getErrorMessage() . PHP_EOL;
         }
     }
+    public function texts(){
+        $input = input();
+        $cailiao1 = Db::name('store_order_info')
+            ->where('c_id',8)
+            ->where('mid',$input['id'])
+            ->where('status','neq',2)
+            ->where('is_destruction',0)
+            ->limit(9)
+            ->order('id asc')
+            ->field('id')
+            ->select();
+        foreach ($cailiao1 as $k=>$v){
+            Db::name('store_order_info')->where('id',$cailiao1[$k]['id'])->update(['is_destruction'=>1]);
+        }
+        $cailiao2 = Db::name('store_order_info')
+            ->where('c_id',6)
+            ->where('mid',$input['id'])
+            ->where('status','neq',2)
+            ->where('is_destruction',0)
+            ->limit(1)
+            ->order('id asc')
+            ->field('id')
+            ->find();
+        Db::name('store_order_info')->where('id',$cailiao2['id'])->update(['is_destruction'=>1]);
+
+        print_r($cailiao1);print_r('分割');print_r($cailiao2);
+    }
+    public function chongzhi(){
+        $db = Db::name('sun_money')->where('status',1)->limit(100)->select();
+        foreach ($db as $k=>$v){
+            $db[$k]['name']=Db::name('store_member')->where('phone',$db[$k]['phone'])->value('id');
+            memberMoneyChange($db[$k]['money'],3,$db[$k]['name'],'平台奖励',1,0,['order_id'=>0,'source'=>2]);
+            Db::name('sun_money')->where('id', $db[$k]['id'])->update(['status'=>2]);
+        }
+        print_r($db);
+    }
 
 }

application/api/controller/UserCenter.php

@@ -579,6 +579,7 @@ class UserCenter extends Base
             if ($info['status'] == 2) $this->error('藏品已转赠');
             $member = Db::name('store_member')->where('phone', $phone)->where('wallet_address', $wallet_address)->find();
             if (!$member) $this->error('转赠用户不存在');
+            if (!$member['id']) $this->error('不能自己转增给自己');
 
             if (!$info['collectors_hash']) $this->error('发放中，无法转赠');
 
@@ -607,7 +608,7 @@ class UserCenter extends Base
             try {
                 Db::name('store_order_info')
                     ->where('id', $id)
-                    ->update(['status' => 2, 'over_time' => date('Y-m-d H:i:s'), 'to_mid' => $member['id']]);
+                    ->update(['status' => 2, 'over_time' => date('Y-m-d H:i:s'), 'to_mid' => $member['id'],'is_destruction'=>0]);
                 $to_date = [
                     'order_id' => $info['order_id'],
                     'order_no' => get_order_sn(),

application/common.php

@@ -667,6 +667,7 @@ function getCompanyHash($id){
  */
 function getTag($id,$now,$num){
     $len = strlen($num);
+    if($now>$num) return 0;
     $re = 'YZCS'.$id.'#';
     switch ($len){
         case 1:

config/database.php

@@ -19,11 +19,11 @@ return [
     // 数据库类型
     'type'        => 'mysql',
     // 服务器地址
-    'hostname'    => '39.105.159.207',
+    'hostname'    => 'yuzhou.rwlb.rds.aliyuncs.com',
     // 数据库名
     'database'    => 'yuzhou',
     // 用户名
-    'username'    => 'yuzhou',
+    'username'    => 'yuzhouchaoshi',
     // 密码
     'password'    => 'pz46ETC8H2AEhFrD',
     // 编码