1

application/api/controller/Order.php

@@ -70,7 +70,8 @@ class Order extends Base
         if ($coll_info['buy_count']<($userByCount+$num)) $this->error('每人限购'.$coll_info['buy_count'].'个');
         //获取是否已经铸造hash
         $hashCount = getLenCollection($id);
-        if (!$hashCount || $hashCount<$num) $this->error('hash未铸造,无法购买');
+        if (!$hashCount)  $this->error('hash未铸造,无法购买');
+        //if (!$hashCount || $hashCount<$num) $this->error('hash未铸造,无法购买');
 
 
         //redis加锁判断
@@ -336,11 +337,13 @@ class Order extends Base
                 $tag = getTag($order['c_id'],$rank,$order['inventory']);
                 saveRanking($order['c_id']);
                 $company = '象寻数字科技（上海）有限公司';
-                $hash = getCompanyHash($order['c_id']);
-                $company_hash = $hash['hash'];
-                $ddcid = Db::name('hash')->where('hash',$hash['hash'])->value('ddcid');
-                $company_hash_time = $hash['create_at'] ? $hash['create_at'] : date('Y-m-d H:i:s');
-                Db::name('hash')->where('hash',$hash['hash'])->update(['status'=>1]);
+//                $hash = getCompanyHash($order['c_id']);
+//                $company_hash = $hash['hash'];
+//                $ddcid = Db::name('hash')->where('hash',$hash['hash'])->value('ddcid');
+//                $company_hash_time = $hash['create_at'] ? $hash['create_at'] : date('Y-m-d H:i:s');
+//                Db::name('hash')->where('hash',$hash['hash'])->update(['status'=>1]);
+                $company_hash = Db::name('hash2')->where('goods_id',$order['c_id'])->value('hash');
+                $company_hash_time = date('Y-m-d H:i:s');
                 $collectors_hash = '';
                 $date = [
                     'order_id'=>$order['id'],
@@ -352,7 +355,7 @@ class Order extends Base
                     'company'=>$company,
                     'company_hash'=>$company_hash,
                     'company_hash_time'=>$company_hash_time,
-                    'ddcid'=>$ddcid,
+                    //'ddcid'=>$ddcid,
                     'collectors_hash'=>$collectors_hash,
                     'collectors_hash_time'=>''
                 ];

application/api/controller/Pay.php

@@ -100,11 +100,13 @@ class Pay extends Controller
                 $tag = getTag($order['c_id'],$rank,$order['inventory']);
                 saveRanking($order['c_id']);
                 $company = '象寻数字科技（上海）有限公司';
-                $hash = getCompanyHash($order['c_id']);
-                $company_hash = $hash['hash'];
-                $ddcid = Db::name('hash')->where('hash',$hash['hash'])->value('ddcid');
-                $company_hash_time = $hash['create_at'] ? $hash['create_at'] : date('Y-m-d H:i:s');
-                Db::name('hash')->where('hash',$hash['hash'])->update(['status'=>1]);
+//                $hash = getCompanyHash($order['c_id']);
+//                $company_hash = $hash['hash'];
+//                $ddcid = Db::name('hash')->where('hash',$hash['hash'])->value('ddcid');
+//                $company_hash_time = $hash['create_at'] ? $hash['create_at'] : date('Y-m-d H:i:s');
+                //Db::name('hash')->where('hash',$hash['hash'])->update(['status'=>1]);
+                $company_hash = Db::name('hash2')->where('goods_id',$order['c_id'])->value('hash');
+                $company_hash_time = date('Y-m-d H:i:s');
                 $collectors_hash = '';
                 $date = [
                     'order_id'=>$order['id'],
@@ -116,7 +118,7 @@ class Pay extends Controller
                     'company'=>$company,
                     'company_hash'=>$company_hash,
                     'company_hash_time'=>$company_hash_time,
-                    'ddcid'=>$ddcid,
+                    //'ddcid'=>$ddcid,
                     'collectors_hash'=>$collectors_hash,
                     'collectors_hash_time'=>''
                 ];

application/api/controller/Timedtask.php

@@ -86,6 +86,7 @@ class Timedtask
                     if (Db::name('hash2')->insert($data)){
                         $redis->set('nonce',$nonce+1);
                         $redis->del('noncenx');
+                        $redis->del('castingHash_'.$id);
                     }
                 }
             }

application/common.php

@@ -441,16 +441,18 @@ function DecrByCount($mid,$id,$number){
  * 获取藏品hash redis长度
  */
 function getLenCollection($id){
-    $redis = new \think\cache\driver\Redis();
-    $count = $redis->Llen('collectionHash_'.$id);
-    if (!$count){
-        $count = Db::name('hash')
-            ->where('goods_id',$id)
-            ->where('success',1)
-            ->where('status',0)
-            ->count();
-    }
-    return $count;
+//    $redis = new \think\cache\driver\Redis();
+//    $count = $redis->Llen('collectionHash_'.$id);
+//    if (!$count){
+//        $count = Db::name('hash')
+//            ->where('goods_id',$id)
+//            ->where('success',1)
+//            ->where('status',0)
+//            ->count();
+//    }
+//    return $count;
+    $hash = Db::name('hash2')->where('success',1)->where('goods_id',$id)->count();
+    return $hash;
 }